From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko =?ISO-8859-1?Q?St=FCbner?=) Date: Thu, 07 Aug 2014 17:44:19 +0200 Subject: [PATCH RESEND] ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi Message-ID: <14819563.gjVG8jMF0E@diego> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Doug Anderson The EHCI and HSIC device tree nodes were added in the wrong place. Fix them. Signed-off-by: Doug Anderson Signed-off-by: Kever Yang Signed-off-by: Heiko Stuebner --- Sorry for the double-post. I messed something up when sending the original which made it look like it came from Doug instead of me. Heiko arch/arm/boot/dts/rk3288.dtsi | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index e7cb008..5950b0a 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -195,6 +195,26 @@ status = "disabled"; }; + usb_host0_ehci: usb at ff500000 { + compatible = "generic-ehci"; + reg = <0xff500000 0x100>; + interrupts = ; + clocks = <&cru HCLK_USBHOST0>; + clock-names = "usbhost"; + status = "disabled"; + }; + + /* NOTE: ohci at ff520000 doesn't actually work on hardware */ + + usb_hsic: usb at ff5c0000 { + compatible = "generic-ehci"; + reg = <0xff5c0000 0x100>; + interrupts = ; + clocks = <&cru HCLK_HSIC>; + clock-names = "usbhost"; + status = "disabled"; + }; + i2c0: i2c at ff650000 { compatible = "rockchip,rk3288-i2c"; reg = <0xff650000 0x1000>; @@ -251,26 +271,6 @@ status = "disabled"; }; - usb_host0_ehci: usb at ff500000 { - compatible = "generic-ehci"; - reg = <0xff500000 0x100>; - interrupts = ; - clocks = <&cru HCLK_USBHOST0>; - clock-names = "usbhost"; - status = "disabled"; - }; - - /* NOTE: ohci at ff520000 doesn't actually work on hardware */ - - usb_hsic: usb at ff5c0000 { - compatible = "generic-ehci"; - reg = <0xff5c0000 0x100>; - interrupts = ; - clocks = <&cru HCLK_HSIC>; - clock-names = "usbhost"; - status = "disabled"; - }; - gic: interrupt-controller at ffc01000 { compatible = "arm,gic-400"; interrupt-controller; -- 2.0.0.526.g5318336