Add GPIO interrupt support for Amlogic S6 S7 and S7D

[PATCH 5/5] arm64: dts: Add gpio_intc node for Amlogic S7D SoCs

Posted by Xianwei Zhao via B4 Relay 1 month, 2 weeks ago

From: Xianwei Zhao <xianwei.zhao@amlogic.com>

Add GPIO interrupt controller device.

Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
index f1c2e91ec6c5..74f98fae7dac 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
@@ -194,6 +194,16 @@ gpiocc: gpio@300 {
 					gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_CC<<8) 2>;
 				};
 			};
+
+			gpio_intc: interrupt-controller@4080 {
+				compatible = "amlogic,s7d-gpio-intc",
+					     "amlogic,meson-gpio-intc";
+				reg = <0x0 0x4080 0x0 0x20>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				amlogic,channel-interrupts =
+					<10 11 12 13 14 15 16 17 18 19 20 21>;
+			};
 		};
 	};
 };

-- 
2.37.1

Re: [PATCH 5/5] arm64: dts: Add gpio_intc node for Amlogic S7D SoCs

Posted by Rob Herring (Arm) 1 month ago

On Wed, 05 Nov 2025 17:45:36 +0800, Xianwei Zhao wrote:
> Add GPIO interrupt controller device.
> 
> Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
> ---
>  arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


This patch series was applied (using b4) to base:
 Base: cb718411c4c05a4a424c2b73790a1648be97a4af (use --merge-base to override)

If this is not the correct base, please add 'base-commit' tag
(or use b4 which does this automatically)

New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/amlogic/' for 20251105-irqchip-gpio-s6-s7-s7d-v1-5-b4d1fe4781c1@amlogic.com:

arch/arm64/boot/dts/amlogic/amlogic-s7d-s905x5m-bm202.dtb: interrupt-controller@4080 (amlogic,s7d-gpio-intc): compatible: 'oneOf' conditional failed, one must be fixed:
	['amlogic,s7d-gpio-intc', 'amlogic,meson-gpio-intc'] is too long
	'amlogic,meson-gpio-intc' was expected
	'amlogic,s7d-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,a4-gpio-intc', 'amlogic,a4-gpio-ao-intc', 'amlogic,a5-gpio-intc', 'amlogic,c3-gpio-intc', 'amlogic,t7-gpio-intc']
	from schema $id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml
arch/arm64/boot/dts/amlogic/amlogic-s7d-s905x5m-bm202.dtb: /soc/bus@fe000000/interrupt-controller@4080: failed to match any schema with compatible: ['amlogic,s7d-gpio-intc', 'amlogic,meson-gpio-intc']
arch/arm64/boot/dts/amlogic/amlogic-s6-s905x5-bl209.dtb: interrupt-controller@4080 (amlogic,s6-gpio-intc): compatible: 'oneOf' conditional failed, one must be fixed:
	['amlogic,s6-gpio-intc', 'amlogic,meson-gpio-intc'] is too long
	'amlogic,meson-gpio-intc' was expected
	'amlogic,s6-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,a4-gpio-intc', 'amlogic,a4-gpio-ao-intc', 'amlogic,a5-gpio-intc', 'amlogic,c3-gpio-intc', 'amlogic,t7-gpio-intc']
	from schema $id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml
arch/arm64/boot/dts/amlogic/amlogic-s6-s905x5-bl209.dtb: /soc/bus@fe000000/interrupt-controller@4080: failed to match any schema with compatible: ['amlogic,s6-gpio-intc', 'amlogic,meson-gpio-intc']
arch/arm64/boot/dts/amlogic/amlogic-s7-s805x3-bp201.dtb: interrupt-controller@4080 (amlogic,s7-gpio-intc): compatible: 'oneOf' conditional failed, one must be fixed:
	['amlogic,s7-gpio-intc', 'amlogic,meson-gpio-intc'] is too long
	'amlogic,meson-gpio-intc' was expected
	'amlogic,s7-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,a4-gpio-intc', 'amlogic,a4-gpio-ao-intc', 'amlogic,a5-gpio-intc', 'amlogic,c3-gpio-intc', 'amlogic,t7-gpio-intc']
	from schema $id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml
arch/arm64/boot/dts/amlogic/amlogic-s7-s805x3-bp201.dtb: /soc/bus@fe000000/interrupt-controller@4080: failed to match any schema with compatible: ['amlogic,s7-gpio-intc', 'amlogic,meson-gpio-intc']

Re: [PATCH 5/5] arm64: dts: Add gpio_intc node for Amlogic S7D SoCs

Posted by Thomas Gleixner 1 month ago

On Fri, Nov 14 2025 at 09:58, Rob Herring wrote:
> On Wed, 05 Nov 2025 17:45:36 +0800, Xianwei Zhao wrote:

> New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/amlogic/' for 20251105-irqchip-gpio-s6-s7-s7d-v1-5-b4d1fe4781c1@amlogic.com:
>
> arch/arm64/boot/dts/amlogic/amlogic-s7d-s905x5m-bm202.dtb: interrupt-controller@4080 (amlogic,s7d-gpio-intc): compatible: 'oneOf' conditional failed, one must be fixed:
> 	['amlogic,s7d-gpio-intc', 'amlogic,meson-gpio-intc'] is too long
> 	'amlogic,meson-gpio-intc' was expected
> 	'amlogic,s7d-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,a4-gpio-intc', 'amlogic,a4-gpio-ao-intc', 'amlogic,a5-gpio-intc', 'amlogic,c3-gpio-intc', 'amlogic,t7-gpio-intc']
> 	from schema $id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml
> arch/arm64/boot/dts/amlogic/amlogic-s7d-s905x5m-bm202.dtb: /soc/bus@fe000000/interrupt-controller@4080: failed to match any schema with compatible: ['amlogic,s7d-gpio-intc', 'amlogic,meson-gpio-intc']

The first patch in this series clearly adds the "missing"
bindings.

Confused....

Re: [PATCH 5/5] arm64: dts: Add gpio_intc node for Amlogic S7D SoCs

Posted by Rob Herring 1 month ago

On Fri, Nov 14, 2025 at 10:11 AM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Fri, Nov 14 2025 at 09:58, Rob Herring wrote:
> > On Wed, 05 Nov 2025 17:45:36 +0800, Xianwei Zhao wrote:
>
> > New warnings running 'make CHECK_DTBS=y for arch/arm64/boot/dts/amlogic/' for 20251105-irqchip-gpio-s6-s7-s7d-v1-5-b4d1fe4781c1@amlogic.com:
> >
> > arch/arm64/boot/dts/amlogic/amlogic-s7d-s905x5m-bm202.dtb: interrupt-controller@4080 (amlogic,s7d-gpio-intc): compatible: 'oneOf' conditional failed, one must be fixed:
> >       ['amlogic,s7d-gpio-intc', 'amlogic,meson-gpio-intc'] is too long
> >       'amlogic,meson-gpio-intc' was expected
> >       'amlogic,s7d-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,a4-gpio-intc', 'amlogic,a4-gpio-ao-intc', 'amlogic,a5-gpio-intc', 'amlogic,c3-gpio-intc', 'amlogic,t7-gpio-intc']
> >       from schema $id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml
> > arch/arm64/boot/dts/amlogic/amlogic-s7d-s905x5m-bm202.dtb: /soc/bus@fe000000/interrupt-controller@4080: failed to match any schema with compatible: ['amlogic,s7d-gpio-intc', 'amlogic,meson-gpio-intc']
>
> The first patch in this series clearly adds the "missing"
> bindings.
>
> Confused....

You and b4. It looks normal reading the thread, but shazam is
thoroughly confused. I think that's because this series is missing a
'v2' tag.

$ b4 shazam -H 20251105-irqchip-gpio-s6-s7-s7d-v1-3-b4d1fe4781c1@amlogic.com
Grabbing thread from
lore.kernel.org/all/20251105-irqchip-gpio-s6-s7-s7d-v1-3-b4d1fe4781c1@amlogic.com/t.mbox.gz
Breaking thread to remove parents of
20251105-irqchip-gpio-s6-s7-s7d-v1-0-b4d1fe4781c1@amlogic.com
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 18 messages in the thread
WARNING: duplicate messages found at index 1
   Subject 1: dt-bindings: interrupt-controller: Add support for
Amlogic S6 S7 and S7D SoCs
   Subject 2: dt-bindings: interrupt-controller: Add support for
Amlogic S6 S7 and S7D SoCs
  2 is not a reply... assume additional patch
WARNING: duplicate messages found at index 1
   Subject 1: irqchip/meson-gpio: Add support for Amlogic S6 S7 and S7D SoCs
   Subject 2: dt-bindings: interrupt-controller: Add support for
Amlogic S6 S7 and S7D SoCs
  2 is not a reply... assume additional patch
WARNING: duplicate messages found at index 1
   Subject 1: arm64: dts: amlogic: Add gpio_intc node for Amlogic S6
SoCs
   Subject 2: irqchip/meson-gpio: Add support for Amlogic S6 S7 and S7D SoCs
  2 is not a reply... assume additional patch
WARNING: duplicate messages found at index 1
   Subject 1: arm64: dts: amlogic: Add gpio_intc node for Amlogic S7 SoCs
   Subject 2: arm64: dts: amlogic: Add gpio_intc node for Amlogic S6 SoCs
  2 is not a reply... assume additional patch
WARNING: duplicate messages found at index 1
   Subject 1: arm64: dts: amlogic: Add gpio_intc node for Amlogic S7D SoCs
   Subject 2: arm64: dts: amlogic: Add gpio_intc node for Amlogic S7 SoCs
  2 is not a reply... assume additional patch
Looking for additional code-review trailers on lore.kernel.org
Analyzing 0 code-review messages
Checking attestation on all messages, may take a moment...
---
  ✓ [PATCH] arm64: dts: amlogic: Add gpio_intc node for Amlogic S7D SoCs
    ✓ Signed: DKIM/linutronix.de
  ✓ [PATCH] arm64: dts: amlogic: Add gpio_intc node for Amlogic S7 SoCs
    ✓ Signed: DKIM/linutronix.de
  [PATCH 3/5] arm64: dts: Add gpio_intc node for Amlogic S6 SoCs
    ✗ No key: ed25519/xianwei.zhao@amlogic.com
    + Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> (✗
DKIM/linaro.org)
  [PATCH 4/5] arm64: dts: Add gpio_intc node for Amlogic S7 SoCs
    ✗ No key: ed25519/xianwei.zhao@amlogic.com
    + Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> (✗
DKIM/linaro.org)
  [PATCH 5/5] arm64: dts: Add gpio_intc node for Amlogic S7D SoCs
    ✗ No key: ed25519/xianwei.zhao@amlogic.com
    + Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> (✗
DKIM/linaro.org)
  ERROR: missing [6/5]!
  ERROR: missing [7/5]!
  ERROR: missing [8/5]!
  ERROR: missing [9/5]!
  ERROR: missing [10/5]!
---
Total patches: 5
---
WARNING: Thread incomplete!

Re: [PATCH 5/5] arm64: dts: Add gpio_intc node for Amlogic S7D SoCs

Posted by Neil Armstrong 1 month, 1 week ago

On 11/5/25 10:45, Xianwei Zhao via B4 Relay wrote:
> From: Xianwei Zhao <xianwei.zhao@amlogic.com>
> 
> Add GPIO interrupt controller device.
> 
> Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
> ---
>   arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 10 ++++++++++
>   1 file changed, 10 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
> index f1c2e91ec6c5..74f98fae7dac 100644
> --- a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
> @@ -194,6 +194,16 @@ gpiocc: gpio@300 {
>   					gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_CC<<8) 2>;
>   				};
>   			};
> +
> +			gpio_intc: interrupt-controller@4080 {
> +				compatible = "amlogic,s7d-gpio-intc",
> +					     "amlogic,meson-gpio-intc";
> +				reg = <0x0 0x4080 0x0 0x20>;
> +				interrupt-controller;
> +				#interrupt-cells = <2>;
> +				amlogic,channel-interrupts =
> +					<10 11 12 13 14 15 16 17 18 19 20 21>;
> +			};
>   		};
>   	};
>   };
> 

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

[tip: irq/drivers] arm64: dts: amlogic: Add gpio_intc node for Amlogic S7D SoCs

Posted by tip-bot2 for Xianwei Zhao 1 month ago

The following commit has been merged into the irq/drivers branch of tip:

Commit-ID:     1d787348123b34166ad2cccf12c9c00beb4ee3ae
Gitweb:        https://git.kernel.org/tip/1d787348123b34166ad2cccf12c9c00beb4ee3ae
Author:        Xianwei Zhao <xianwei.zhao@amlogic.com>
AuthorDate:    Wed, 05 Nov 2025 17:45:36 +08:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 13 Nov 2025 14:04:17 +01:00

arm64: dts: amlogic: Add gpio_intc node for Amlogic S7D SoCs

Add GPIO interrupt controller device.

Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patch.msgid.link/20251105-irqchip-gpio-s6-s7-s7d-v1-5-b4d1fe4781c1@amlogic.com
---
 arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
index c4d260d..5ef1682 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
@@ -184,6 +184,16 @@
 					gpio-ranges = <&periphs_pinctrl 0 (AMLOGIC_GPIO_CC<<8) 2>;
 				};
 			};
+
+			gpio_intc: interrupt-controller@4080 {
+				compatible = "amlogic,s7d-gpio-intc",
+					     "amlogic,meson-gpio-intc";
+				reg = <0x0 0x4080 0x0 0x20>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				amlogic,channel-interrupts =
+					<10 11 12 13 14 15 16 17 18 19 20 21>;
+			};
 		};
 	};
 };