Commit 64396bd2 authored by Daniel Mack's avatar Daniel Mack Committed by Robert Jarzmik
Browse files

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: default avatarDaniel Mack <daniel@zonque.org>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent 513057f1

arch/arm/boot/dts/pxa3xx.dtsi

+16 −16
Original line number Diff line number Diff line
@@ -273,6 +273,22 @@ ssp4: ssp@41a00000 { 
			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 @@ clks: pxa3xx_clks@41300004 { 
			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";

	};

};