arm64: dts: imx8: Use GIC_SPI for interrupt-map for readability

Decoding interrupt-map is tricky, because it consists of five
components.  Use known GIC_SPI define in final interrupt specifier
component makes easier to read.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi
index 9b8b1380c4c2bb25f691d72a0217915cf3824889..469de8b536b5866ea83cc0542941039996ae5f23 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi
@@ -68,10 +68,10 @@ hsio_subsys: bus@5f000000 {
                clock-names = "dbi", "mstr", "slv";
                bus-range = <0x00 0xff>;
                device_type = "pci";
-               interrupt-map = <0 0 0 1 &gic 0 105 4>,
-                               <0 0 0 2 &gic 0 106 4>,
-                               <0 0 0 3 &gic 0 107 4>,
-                               <0 0 0 4 &gic 0 108 4>;
+               interrupt-map = <0 0 0 1 &gic GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 2 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 3 &gic GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 4 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-map-mask = <0 0 0 0x7>;
                num-lanes = <1>;
                num-viewport = <4>;

diff --git a/arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi b/arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi
index bbc6abb0fdf25b650dacb8dfcbbbe5dac9ed5cce..ec466e4d7df5467803243404795a9a6a1da890b2 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi
@@ -42,10 +42,10 @@
                #interrupt-cells = <1>;
                interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "msi";
-               interrupt-map = <0 0 0 1 &gic 0 47 4>,
-                               <0 0 0 2 &gic 0 48 4>,
-                               <0 0 0 3 &gic 0 49 4>,
-                               <0 0 0 4 &gic 0 50 4>;
+               interrupt-map = <0 0 0 1 &gic GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 2 &gic GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 3 &gic GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 4 &gic GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-map-mask = <0 0 0 0x7>;
        };
 

diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi
index 50c0f6b0f0bdc2bd6fd3a19e08d1b7a723353783..bd6e0aa27efe90d3489c16c705d508028b268ee7 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi
@@ -30,10 +30,10 @@
                clock-names = "dbi", "mstr", "slv";
                bus-range = <0x00 0xff>;
                device_type = "pci";
-               interrupt-map = <0 0 0 1 &gic 0 73 4>,
-                               <0 0 0 2 &gic 0 74 4>,
-                               <0 0 0 3 &gic 0 75 4>,
-                               <0 0 0 4 &gic 0 76 4>;
+               interrupt-map = <0 0 0 1 &gic GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 2 &gic GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 3 &gic GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 4 &gic GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-map-mask = <0 0 0 0x7>;
                num-lanes = <1>;
                num-viewport = <4>;
@@ -80,10 +80,10 @@
                clock-names = "dbi", "mstr", "slv";
                bus-range = <0x00 0xff>;
                device_type = "pci";
-               interrupt-map = <0 0 0 1 &gic 0 105 4>,
-                               <0 0 0 2 &gic 0 106 4>,
-                               <0 0 0 3 &gic 0 107 4>,
-                               <0 0 0 4 &gic 0 108 4>;
+               interrupt-map = <0 0 0 1 &gic GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 2 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 3 &gic GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
+                               <0 0 0 4 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-map-mask = <0 0 0 0x7>;
                num-lanes = <1>;
                num-viewport = <4>;