aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/dove.dtsi16
-rw-r--r--arch/arm/mach-dove/board-dt.c10
2 files changed, 16 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 740630f9cd65..c07220300714 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -156,6 +156,22 @@
156 status = "disabled"; 156 status = "disabled";
157 }; 157 };
158 158
159 ehci0: usb-host@50000 {
160 compatible = "marvell,orion-ehci";
161 reg = <0x50000 0x1000>;
162 interrupts = <24>;
163 clocks = <&gate_clk 0>;
164 status = "okay";
165 };
166
167 ehci1: usb-host@51000 {
168 compatible = "marvell,orion-ehci";
169 reg = <0x51000 0x1000>;
170 interrupts = <25>;
171 clocks = <&gate_clk 1>;
172 status = "okay";
173 };
174
159 sdio0: sdio@92000 { 175 sdio0: sdio@92000 {
160 compatible = "marvell,dove-sdhci"; 176 compatible = "marvell,dove-sdhci";
161 reg = <0x92000 0x100>; 177 reg = <0x92000 0x100>;
diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c
index 61c2b595494a..fbde1dd67113 100644
--- a/arch/arm/mach-dove/board-dt.c
+++ b/arch/arm/mach-dove/board-dt.c
@@ -34,14 +34,6 @@ static void __init dove_legacy_clk_init(void)
34 clkspec.np = np; 34 clkspec.np = np;
35 clkspec.args_count = 1; 35 clkspec.args_count = 1;
36 36
37 clkspec.args[0] = CLOCK_GATING_BIT_USB0;
38 orion_clkdev_add(NULL, "orion-ehci.0",
39 of_clk_get_from_provider(&clkspec));
40
41 clkspec.args[0] = CLOCK_GATING_BIT_USB1;
42 orion_clkdev_add(NULL, "orion-ehci.1",
43 of_clk_get_from_provider(&clkspec));
44
45 clkspec.args[0] = CLOCK_GATING_BIT_GBE; 37 clkspec.args[0] = CLOCK_GATING_BIT_GBE;
46 orion_clkdev_add(NULL, "mv643xx_eth_port.0", 38 orion_clkdev_add(NULL, "mv643xx_eth_port.0",
47 of_clk_get_from_provider(&clkspec)); 39 of_clk_get_from_provider(&clkspec));
@@ -79,8 +71,6 @@ static void __init dove_dt_init(void)
79 71
80 /* Internal devices not ported to DT yet */ 72 /* Internal devices not ported to DT yet */
81 dove_ge00_init(&dove_dt_ge00_data); 73 dove_ge00_init(&dove_dt_ge00_data);
82 dove_ehci0_init();
83 dove_ehci1_init();
84 dove_pcie_init(1, 1); 74 dove_pcie_init(1, 1);
85 75
86 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 76 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);