Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm: dts: calxeda: Fix interrupt grouping

Currently multiple interrupts for some devices are written as one array
instead of using the DT grouping notation (<0 42 4>, <0 23 4>).
This ends up in the same binary representation in the .dtb, but is
semantically not equivalent. The yaml schema checks will stumble over
this, so lets fix that first.

I refrained from using the symbolic names for GIC_SPI/GIC_PPI and
IRQ_TYPE_LEVEL_HIGH, mostly because it increases the delta between the
original DTS files and the mainline versions, so it's just additional
churn.

Link: https://lore.kernel.org/r/20200228135106.220620-4-andre.przywara@arm.com
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Andre Przywara and committed by
Arnd Bergmann
7a375c90 0f132117

+5 -5
+1 -1
arch/arm/boot/dts/ecx-2000.dts
··· 93 93 94 94 pmu { 95 95 compatible = "arm,cortex-a9-pmu"; 96 - interrupts = <0 76 4 0 75 4 0 74 4 0 73 4>; 96 + interrupts = <0 76 4>, <0 75 4>, <0 74 4>, <0 73 4>; 97 97 }; 98 98 }; 99 99 };
+2 -2
arch/arm/boot/dts/ecx-common.dtsi
··· 202 202 ethernet@fff50000 { 203 203 compatible = "calxeda,hb-xgmac"; 204 204 reg = <0xfff50000 0x1000>; 205 - interrupts = <0 77 4 0 78 4 0 79 4>; 205 + interrupts = <0 77 4>, <0 78 4>, <0 79 4>; 206 206 dma-coherent; 207 207 }; 208 208 209 209 ethernet@fff51000 { 210 210 compatible = "calxeda,hb-xgmac"; 211 211 reg = <0xfff51000 0x1000>; 212 - interrupts = <0 80 4 0 81 4 0 82 4>; 212 + interrupts = <0 80 4>, <0 81 4>, <0 82 4>; 213 213 dma-coherent; 214 214 }; 215 215
+2 -2
arch/arm/boot/dts/highbank.dts
··· 142 142 143 143 pmu { 144 144 compatible = "arm,cortex-a9-pmu"; 145 - interrupts = <0 76 4 0 75 4 0 74 4 0 73 4>; 145 + interrupts = <0 76 4>, <0 75 4>, <0 74 4>, <0 73 4>; 146 146 }; 147 147 148 148 149 149 sregs@fff3c200 { 150 150 compatible = "calxeda,hb-sregs-l2-ecc"; 151 151 reg = <0xfff3c200 0x100>; 152 - interrupts = <0 71 4 0 72 4>; 152 + interrupts = <0 71 4>, <0 72 4>; 153 153 }; 154 154 155 155 };