From nobody Tue Sep 9 07:46:54 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 602BAEB64DD for ; Mon, 24 Jul 2023 06:03:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230174AbjGXGDK (ORCPT ); Mon, 24 Jul 2023 02:03:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbjGXGDE (ORCPT ); Mon, 24 Jul 2023 02:03:04 -0400 Received: from mail-sh.amlogic.com (mail-sh.amlogic.com [58.32.228.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CA6B1AE; Sun, 23 Jul 2023 23:02:15 -0700 (PDT) Received: from rd02-sz.amlogic.software (10.28.11.83) by mail-sh.amlogic.com (10.18.11.5) with Microsoft SMTP Server id 15.1.2507.13; Mon, 24 Jul 2023 14:01:55 +0800 From: Huqiang Qin To: , , , , , , , CC: , , , , , Huqiang Qin Subject: [PATCH V2 3/3] arm64: dts: Replace the IRQ number with the IRQID macro definition Date: Mon, 24 Jul 2023 14:01:08 +0800 Message-ID: <20230724060108.1403662-4-huqiang.qin@amlogic.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230724060108.1403662-1-huqiang.qin@amlogic.com> References: <20230724060108.1403662-1-huqiang.qin@amlogic.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.28.11.83] Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Neil Armstrong --- V1 -> V2: Include header file changed to amlogic,meson-g12a-gpio-intc.h arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 2 +- .../boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 4 ++-- .../arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 2 +- .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 12 ++++++------ .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 2 +- 13 files changed, 20 insertions(+), 19 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index 0c49655cc90c..d8b94a3167c3 100644 --- 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 #include #include +#include #include #include =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm6= 4/boot/dts/amlogic/meson-g12a-x96-max.dts index b2bb94981838..c79f3e8d26b7 100644 --- 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 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arc= h/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi index 97e522921b06..428b35e1d79c 100644 --- 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 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/ar= m64/boot/dts/amlogic/meson-g12b-bananapi.dtsi index 83709787eb91..c69b0f803916 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi @@ -327,7 +327,7 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/a= rch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts index 276e95b34022..eed2a23047ca 100644 --- 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 @@ rk818: pmic@1c { compatible =3D "rockchip,rk818"; reg =3D <0x1c>; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <7 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_7 */ + interrupts =3D ; /* GPIOAO_7 */ #clock-cells =3D <1>; =20 vcc1-supply =3D <&vdd_sys>; @@ -519,7 +519,7 @@ rk817: pmic@20 { reg =3D <0x20>; interrupt-parent =3D <&gpio_intc>; =20 - interrupts =3D <5 IRQ_TYPE_LEVEL_LOW>; /* GPIOAO_5 */ + interrupts =3D ; /* GPIOAO_5 */ =20 vcc1-supply =3D <&vdd_sys>; vcc2-supply =3D <&vdd_sys>; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/a= rm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi index 24d0442dffb2..01aa970b2f8c 100644 --- 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 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/= boot/dts/amlogic/meson-g12b-w400.dtsi index b40d2c1002c9..ac8b7178257e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi @@ -269,7 +269,7 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts b/ar= ch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts index d1debccdc1c2..95e03bb02af2 100644 --- 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 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm= 64/boot/dts/amlogic/meson-sm1-bananapi.dtsi index 17045ff81c69..62404743e62d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi @@ -45,7 +45,7 @@ key { linux,code =3D ; gpios =3D <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <3 IRQ_TYPE_EDGE_BOTH>; + interrupts =3D ; }; }; =20 @@ -217,7 +217,7 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 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 0f6660e68e72..ebda1dd30fa6 100644 --- 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 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64= /boot/dts/amlogic/meson-sm1-odroid.dtsi index 2fce44939f45..86b90f44a4b3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -283,7 +283,7 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/= boot/dts/amlogic/meson-sm1-sei610.dts index 9068a334ea57..4f07d6387bb1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts @@ -53,7 +53,7 @@ key-1 { linux,code =3D ; gpios =3D <&gpio GPIOH_6 GPIO_ACTIVE_LOW>; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <34 IRQ_TYPE_EDGE_BOTH>; + interrupts =3D ; }; =20 key-2 { @@ -61,7 +61,7 @@ key-2 { linux,code =3D ; gpios =3D <&gpio GPIOH_7 GPIO_ACTIVE_LOW>; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <35 IRQ_TYPE_EDGE_BOTH>; + interrupts =3D ; }; =20 key-3 { @@ -69,7 +69,7 @@ key-3 { linux,code =3D ; gpios =3D <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <2 IRQ_TYPE_EDGE_BOTH>; + interrupts =3D ; }; =20 key-mic-mute { @@ -78,7 +78,7 @@ key-mic-mute { linux,input-type =3D ; gpios =3D <&gpio_ao GPIOE_2 GPIO_ACTIVE_LOW>; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <99 IRQ_TYPE_EDGE_BOTH>; + interrupts =3D ; }; =20 key-power { @@ -86,7 +86,7 @@ key-power { linux,code =3D ; gpios =3D <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <3 IRQ_TYPE_EDGE_BOTH>; + interrupts =3D ; }; }; =20 @@ -583,7 +583,7 @@ &uart_A { bluetooth { compatible =3D "brcm,bcm43438-bt"; interrupt-parent =3D <&gpio_intc>; - interrupts =3D <95 IRQ_TYPE_LEVEL_HIGH>; + interrupts =3D ; interrupt-names =3D "host-wakeup"; shutdown-gpios =3D <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; max-speed =3D <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 7e1a74046ba5..6ee406066ee0 100644 --- 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 @@ external_phy: ethernet-phy@0 { =20 interrupt-parent =3D <&gpio_intc>; /* MAC_INTR on GPIOZ_14 */ - interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; + interrupts =3D ; }; }; =20 --=20 2.37.1