Skip to content

Commit 14702b3

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fix from Arnd Bergmann: "Here is one last regression fix for 5.17, reverting a patch that went into 5.16 as a cleanup that ended up breaking external interrupts on Layerscape chips. The revert makes it work again, but also reintroduces a build time warning about the nonstandard DT binding that will have to be dealt with in the future" * tag 'soc-fixes-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: Revert "arm64: dts: freescale: Fix 'interrupt-map' parent address cells"
2 parents f76da4d + 1447c63 commit 14702b3

3 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -253,18 +253,18 @@
253253
interrupt-controller;
254254
reg = <0x14 4>;
255255
interrupt-map =
256-
<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
257-
<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
258-
<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
259-
<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
260-
<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
261-
<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
262-
<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
263-
<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
264-
<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
265-
<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
266-
<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
267-
<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
256+
<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
257+
<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
258+
<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
259+
<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
260+
<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
261+
<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
262+
<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
263+
<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
264+
<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
265+
<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
266+
<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
267+
<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
268268
interrupt-map-mask = <0xffffffff 0x0>;
269269
};
270270
};

‎arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -293,18 +293,18 @@
293293
interrupt-controller;
294294
reg = <0x14 4>;
295295
interrupt-map =
296-
<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
297-
<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
298-
<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
299-
<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
300-
<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
301-
<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
302-
<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
303-
<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
304-
<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
305-
<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
306-
<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
307-
<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
296+
<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
297+
<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
298+
<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
299+
<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
300+
<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
301+
<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
302+
<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
303+
<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
304+
<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
305+
<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
306+
<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
307+
<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
308308
interrupt-map-mask = <0xffffffff 0x0>;
309309
};
310310
};

‎arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -680,18 +680,18 @@
680680
interrupt-controller;
681681
reg = <0x14 4>;
682682
interrupt-map =
683-
<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
684-
<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
685-
<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
686-
<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
687-
<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
688-
<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
689-
<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
690-
<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
691-
<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
692-
<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
693-
<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
694-
<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
683+
<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
684+
<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
685+
<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
686+
<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
687+
<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
688+
<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
689+
<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
690+
<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
691+
<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
692+
<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
693+
<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
694+
<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
695695
interrupt-map-mask = <0xffffffff 0x0>;
696696
};
697697
};

0 commit comments

Comments
 (0)