aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2014-08-07 11:44:19 -0400
committerOlof Johansson <olof@lixom.net>2014-08-09 11:22:41 -0400
commitc9c32c5049b8a36919968dbfdf08bbeda0c5e381 (patch)
tree056ade472a1d4233180661993ebe379eef437d89
parentc309bfa9b481e7dbd3e1ab819271bf3009f44859 (diff)
ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi
The EHCI and HSIC device tree nodes were added in the wrong place. Fix them. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/boot/dts/rk3288.dtsi40
1 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index e7cb00873dd4..5950b0a53224 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -195,6 +195,26 @@
195 status = "disabled"; 195 status = "disabled";
196 }; 196 };
197 197
198 usb_host0_ehci: usb@ff500000 {
199 compatible = "generic-ehci";
200 reg = <0xff500000 0x100>;
201 interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
202 clocks = <&cru HCLK_USBHOST0>;
203 clock-names = "usbhost";
204 status = "disabled";
205 };
206
207 /* NOTE: ohci@ff520000 doesn't actually work on hardware */
208
209 usb_hsic: usb@ff5c0000 {
210 compatible = "generic-ehci";
211 reg = <0xff5c0000 0x100>;
212 interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
213 clocks = <&cru HCLK_HSIC>;
214 clock-names = "usbhost";
215 status = "disabled";
216 };
217
198 i2c0: i2c@ff650000 { 218 i2c0: i2c@ff650000 {
199 compatible = "rockchip,rk3288-i2c"; 219 compatible = "rockchip,rk3288-i2c";
200 reg = <0xff650000 0x1000>; 220 reg = <0xff650000 0x1000>;
@@ -251,26 +271,6 @@
251 status = "disabled"; 271 status = "disabled";
252 }; 272 };
253 273
254 usb_host0_ehci: usb@ff500000 {
255 compatible = "generic-ehci";
256 reg = <0xff500000 0x100>;
257 interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
258 clocks = <&cru HCLK_USBHOST0>;
259 clock-names = "usbhost";
260 status = "disabled";
261 };
262
263 /* NOTE: ohci@ff520000 doesn't actually work on hardware */
264
265 usb_hsic: usb@ff5c0000 {
266 compatible = "generic-ehci";
267 reg = <0xff5c0000 0x100>;
268 interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
269 clocks = <&cru HCLK_HSIC>;
270 clock-names = "usbhost";
271 status = "disabled";
272 };
273
274 gic: interrupt-controller@ffc01000 { 274 gic: interrupt-controller@ffc01000 {
275 compatible = "arm,gic-400"; 275 compatible = "arm,gic-400";
276 interrupt-controller; 276 interrupt-controller;