Skip to contentSkip to conversation

ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi

PATCH RESEND New Heiko Stübner 2 participants 2 messages Aug 7, 2014 – Aug 9, 2014 Device tree bindings

lore
Share & tools
lore

Heiko Stübner

author
#0 lore raw

PATCH RESEND 1/1 ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi

From: Doug Anderson <[email protected]>

The EHCI and HSIC device tree nodes were added in the wrong place. Fix them.

Signed-off-by Doug Anderson <[email protected]>
Signed-off-by Kever Yang <[email protected]>
Signed-off-by Heiko Stuebner <[email protected]>

---
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(-)
arch/arm/boot/dts/rk3288.dtsi +20 -20
index e7cb008..5950b0a 100644
@@ -195,6 +195,26 @@
 		status = "disabled";
 	};
 
+	usb_host0_ehci: usb at ff500000 {
+		compatible = "generic-ehci";
+		reg = <0xff500000 0x100>;
+		interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+		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 = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+		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 = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-		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 = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru HCLK_HSIC>;
-		clock-names = "usbhost";
-		status = "disabled";
-	};
-
 	gic: interrupt-controller at ffc01000 {
 		compatible = "arm,gic-400";
 		interrupt-controller;
Signature · 1 line
2.0.0.526.g5318336
Applied
#1 lore raw

PATCH RESEND 1/1 ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi

Quoted 11 lines · Heiko St?bner

From: Doug Anderson <[email protected]>

The EHCI and HSIC device tree nodes were added in the wrong place. Fix them.

Signed-off-by Doug Anderson <[email protected]>
Signed-off-by Kever Yang <[email protected]>
Signed-off-by Heiko Stuebner <[email protected]>

---
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.

Applied, thanks.

-Olof