summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-08-08 22:35:13 +0200
committerOlof Johansson <olof@lixom.net>2011-08-09 21:07:32 +0200
commitdd58bdbceb087238bead08e05226c0cef20aab4d (patch)
tree1bddcceeca68702d170e4f9e994a7b2c9ca787a9 /arch/arm/mach-tegra
parentMerge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff)
downloadlinux-dd58bdbceb087238bead08e05226c0cef20aab4d.tar.xz
linux-dd58bdbceb087238bead08e05226c0cef20aab4d.zip
ARM: Tegra: Harmony: Add USB device
The Tegra USB port is attached an an SMSC9514; a combination USB hub and Ethernet controller. This change is extracted from a change in the ChromeOS 2.6.38 kernel. Signed-off-by: Olof Johansson <olofj@chromium.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r--arch/arm/mach-tegra/board-harmony.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index 846cd7d69e3e..f528a5a192a6 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -117,6 +117,7 @@ static struct platform_device *harmony_devices[] __initdata = {
&tegra_sdhci_device1,
&tegra_sdhci_device2,
&tegra_sdhci_device4,
+ &tegra_ehci3_device,
&tegra_i2s_device1,
&tegra_das_device,
&tegra_pcm_device,
@@ -140,6 +141,7 @@ static __initdata struct tegra_clk_init_table harmony_clk_init_table[] = {
{ "pll_a_out0", "pll_a", 11289600, true },
{ "cdev1", NULL, 0, true },
{ "i2s1", "pll_a_out0", 11289600, false},
+ { "usb3", "clk_m", 12000000, true },
{ NULL, NULL, 0, 0},
};