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>

diff --git a/arch/arm/boot/dts/ecx-2000.dts b/arch/arm/boot/dts/ecx-2000.dts
index 8e0489607704524d94ffe76252f4e20e3f8a734d..f6eb71553b95230e1356386bbb320500697b296c 100644 (file)
--- a/arch/arm/boot/dts/ecx-2000.dts
+++ b/arch/arm/boot/dts/ecx-2000.dts
@@ -93,7 +93,7 @@
 
                pmu {
                        compatible = "arm,cortex-a9-pmu";
-                       interrupts = <0 76 4  0 75 4  0 74 4  0 73 4>;
+                       interrupts = <0 76 4>, <0 75 4>, <0 74 4>, <0 73 4>;
                };
        };
 };

diff --git a/arch/arm/boot/dts/ecx-common.dtsi b/arch/arm/boot/dts/ecx-common.dtsi
index f819e3328a9ecb416b67a16d3468479f239dfc2e..b7e74a357471f99fc1af5dd4ee8765d7e44ea079 100644 (file)
--- a/arch/arm/boot/dts/ecx-common.dtsi
+++ b/arch/arm/boot/dts/ecx-common.dtsi
@@ -202,14 +202,14 @@
                ethernet@fff50000 {
                        compatible = "calxeda,hb-xgmac";
                        reg = <0xfff50000 0x1000>;
-                       interrupts = <0 77 4  0 78 4  0 79 4>;
+                       interrupts = <0 77 4>, <0 78 4>, <0 79 4>;
                        dma-coherent;
                };
 
                ethernet@fff51000 {
                        compatible = "calxeda,hb-xgmac";
                        reg = <0xfff51000 0x1000>;
-                       interrupts = <0 80 4  0 81 4  0 82 4>;
+                       interrupts = <0 80 4>, <0 81 4>, <0 82 4>;
                        dma-coherent;
                };
 

diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
index 9e34d1bd7994656540d3d30e517251f050c5dcd6..b6b0225a769e6956597f1611438a386b91ec8c6a 100644 (file)
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@ -142,14 +142,14 @@
 
                pmu {
                        compatible = "arm,cortex-a9-pmu";
-                       interrupts = <0 76 4  0 75 4  0 74 4  0 73 4>;
+                       interrupts = <0 76 4>, <0 75 4>, <0 74 4>, <0 73 4>;
                };
 
 
                sregs@fff3c200 {
                        compatible = "calxeda,hb-sregs-l2-ecc";
                        reg = <0xfff3c200 0x100>;
-                       interrupts = <0 71 4  0 72 4>;
+                       interrupts = <0 71 4>, <0 72 4>;
                };
 
        };