ramips: dts: add the missing interrupt properties for GPIO nodes

The Ralink GPIO driver supports irqchip function. Hence we need to add "interrupt-parent" and "interrupt-controller" properties to make sure it works properly. It is worth noting that all GPIO devices share the same interrupt line. Signed-off-by: Shiji Yang <[email protected]> Link: openwrt/openwrt#16764 Signed-off-by: Robert Marko <[email protected]>
liulang25 · Oct 25, 2024 · 0d4616b · 0d4616b
1 parent 2b2abdb
commit 0d4616b
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 9 deletions.
diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
@@ -140,6 +140,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -156,6 +158,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -174,6 +178,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -192,6 +198,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;

diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi
@@ -95,6 +95,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -111,6 +113,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -129,6 +133,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -147,6 +153,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;

diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi
@@ -87,6 +87,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
@@ -100,6 +105,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
@@ -115,6 +125,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <32>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c

diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi
@@ -111,13 +111,15 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
-
-			interrupt-parent = <&intc>;
-			interrupts = <6>;
 		};
 
 		gpio1: gpio@638 {
@@ -127,6 +129,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
@@ -142,6 +149,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <12>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c

diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi
@@ -112,13 +112,15 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
-
-			interrupt-parent = <&intc>;
-			interrupts = <6>;
 		};
 
 		gpio1: gpio@638 {
@@ -128,6 +130,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
@@ -143,6 +150,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <6>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c

diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi
@@ -109,12 +109,14 @@
 			compatible = "ralink,rt2880-gpio";
 			reg = <0x600 0x34>;
 
-			interrupt-parent = <&intc>;
-			interrupts = <6>;
-
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
@@ -128,6 +130,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
@@ -143,6 +150,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <32>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
@@ -158,6 +170,11 @@
 			gpio-controller;
 			#gpio-cells = <2>;
 
+			interrupt-parent = <&intc>;
+			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+
 			ngpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c

diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi
@@ -111,6 +111,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -127,6 +129,8 @@
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 
 			gpio-controller;
 			#gpio-cells = <2>;