Skip to content

Commit 6387e0a

Browse files
Huqiang QinLinus Walleij
Huqiang Qin
authored and
Linus Walleij
committed
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>
1 parent eb3d334 commit 6387e0a

13 files changed

Lines changed: 20 additions & 19 deletions

‎arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <dt-bindings/clock/g12a-aoclkc.h>
1010
#include <dt-bindings/interrupt-controller/irq.h>
1111
#include <dt-bindings/interrupt-controller/arm-gic.h>
12+
#include <dt-bindings/interrupt-controller/amlogic,meson-g12a-gpio-intc.h>
1213
#include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
1314
#include <dt-bindings/thermal/thermal.h>
1415

‎arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344

345345
interrupt-parent = <&gpio_intc>;
346346
/* MAC_INTR on GPIOZ_14 */
347-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
347+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
348348
};
349349
};
350350

‎arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201

202202
interrupt-parent = <&gpio_intc>;
203203
/* MAC_INTR on GPIOZ_14 */
204-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
204+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
205205
};
206206
};
207207

‎arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327

328328
interrupt-parent = <&gpio_intc>;
329329
/* MAC_INTR on GPIOZ_14 */
330-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
330+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
331331
};
332332
};
333333

‎arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
compatible = "rockchip,rk818";
381381
reg = <0x1c>;
382382
interrupt-parent = <&gpio_intc>;
383-
interrupts = <7 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_7 */
383+
interrupts = <IRQID_GPIOAO_7 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_7 */
384384
#clock-cells = <1>;
385385

386386
vcc1-supply = <&vdd_sys>;
@@ -519,7 +519,7 @@
519519
reg = <0x20>;
520520
interrupt-parent = <&gpio_intc>;
521521

522-
interrupts = <5 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_5 */
522+
interrupts = <IRQID_GPIOAO_5 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_5 */
523523

524524
vcc1-supply = <&vdd_sys>;
525525
vcc2-supply = <&vdd_sys>;

‎arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185

186186
interrupt-parent = <&gpio_intc>;
187187
/* MAC_INTR on GPIOZ_14 */
188-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
188+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
189189
};
190190
};
191191

‎arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269

270270
interrupt-parent = <&gpio_intc>;
271271
/* MAC_INTR on GPIOZ_14 */
272-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
272+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
273273
};
274274
};
275275

‎arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100

101101
interrupt-parent = <&gpio_intc>;
102102
/* MAC_INTR on GPIOZ_14 */
103-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
103+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
104104
};
105105
};
106106

‎arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
linux,code = <BTN_1>;
4646
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
4747
interrupt-parent = <&gpio_intc>;
48-
interrupts = <3 IRQ_TYPE_EDGE_BOTH>;
48+
interrupts = <IRQID_GPIOAO_3 IRQ_TYPE_EDGE_BOTH>;
4949
};
5050
};
5151

@@ -217,7 +217,7 @@
217217

218218
interrupt-parent = <&gpio_intc>;
219219
/* MAC_INTR on GPIOZ_14 */
220-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
220+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
221221
};
222222
};
223223

‎arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100

101101
interrupt-parent = <&gpio_intc>;
102102
/* MAC_INTR on GPIOZ_14 */
103-
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
103+
interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;
104104
};
105105
};
106106

0 commit comments

Comments
 (0)