arm64: dts: uniphier: Use GIC interrupt definitions

Use human-readable definitions for GIC interrupt type and flag, instead of
hard-coding the numbers. No functional change.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Link: https://lore.kernel.org/r/20220913042321.4817-6-hayashi.kunihiko@socionext.com'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
index 41b47f5..414aeb9 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
@@ -39,11 +39,11 @@
 };
 
 &ethsc {
-       interrupts = <0 8>;
+       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &serialsc {
-       interrupts = <0 8>;
+       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &serial0 {

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index 16d281c..525bff7 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/uniphier-gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
        compatible = "socionext,uniphier-ld11";
@@ -102,10 +103,10 @@
 
        timer {
                compatible = "arm,armv8-timer";
-               interrupts = <1 13 4>,
-                            <1 14 4>,
-                            <1 11 4>,
-                            <1 10 4>;
+               interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;
        };
 
        reserved-memory {
@@ -131,7 +132,7 @@
                        reg = <0x54006000 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 39 4>;
+                       interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi0>;
                        clocks = <&peri_clk 11>;
@@ -144,7 +145,7 @@
                        reg = <0x54006100 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 216 4>;
+                       interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi1>;
                        clocks = <&peri_clk 12>;
@@ -155,7 +156,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006800 0x40>;
-                       interrupts = <0 33 4>;
+                       interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
@@ -166,7 +167,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006900 0x40>;
-                       interrupts = <0 35 4>;
+                       interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
@@ -177,7 +178,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006a00 0x40>;
-                       interrupts = <0 37 4>;
+                       interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
@@ -188,7 +189,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006b00 0x40>;
-                       interrupts = <0 177 4>;
+                       interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
@@ -223,7 +224,7 @@
                audio@56000000 {
                        compatible = "socionext,uniphier-ld11-aio";
                        reg = <0x56000000 0x80000>;
-                       interrupts = <0 144 4>;
+                       interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_aout1>,
                                    <&pinctrl_aoutiec1>;
@@ -323,7 +324,7 @@
                        reg = <0x58780000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 41 4>;
+                       interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c0>;
                        clocks = <&peri_clk 4>;
@@ -337,7 +338,7 @@
                        reg = <0x58781000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 42 4>;
+                       interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c1>;
                        clocks = <&peri_clk 5>;
@@ -350,7 +351,7 @@
                        reg = <0x58782000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 43 4>;
+                       interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&peri_clk 6>;
                        resets = <&peri_rst 6>;
                        clock-frequency = <400000>;
@@ -362,7 +363,7 @@
                        reg = <0x58783000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 44 4>;
+                       interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c3>;
                        clocks = <&peri_clk 7>;
@@ -376,7 +377,7 @@
                        reg = <0x58784000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 45 4>;
+                       interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c4>;
                        clocks = <&peri_clk 8>;
@@ -389,7 +390,7 @@
                        reg = <0x58785000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 25 4>;
+                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&peri_clk 9>;
                        resets = <&peri_rst 9>;
                        clock-frequency = <400000>;
@@ -440,7 +441,7 @@
                emmc: mmc@5a000000 {
                        compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
                        reg = <0x5a000000 0x400>;
-                       interrupts = <0 78 4>;
+                       interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_emmc>;
                        clocks = <&sys_clk 4>;
@@ -460,7 +461,7 @@
                        compatible = "socionext,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a800100 0x100>;
-                       interrupts = <0 243 4>;
+                       interrupts = <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>;
                        clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
@@ -476,7 +477,7 @@
                        compatible = "socionext,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a810100 0x100>;
-                       interrupts = <0 244 4>;
+                       interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb1>;
                        clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
@@ -492,7 +493,7 @@
                        compatible = "socionext,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a820100 0x100>;
-                       interrupts = <0 245 4>;
+                       interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb2>;
                        clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
@@ -573,7 +574,7 @@
                xdmac: dma-controller@5fc10000 {
                        compatible = "socionext,uniphier-xdmac";
                        reg = <0x5fc10000 0x5300>;
-                       interrupts = <0 188 4>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
                        dma-channels = <16>;
                        #dma-cells = <2>;
                };
@@ -591,7 +592,7 @@
                              <0x5fe40000 0x80000>;     /* GICR */
                        interrupt-controller;
                        #interrupt-cells = <3>;
-                       interrupts = <1 9 4>;
+                       interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
                };
 
                sysctrl@61840000 {
@@ -618,7 +619,7 @@
                        compatible = "socionext,uniphier-ld11-ave4";
                        status = "disabled";
                        reg = <0x65000000 0x8500>;
-                       interrupts = <0 66 4>;
+                       interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "ether";
                        clocks = <&sys_clk 6>;
                        reset-names = "ether";
@@ -640,7 +641,7 @@
                        reg = <0x68000000 0x20>, <0x68100000 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 65 4>;
+                       interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_nand>;
                        clock-names = "nand", "nand_x", "ecc";

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-akebi96.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-akebi96.dts
index b55b70d..fba454a 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-akebi96.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-akebi96.dts
@@ -110,7 +110,7 @@
                spi-max-frequency = <12500000>;
                interrupt-parent = <&gpio>;
                interrupt-names = "udc";
-               interrupts = <0 2>;
+               interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 8c11158..a5f2083 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -39,11 +39,11 @@
 };
 
 &ethsc {
-       interrupts = <0 8>;
+       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &serialsc {
-       interrupts = <0 8>;
+       interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &serial0 {

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 6466c92..b789654 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/uniphier-gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
@@ -176,10 +177,10 @@
 
        timer {
                compatible = "arm,armv8-timer";
-               interrupts = <1 13 4>,
-                            <1 14 4>,
-                            <1 11 4>,
-                            <1 10 4>;
+               interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;
        };
 
        thermal-zones {
@@ -236,7 +237,7 @@
                        reg = <0x54006000 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 39 4>;
+                       interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi0>;
                        clocks = <&peri_clk 11>;
@@ -249,7 +250,7 @@
                        reg = <0x54006100 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 216 4>;
+                       interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi1>;
                        clocks = <&peri_clk 12>;
@@ -262,7 +263,7 @@
                        reg = <0x54006200 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 229 4>;
+                       interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi2>;
                        clocks = <&peri_clk 13>;
@@ -275,7 +276,7 @@
                        reg = <0x54006300 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 230 4>;
+                       interrupts = <GIC_SPI 230 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi3>;
                        clocks = <&peri_clk 14>;
@@ -286,7 +287,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006800 0x40>;
-                       interrupts = <0 33 4>;
+                       interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
@@ -297,7 +298,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006900 0x40>;
-                       interrupts = <0 35 4>;
+                       interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
@@ -308,7 +309,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006a00 0x40>;
-                       interrupts = <0 37 4>;
+                       interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
@@ -319,7 +320,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006b00 0x40>;
-                       interrupts = <0 177 4>;
+                       interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
@@ -348,7 +349,7 @@
                audio@56000000 {
                        compatible = "socionext,uniphier-ld20-aio";
                        reg = <0x56000000 0x80000>;
-                       interrupts = <0 144 4>;
+                       interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_aout1>,
                                    <&pinctrl_aoutiec1>;
@@ -448,7 +449,7 @@
                        reg = <0x58780000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 41 4>;
+                       interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c0>;
                        clocks = <&peri_clk 4>;
@@ -462,7 +463,7 @@
                        reg = <0x58781000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 42 4>;
+                       interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c1>;
                        clocks = <&peri_clk 5>;
@@ -475,7 +476,7 @@
                        reg = <0x58782000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 43 4>;
+                       interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&peri_clk 6>;
                        resets = <&peri_rst 6>;
                        clock-frequency = <400000>;
@@ -487,7 +488,7 @@
                        reg = <0x58783000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 44 4>;
+                       interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c3>;
                        clocks = <&peri_clk 7>;
@@ -501,7 +502,7 @@
                        reg = <0x58784000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 45 4>;
+                       interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c4>;
                        clocks = <&peri_clk 8>;
@@ -514,7 +515,7 @@
                        reg = <0x58785000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 25 4>;
+                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&peri_clk 9>;
                        resets = <&peri_rst 9>;
                        clock-frequency = <400000>;
@@ -570,7 +571,7 @@
                emmc: mmc@5a000000 {
                        compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
                        reg = <0x5a000000 0x400>;
-                       interrupts = <0 78 4>;
+                       interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_emmc>;
                        clocks = <&sys_clk 4>;
@@ -590,7 +591,7 @@
                        compatible = "socionext,uniphier-sd-v3.1.1";
                        status = "disabled";
                        reg = <0x5a400000 0x800>;
-                       interrupts = <0 76 4>;
+                       interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sd>;
                        clocks = <&sd_clk 0>;
@@ -675,7 +676,7 @@
                xdmac: dma-controller@5fc10000 {
                        compatible = "socionext,uniphier-xdmac";
                        reg = <0x5fc10000 0x5300>;
-                       interrupts = <0 188 4>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
                        dma-channels = <16>;
                        #dma-cells = <2>;
                };
@@ -693,7 +694,7 @@
                              <0x5fe80000 0x80000>;     /* GICR */
                        interrupt-controller;
                        #interrupt-cells = <3>;
-                       interrupts = <1 9 4>;
+                       interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
                };
 
                sysctrl@61840000 {
@@ -717,7 +718,7 @@
 
                        pvtctl: thermal-sensor {
                                compatible = "socionext,uniphier-ld20-thermal";
-                               interrupts = <0 3 4>;
+                               interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
                                #thermal-sensor-cells = <0>;
                                socionext,tmod-calibration = <0x0f22 0x68ee>;
                        };
@@ -727,7 +728,7 @@
                        compatible = "socionext,uniphier-ld20-ave4";
                        status = "disabled";
                        reg = <0x65000000 0x8500>;
-                       interrupts = <0 66 4>;
+                       interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_ether_rgmii>;
                        clock-names = "ether";
@@ -749,7 +750,7 @@
                        status = "disabled";
                        reg = <0x65a00000 0xcd00>;
                        interrupt-names = "host";
-                       interrupts = <0 134 4>;
+                       interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb1>,
                                    <&pinctrl_usb2>, <&pinctrl_usb3>;
@@ -915,7 +916,8 @@
                                <0x82000000 0 0x20000000 0x20000000 0 0x0ffe0000>;
                        #interrupt-cells = <1>;
                        interrupt-names = "dma", "msi";
-                       interrupts = <0 224 4>, <0 225 4>;
+                       interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-map-mask = <0 0 0 7>;
                        interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */
                                        <0 0 0 2 &pcie_intc 1>, /* INTB */
@@ -928,7 +930,7 @@
                                interrupt-controller;
                                #interrupt-cells = <1>;
                                interrupt-parent = <&gic>;
-                               interrupts = <0 226 4>;
+                               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
                        };
                };
 
@@ -950,7 +952,7 @@
                        reg = <0x68000000 0x20>, <0x68100000 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 65 4>;
+                       interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_nand>;
                        clock-names = "nand", "nand_x", "ecc";

diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
index feb070f..506c7b9 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
@@ -40,11 +40,11 @@
 };
 
 &ethsc {
-       interrupts = <4 8>;
+       interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &serialsc {
-       interrupts = <4 8>;
+       interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
 };
 
 &spi0 {

diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
index 513a2b9..bd5c1e3 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/uniphier-gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
@@ -135,10 +136,10 @@
 
        timer {
                compatible = "arm,armv8-timer";
-               interrupts = <1 13 4>,
-                            <1 14 4>,
-                            <1 11 4>,
-                            <1 10 4>;
+               interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>;
        };
 
        thermal-zones {
@@ -195,7 +196,7 @@
                        reg = <0x54006000 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 39 4>;
+                       interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi0>;
                        clocks = <&peri_clk 11>;
@@ -208,7 +209,7 @@
                        reg = <0x54006100 0x100>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 216 4>;
+                       interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_spi1>;
                        clocks = <&peri_clk 12>;
@@ -219,7 +220,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006800 0x40>;
-                       interrupts = <0 33 4>;
+                       interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart0>;
                        clocks = <&peri_clk 0>;
@@ -230,7 +231,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006900 0x40>;
-                       interrupts = <0 35 4>;
+                       interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart1>;
                        clocks = <&peri_clk 1>;
@@ -241,7 +242,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006a00 0x40>;
-                       interrupts = <0 37 4>;
+                       interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart2>;
                        clocks = <&peri_clk 2>;
@@ -252,7 +253,7 @@
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        reg = <0x54006b00 0x40>;
-                       interrupts = <0 177 4>;
+                       interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_uart3>;
                        clocks = <&peri_clk 3>;
@@ -284,7 +285,7 @@
                        reg = <0x58780000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 41 4>;
+                       interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c0>;
                        clocks = <&peri_clk 4>;
@@ -298,7 +299,7 @@
                        reg = <0x58781000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 42 4>;
+                       interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c1>;
                        clocks = <&peri_clk 5>;
@@ -312,7 +313,7 @@
                        reg = <0x58782000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 43 4>;
+                       interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c2>;
                        clocks = <&peri_clk 6>;
@@ -326,7 +327,7 @@
                        reg = <0x58783000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 44 4>;
+                       interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_i2c3>;
                        clocks = <&peri_clk 7>;
@@ -340,7 +341,7 @@
                        reg = <0x58786000 0x80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 26 4>;
+                       interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&peri_clk 10>;
                        resets = <&peri_rst 10>;
                        clock-frequency = <400000>;
@@ -396,7 +397,7 @@
                emmc: mmc@5a000000 {
                        compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
                        reg = <0x5a000000 0x400>;
-                       interrupts = <0 78 4>;
+                       interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_emmc>;
                        clocks = <&sys_clk 4>;
@@ -416,7 +417,7 @@
                        compatible = "socionext,uniphier-sd-v3.1.1";
                        status = "disabled";
                        reg = <0x5a400000 0x800>;
-                       interrupts = <0 76 4>;
+                       interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default", "uhs";
                        pinctrl-0 = <&pinctrl_sd>;
                        pinctrl-1 = <&pinctrl_sd_uhs>;
@@ -505,7 +506,7 @@
                xdmac: dma-controller@5fc10000 {
                        compatible = "socionext,uniphier-xdmac";
                        reg = <0x5fc10000 0x5300>;
-                       interrupts = <0 188 4>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
                        dma-channels = <16>;
                        #dma-cells = <2>;
                };
@@ -523,7 +524,7 @@
                              <0x5fe80000 0x80000>;     /* GICR */
                        interrupt-controller;
                        #interrupt-cells = <3>;
-                       interrupts = <1 9 4>;
+                       interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
                };
 
                sysctrl@61840000 {
@@ -547,7 +548,7 @@
 
                        pvtctl: thermal-sensor {
                                compatible = "socionext,uniphier-pxs3-thermal";
-                               interrupts = <0 3 4>;
+                               interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
                                #thermal-sensor-cells = <0>;
                                socionext,tmod-calibration = <0x0f22 0x68ee>;
                        };
@@ -557,7 +558,7 @@
                        compatible = "socionext,uniphier-pxs3-ave4";
                        status = "disabled";
                        reg = <0x65000000 0x8500>;
-                       interrupts = <0 66 4>;
+                       interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_ether_rgmii>;
                        clock-names = "ether";
@@ -578,7 +579,7 @@
                        compatible = "socionext,uniphier-pxs3-ave4";
                        status = "disabled";
                        reg = <0x65200000 0x8500>;
-                       interrupts = <0 67 4>;
+                       interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_ether1_rgmii>;
                        clock-names = "ether";
@@ -600,7 +601,7 @@
                        status = "disabled";
                        reg = <0x65a00000 0xcd00>;
                        interrupt-names = "dwc_usb3";
-                       interrupts = <0 134 4>;
+                       interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;
                        clock-names = "ref", "bus_early", "suspend";
@@ -702,7 +703,7 @@
                        status = "disabled";
                        reg = <0x65c00000 0xcd00>;
                        interrupt-names = "dwc_usb3";
-                       interrupts = <0 137 4>;
+                       interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;
                        clock-names = "ref", "bus_early", "suspend";
@@ -812,7 +813,8 @@
                                <0x82000000 0 0x20000000 0x20000000 0 0x0ffe0000>;
                        #interrupt-cells = <1>;
                        interrupt-names = "dma", "msi";
-                       interrupts = <0 224 4>, <0 225 4>;
+                       interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-map-mask = <0 0 0 7>;
                        interrupt-map = <0 0 0 1 &pcie_intc 0>, /* INTA */
                                        <0 0 0 2 &pcie_intc 1>, /* INTB */
@@ -825,7 +827,7 @@
                                interrupt-controller;
                                #interrupt-cells = <1>;
                                interrupt-parent = <&gic>;
-                               interrupts = <0 226 4>;
+                               interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
                        };
                };
 
@@ -847,7 +849,7 @@
                        reg = <0x68000000 0x20>, <0x68100000 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupts = <0 65 4>;
+                       interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_nand>;
                        clock-names = "nand", "nand_x", "ecc";