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 <yangshiji66@qq.com>
Link: https://github.com/openwrt/openwrt/pull/16764
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
index 0e925b4dcce1b03c1e1e6487cd3abf0a3d9df906..bcc7f4be3fa9674e13f9ebc9d5337e2c7e52a178 100644 (file)
--- 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
index eafa7c16bb17bbc79d8fec227546ab62561f7e23..b284119961418a86dbc9111249f15916c36ccd2c 100644 (file)
--- 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
index 15f5eac625a2afc6a9c0b2198a35e7bbd15a9ab5..fc289d5779c8bcb96534cbe01da3fba228592e16 100644 (file)
--- 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
index 886f6b7de13125e7fbed2b01c0920e432cfa9374..8a2304f7b969cf05002385374c4dc40b35ace993 100644 (file)
--- 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
index ceef29259c5f4463b9b47cfaadde5fdd25c7cbba..6713a04fcc8afe1293a954be37eed06fd63756fd 100644 (file)
--- 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
index 30c09167855f88744b69fce08455055325a9909a..509d1c21e84d366dae23e052bfc78992a0eddbe6 100644 (file)
--- 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
index cb6f3ff232eb0400e78ee224effa30435c966856..677931ec146fadc19e9d9b169630a1583c227ad5 100644 (file)
--- 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>;