Commit 6387e0aa authored by Huqiang Qin's avatar Huqiang Qin Committed by Linus Walleij
Browse files

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: default avatarHuqiang Qin <huqiang.qin@amlogic.com>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230724060108.1403662-4-huqiang.qin@amlogic.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent eb3d3349

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

+1 −0
Original line number Diff line number Diff line
@@ -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>

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

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ external_phy: ethernet-phy@0 { 


		interrupt-parent = <&gpio_intc>;

		/* MAC_INTR on GPIOZ_14 */

		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ external_phy: ethernet-phy@0 { 


		interrupt-parent = <&gpio_intc>;

		/* MAC_INTR on GPIOZ_14 */

		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ external_phy: ethernet-phy@0 { 


		interrupt-parent = <&gpio_intc>;

		/* MAC_INTR on GPIOZ_14 */

		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <IRQID_GPIOZ_14 IRQ_TYPE_LEVEL_LOW>;

	};

};

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

+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ rk818: pmic@1c { 
		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 @@ rk817: pmic@20 { 
		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>;