diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-29 13:59:20 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-29 14:00:56 -0400 |
commit | a99ab88815aec12bd257e121dee06003e2401a68 (patch) | |
tree | 89535cf82f33e2041af34433b8f2aa7f704ffa36 /arch/arm/mach-tegra/board-dt-tegra20.c | |
parent | 714daf73d0889c62e90abf4510e4fab65b4668e8 (diff) | |
parent | 8c3ec84102d171a24f050a086bfc546e9de93f9f (diff) |
Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes
* 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: Fix device tree AUXDATA for USB/EHCI
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra20.c')
-rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index e20b419d5983..0952494f481a 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c | |||
@@ -68,11 +68,11 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = { | |||
68 | OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL), | 68 | OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL), |
69 | OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL), | 69 | OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL), |
70 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0", | 70 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0", |
71 | &tegra_ehci1_device.dev.platform_data), | 71 | &tegra_ehci1_pdata), |
72 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1", | 72 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1", |
73 | &tegra_ehci2_device.dev.platform_data), | 73 | &tegra_ehci2_pdata), |
74 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2", | 74 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2", |
75 | &tegra_ehci3_device.dev.platform_data), | 75 | &tegra_ehci3_pdata), |
76 | {} | 76 | {} |
77 | }; | 77 | }; |
78 | 78 | ||