ARM: dts: pxa3xx: order timer and gcu nodes under /pxabus

These are devices on the PXA bus, so make the device tree structure
reflect that.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index eb3223e..71c470a 100644 (file)
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -273,6 +273,22 @@
                        clocks = <&clks CLK_SSP4>;
                        status = "disabled";
                };
+
+               timer@40a00000 {
+                       compatible = "marvell,pxa-timer";
+                       reg = <0x40a00000 0x20>;
+                       interrupts = <26>;
+                       clocks = <&clks CLK_OSTIMER>;
+                       status = "okay";
+               };
+
+               gcu: display-controller@54000000 {
+                       compatible = "marvell,pxa300-gcu";
+                       reg = <0x54000000 0x1000>;
+                       interrupts = <39>;
+                       clocks = <&clks CLK_PXA300_GCU>;
+                       status = "disabled";
+               };
        };
 
        clocks {
@@ -290,20 +306,4 @@
                        status = "okay";
                };
        };
-
-       timer@40a00000 {
-               compatible = "marvell,pxa-timer";
-               reg = <0x40a00000 0x20>;
-               interrupts = <26>;
-               clocks = <&clks CLK_OSTIMER>;
-               status = "okay";
-       };
-
-       gcu: display-controller@54000000 {
-               compatible = "marvell,pxa300-gcu";
-               reg = <0x54000000 0x1000>;
-               interrupts = <39>;
-               clocks = <&clks CLK_PXA300_GCU>;
-               status = "disabled";
-       };
 };