arm64: dts: Replace the IRQ number with the IRQID macro definition

Replacing IRQ numbers with IRQID macro definitions makes node properties
easier to understand and also makes GPIO interrupts easier to use.

Associated platforms:
- Amlogic Meson-G12A
- Amlogic Meson-G12B
- Amlogic Meson-SM1

Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230724060108.1403662-4-huqiang.qin@amlogic.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 0c49655cc90c98dfdf03bab7527e59344fecdd22..d8b94a3167c3570a753da389cf7da3dbbb8002f3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -9,6 +9,7 @@
 #include <dt-bindings/clock/g12a-aoclkc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interrupt-controller/amlogic,meson-g12a-gpio-intc.h>
 #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
 #include <dt-bindings/thermal/thermal.h>
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
index b2bb94981838f2b47df39b41d53c0997f99bee8f..c79f3e8d26b741ac28d5d09a49a3750775f67c26 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
@@ -344,7 +344,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
index 97e522921b065c4d3b1b223fb35c8a1edbae9ffd..428b35e1d79cf20903a5148c1a1c98618c575911 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
@@ -201,7 +201,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
index 83709787eb9176b15a0012485c6961b8b068e50a..c69b0f803916bfad6948a6aed794f550710a1f97 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
@@ -327,7 +327,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
index 29d642e746d44bbaea24bcf28677611410910864..11bcb5cc8bf24f1f29711b74bf98ce1594c0fc7d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -380,7 +380,7 @@
                compatible = "rockchip,rk818";
                reg = <0x1c>;
                interrupt-parent = <&gpio_intc>;
-               interrupts = <7 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_7 */
+               interrupts = <IRQID_GPIOAO_7 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_7 */
                #clock-cells = <1>;
 
                vcc1-supply = <&vdd_sys>;
@@ -519,7 +519,7 @@
                reg = <0x20>;
                interrupt-parent = <&gpio_intc>;
 
-               interrupts = <5 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_5 */
+               interrupts = <IRQID_GPIOAO_5 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_5 */
 
                vcc1-supply = <&vdd_sys>;
                vcc2-supply = <&vdd_sys>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
index 24d0442dffb27f262941698cd08ee8ea6facfb9c..01aa970b2f8c2452698d9291e7ed449247d03492 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
@@ -185,7 +185,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
index b40d2c1002c921836b640033fe51afed3022f5b0..ac8b7178257e06779bd628aa4489d77153209e4e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
@@ -269,7 +269,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
index d1debccdc1c22748de68e42570b1e04ac88f7265..95e03bb02af29d2e3e9918c7ff9d192d2e62adc8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
@@ -100,7 +100,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
index 17045ff81c69f009d157edfaad9b32daf5cac4f3..62404743e62d1d1fb452d256bc951ea45f0881dd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
@@ -45,7 +45,7 @@
                        linux,code = <BTN_1>;
                        gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
                        interrupt-parent = <&gpio_intc>;
-                       interrupts = <3 IRQ_TYPE_EDGE_BOTH>;
+                       interrupts = <IRQID_GPIOAO_3 IRQ_TYPE_EDGE_BOTH>;
                };
        };
 
@@ -217,7 +217,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
index 0f6660e68e727963248da7d755133cfb6981a9a8..ebda1dd30fa6290125cc2a87ed5ad116a1f21281 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
@@ -100,7 +100,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index 2fce44939f459919fe80c5db4423fbb62cf42d9e..86b90f44a4b3b686af9b506d6b52351ba923f570 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -283,7 +283,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
index 9068a334ea579da62e72617e65db0b8edb3761e0..4f07d6387bb1046df662bc243d2e5a18bb7a3aa6 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
@@ -53,7 +53,7 @@
                        linux,code = <BTN_0>;
                        gpios = <&gpio GPIOH_6 GPIO_ACTIVE_LOW>;
                        interrupt-parent = <&gpio_intc>;
-                       interrupts = <34 IRQ_TYPE_EDGE_BOTH>;
+                       interrupts = <IRQID_GPIOH_6 IRQ_TYPE_EDGE_BOTH>;
                };
 
                key-2 {
@@ -61,7 +61,7 @@
                        linux,code = <BTN_1>;
                        gpios = <&gpio GPIOH_7 GPIO_ACTIVE_LOW>;
                        interrupt-parent = <&gpio_intc>;
-                       interrupts = <35 IRQ_TYPE_EDGE_BOTH>;
+                       interrupts = <IRQID_GPIOH_7 IRQ_TYPE_EDGE_BOTH>;
                };
 
                key-3 {
@@ -69,7 +69,7 @@
                        linux,code = <BTN_2>;
                        gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
                        interrupt-parent = <&gpio_intc>;
-                       interrupts = <2 IRQ_TYPE_EDGE_BOTH>;
+                       interrupts = <IRQID_GPIOAO_2 IRQ_TYPE_EDGE_BOTH>;
                };
 
                key-mic-mute {
@@ -78,7 +78,7 @@
                        linux,input-type = <EV_SW>;
                        gpios = <&gpio_ao GPIOE_2 GPIO_ACTIVE_LOW>;
                        interrupt-parent = <&gpio_intc>;
-                       interrupts = <99 IRQ_TYPE_EDGE_BOTH>;
+                       interrupts = <IRQID_GPIOE_2 IRQ_TYPE_EDGE_BOTH>;
                };
 
                key-power {
@@ -86,7 +86,7 @@
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
                        interrupt-parent = <&gpio_intc>;
-                       interrupts = <3 IRQ_TYPE_EDGE_BOTH>;
+                       interrupts = <IRQID_GPIOAO_3 IRQ_TYPE_EDGE_BOTH>;
                };
        };
 
@@ -583,7 +583,7 @@
        bluetooth {
                compatible = "brcm,bcm43438-bt";
                interrupt-parent = <&gpio_intc>;
-               interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
+               interrupts = <IRQID_GPIOX_18 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "host-wakeup";
                shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
                max-speed = <2000000>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
index 7e1a74046ba5019b1995c42c4608db68a89bf8dd..6ee406066ee0e7979ce7bf15e14eb7b5fbc0d78a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
@@ -100,7 +100,7 @@
 
                interrupt-parent = <&gpio_intc>;
                /* MAC_INTR on GPIOZ_14 */
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
        };
 };