In the discussions here: https://lore.kernel.org/all/CAMuHMdXM34nNz1nfowNqDvdsdg+d69Bo3_ufs6fbcq65iYd5-A@xxxxxxxxxxxxxx/T/#m3449390080c5a0c8f59b8f8286a87e31e093b98b Marc Zyngier points out that the ls-extirq driver should have never used the "interrupt-map" keyword for mapping its channels to GIC interrupts. This change modifies the device trees for the LS1021A to use a driver-specific OF property for that purpose. The change is intended to target stable kernels, to accelerate the conversion and ultimate removal of the improperly used "interrupt-map" property. Note that "interrupt-map-mask" isn't needed now (nor was it needed before, it was just there to keep an apparent compatibility in form with the reserved "interrupt-map" property). So delete it. Fixes: d27f9d634c9b ("ARM: dts: ls1021a: add node describing external interrupt lines") Signed-off-by: Vladimir Oltean <vladimir.oltean@xxxxxxx> --- arch/arm/boot/dts/ls1021a.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index 2e69d6eab4d1..1efdfeb9c110 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -185,14 +185,13 @@ extirq: interrupt-controller@1ac { #address-cells = <0>; interrupt-controller; reg = <0x1ac 4>; - interrupt-map = + fsl,extirq-map = <0 0 &gic GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>, <1 0 &gic GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>, <2 0 &gic GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>, <3 0 &gic GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>, <4 0 &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, <5 0 &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>; - interrupt-map-mask = <0xffffffff 0x0>; }; }; -- 2.25.1
