Skip to contentSkip to conversation

arm64: dts: allwinner: h6: Move GIC device node fix base address ordering

PATCH Applied Chen-Yu Tsai 2 participants 2 messages Jan 27, 2019 – Jan 28, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: allwinner: h6: Move GIC device node fix base address ordering

The GIC device node was placed out of order in the initial device tree submission. Move it so the nodes are correctly sorted by base address again.

Fixes e54be32d0273 ("arm64: allwinner: h6: add the basical Allwinner H6 DTSI file")
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +11 -11
index d93a7add67e7..60bf6d915809 100644
@@ -178,17 +178,6 @@
 			#reset-cells = <1>;
 		};
 
-		gic: interrupt-controller@3021000 {
-			compatible = "arm,gic-400";
-			reg = <0x03021000 0x1000>,
-			      <0x03022000 0x2000>,
-			      <0x03024000 0x2000>,
-			      <0x03026000 0x2000>;
-			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-			interrupt-controller;
-			#interrupt-cells = <3>;
-		};
-
 		pio: pinctrl@300b000 {
 			compatible = "allwinner,sun50i-h6-pinctrl";
 			reg = <0x0300b000 0x400>;
@@ -239,6 +228,17 @@
 			};
 		};
 
+		gic: interrupt-controller@3021000 {
+			compatible = "arm,gic-400";
+			reg = <0x03021000 0x1000>,
+			      <0x03022000 0x2000>,
+			      <0x03024000 0x2000>,
+			      <0x03026000 0x2000>;
+			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+			interrupt-controller;
+			#interrupt-cells = <3>;
+		};
+
 		mmc0: mmc@4020000 {
 			compatible = "allwinner,sun50i-h6-mmc",
 				     "allwinner,sun50i-a64-mmc";
Signature · 1 line
2.20.1
#1 lore raw
Quoted 6 lines · Chen-Yu Tsai

The GIC device node was placed out of order in the initial device tree submission. Move it so the nodes are correctly sorted by base address again.

Fixes e54be32d0273 ("arm64: allwinner: h6: add the basical Allwinner H6 DTSI file")

Applied, thanks!
Maxime

Signature · 3 lines
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com