Skip to contentSkip to conversation

arm64: dts: allwinner: Fix PMIC interrupt number

PATCH Applied Andre Przywara 2 participants 3 messages May 15, 2024 – May 28, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: allwinner: Fix PMIC interrupt number

The "r_intc" interrupt controller on the A64 uses a mapping scheme, so the first (and only) NMI interrupt #0 appears as interrupt number 32 (cf. the top comment in drivers/irqchip/irq-sun6i-r.c).

Fix that number in the interrupts property to properly forward PMIC interrupts to the CPU.

Fixes 4d39a8eb07eb ("arm64: dts: allwinner: Add Jide Remix Mini PC support")

---
Hi,

I didn't notice this before because I changed the interrupts property in the U-Boot copy of the DT, to comply with the old binding, where it is actually IRQ 0, and then used that DTB.

Cheers,
Andre

 arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts +1 -1
index b6e3c169797f0..0dba413963776 100644
@@ -191,7 +191,7 @@ axp803: pmic@3a3 {
 		compatible = "x-powers,axp803";
 		reg = <0x3a3>;
 		interrupt-parent = <&r_intc>;
-		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_LOW>;
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
 		x-powers,drive-vbus-en;
 
 		vin1-supply = <&reg_vcc5v>;
Signature · 1 line
2.35.8
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Andre Przywara

The "r_intc" interrupt controller on the A64 uses a mapping scheme, so the first (and only) NMI interrupt #0 appears as interrupt number 32 (cf. the top comment in drivers/irqchip/irq-sun6i-r.c).

Fix that number in the interrupts property to properly forward PMIC interrupts to the CPU.

Fixes 4d39a8eb07eb ("arm64: dts: allwinner: Add Jide Remix Mini PC support")
Quoted 30 lines

---
Hi,

I didn't notice this before because I changed the interrupts property in the U-Boot copy of the DT, to comply with the old binding, where it is actually IRQ 0, and then used that DTB.

Cheers,
Andre

 arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts +1 -2
index b6e3c169797f0..0dba413963776 100644
@@ -191,7 +191,7 @@ axp803: pmic@3a3 {
                compatible = "x-powers,axp803";
                reg = <0x3a3>;
                interrupt-parent = <&r_intc>;
-               interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
                x-powers,drive-vbus-en;
 
                vin1-supply = <&reg_vcc5v>;
--

2.35.8

Applied
#2 lore raw
In reply to Andre Przywara
Quoted 8 lines · Andre Przywara

The "r_intc" interrupt controller on the A64 uses a mapping scheme, so the first (and only) NMI interrupt #0 appears as interrupt number 32 (cf. the top comment in drivers/irqchip/irq-sun6i-r.c).

Fix that number in the interrupts property to properly forward PMIC interrupts to the CPU.

[...]

Applied to sunxi/fixes-for-6.10 in sunxi/linux.git, thanks!

[1/1] arm64: dts: allwinner: Fix PMIC interrupt number

      https://git.kernel.org/sunxi/linux/c/5b36166e599b

Best regards,

Signature · 1 line
Chen-Yu Tsai <[email protected]>