diff mbox series

[5/7] ARM: dts: pxa3xx: order timer and gcu nodes under /pxabus

Message ID 20181130175543.32628-6-daniel@zonque.org (mailing list archive)
State New, archived
Headers show
Series ARM: dts: fixes and additions for pxa platform | expand

Commit Message

Daniel Mack Nov. 30, 2018, 5:55 p.m. UTC 
These are devices on the PXA bus, so make the device tree structure
reflect that.

Signed-off-by: Daniel Mack <daniel@zonque.org>
---
 arch/arm/boot/dts/pxa3xx.dtsi | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

Robert Jarzmik Dec. 2, 2018, 10:10 a.m. UTC | #1 
Daniel Mack <daniel@zonque.org> writes:

> These are devices on the PXA bus, so make the device tree structure
> reflect that.
>
> Signed-off-by: Daniel Mack <daniel@zonque.org>
Applied to pxa/dt, thanks.

Cheers.

--
Robert
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index eb9443208578..de49e7f666c0 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -265,6 +265,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 {
@@ -282,20 +298,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";
-	};
 };