Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice...

[cascardo/linux.git] / arch / arm / boot / dts / rk3288.dtsi

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index e7cb008..5950b0a 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -195,6 +195,26 @@
                status = "disabled";
        };
 
+       usb_host0_ehci: usb@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@ff520000 doesn't actually work on hardware */
+
+       usb_hsic: usb@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@ff650000 {
                compatible = "rockchip,rk3288-i2c";
                reg = <0xff650000 0x1000>;
@@ -251,26 +271,6 @@
                status = "disabled";
        };
 
-       usb_host0_ehci: usb@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@ff520000 doesn't actually work on hardware */
-
-       usb_hsic: usb@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@ffc01000 {
                compatible = "arm,gic-400";
                interrupt-controller;