| Message ID | 20240515234852.26929-1-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: allwinner: Fix PMIC interrupt number | expand |
On Thu, May 16, 2024 at 7:50 AM Andre Przywara <andre.przywara@arm.com> wrote: > > 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. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Fixes: 4d39a8eb07eb ("arm64: dts: allwinner: Add Jide Remix Mini PC support") Reviewed-by: Chen-Yu Tsai <wens@csie.org> > --- > 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(-) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts > index b6e3c169797f0..0dba413963776 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts > @@ -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 = <®_vcc5v>; > -- > 2.35.8 > >
On Thu, 16 May 2024 00:48:52 +0100, Andre Przywara wrote: > 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,
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts index b6e3c169797f0..0dba413963776 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts @@ -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 = <®_vcc5v>;
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. Signed-off-by: Andre Przywara <andre.przywara@arm.com> 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(-)