diff options
Diffstat (limited to 'arch/arm/mach-tegra/tegra.c')
-rw-r--r-- | arch/arm/mach-tegra/tegra.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index 0d1e4128d460..fc97cfd52769 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/of_fdt.h> | 29 | #include <linux/of_fdt.h> |
30 | #include <linux/of_platform.h> | 30 | #include <linux/of_platform.h> |
31 | #include <linux/pda_power.h> | 31 | #include <linux/pda_power.h> |
32 | #include <linux/platform_data/tegra_usb.h> | ||
33 | #include <linux/io.h> | 32 | #include <linux/io.h> |
34 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
35 | #include <linux/sys_soc.h> | 34 | #include <linux/sys_soc.h> |
@@ -46,40 +45,6 @@ | |||
46 | #include "fuse.h" | 45 | #include "fuse.h" |
47 | #include "iomap.h" | 46 | #include "iomap.h" |
48 | 47 | ||
49 | static struct tegra_ehci_platform_data tegra_ehci1_pdata = { | ||
50 | .operating_mode = TEGRA_USB_OTG, | ||
51 | .power_down_on_bus_suspend = 1, | ||
52 | .vbus_gpio = -1, | ||
53 | }; | ||
54 | |||
55 | static struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = { | ||
56 | .reset_gpio = -1, | ||
57 | .clk = "cdev2", | ||
58 | }; | ||
59 | |||
60 | static struct tegra_ehci_platform_data tegra_ehci2_pdata = { | ||
61 | .phy_config = &tegra_ehci2_ulpi_phy_config, | ||
62 | .operating_mode = TEGRA_USB_HOST, | ||
63 | .power_down_on_bus_suspend = 1, | ||
64 | .vbus_gpio = -1, | ||
65 | }; | ||
66 | |||
67 | static struct tegra_ehci_platform_data tegra_ehci3_pdata = { | ||
68 | .operating_mode = TEGRA_USB_HOST, | ||
69 | .power_down_on_bus_suspend = 1, | ||
70 | .vbus_gpio = -1, | ||
71 | }; | ||
72 | |||
73 | static struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = { | ||
74 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5000000, "tegra-ehci.0", | ||
75 | &tegra_ehci1_pdata), | ||
76 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5004000, "tegra-ehci.1", | ||
77 | &tegra_ehci2_pdata), | ||
78 | OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5008000, "tegra-ehci.2", | ||
79 | &tegra_ehci3_pdata), | ||
80 | {} | ||
81 | }; | ||
82 | |||
83 | static void __init tegra_dt_init(void) | 48 | static void __init tegra_dt_init(void) |
84 | { | 49 | { |
85 | struct soc_device_attribute *soc_dev_attr; | 50 | struct soc_device_attribute *soc_dev_attr; |
@@ -112,8 +77,7 @@ static void __init tegra_dt_init(void) | |||
112 | * devices | 77 | * devices |
113 | */ | 78 | */ |
114 | out: | 79 | out: |
115 | of_platform_populate(NULL, of_default_bus_match_table, | 80 | of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); |
116 | tegra20_auxdata_lookup, parent); | ||
117 | } | 81 | } |
118 | 82 | ||
119 | static void __init trimslice_init(void) | 83 | static void __init trimslice_init(void) |