| From 33a088aff1b797b7b431f5153c4d94b57fbf9344 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 19 Nov 2013 03:18:25 +0100 |
| Subject: ARM: shmobile: Use interrupt macros in SoC DT files |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 5f75e73c376c247a2c7bbe6f3fa3901b2d8f1a9c) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++---------- |
| arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++----------------- |
| arch/arm/boot/dts/r8a7778.dtsi | 44 +++++++------- |
| arch/arm/boot/dts/r8a7779.dtsi | 42 +++++++------- |
| arch/arm/boot/dts/r8a7790.dtsi | 50 +++++++++------- |
| arch/arm/boot/dts/r8a7791.dtsi | 49 ++++++++-------- |
| arch/arm/boot/dts/sh73a0.dtsi | 128 +++++++++++++++++++++-------------------- |
| 7 files changed, 295 insertions(+), 232 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi |
| index e079c994fd70..b4a6c3b43ee9 100644 |
| --- a/arch/arm/boot/dts/r8a73a4.dtsi |
| +++ b/arch/arm/boot/dts/r8a73a4.dtsi |
| @@ -9,6 +9,9 @@ |
| * kind, whether express or implied. |
| */ |
| |
| +#include <dt-bindings/interrupt-controller/arm-gic.h> |
| +#include <dt-bindings/interrupt-controller/irq.h> |
| + |
| / { |
| compatible = "renesas,r8a73a4"; |
| interrupt-parent = <&gic>; |
| @@ -36,15 +39,15 @@ |
| <0 0xf1002000 0 0x1000>, |
| <0 0xf1004000 0 0x2000>, |
| <0 0xf1006000 0 0x2000>; |
| - interrupts = <1 9 0xf04>; |
| + interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; |
| }; |
| |
| timer { |
| compatible = "arm,armv7-timer"; |
| - interrupts = <1 13 0xf08>, |
| - <1 14 0xf08>, |
| - <1 11 0xf08>, |
| - <1 10 0xf08>; |
| + interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; |
| }; |
| |
| irqc0: interrupt-controller@e61c0000 { |
| @@ -53,14 +56,38 @@ |
| interrupt-controller; |
| reg = <0 0xe61c0000 0 0x200>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>, |
| - <0 4 4>, <0 5 4>, <0 6 4>, <0 7 4>, |
| - <0 8 4>, <0 9 4>, <0 10 4>, <0 11 4>, |
| - <0 12 4>, <0 13 4>, <0 14 4>, <0 15 4>, |
| - <0 16 4>, <0 17 4>, <0 18 4>, <0 19 4>, |
| - <0 20 4>, <0 21 4>, <0 22 4>, <0 23 4>, |
| - <0 24 4>, <0 25 4>, <0 26 4>, <0 27 4>, |
| - <0 28 4>, <0 29 4>, <0 30 4>, <0 31 4>; |
| + interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 1 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 2 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 3 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 4 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 5 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 6 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 7 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 8 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 9 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 10 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 11 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 12 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 13 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 14 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 15 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 16 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 17 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 18 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 19 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 20 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 21 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 22 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 23 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 24 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 25 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 26 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 27 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 28 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 29 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 30 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 31 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| irqc1: interrupt-controller@e61c0200 { |
| @@ -69,13 +96,32 @@ |
| interrupt-controller; |
| reg = <0 0xe61c0200 0 0x200>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 32 4>, <0 33 4>, <0 34 4>, <0 35 4>, |
| - <0 36 4>, <0 37 4>, <0 38 4>, <0 39 4>, |
| - <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>, |
| - <0 44 4>, <0 45 4>, <0 46 4>, <0 47 4>, |
| - <0 48 4>, <0 49 4>, <0 50 4>, <0 51 4>, |
| - <0 52 4>, <0 53 4>, <0 54 4>, <0 55 4>, |
| - <0 56 4>, <0 57 4>; |
| + interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 33 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 34 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 35 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 36 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 37 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 38 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 39 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 40 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 41 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 42 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 43 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 44 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 45 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 46 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 47 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 48 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 49 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 50 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 51 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 52 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 53 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 54 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 55 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 56 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 57 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| dmac: dma-multiplexer@0 { |
| @@ -126,7 +172,7 @@ |
| reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>, |
| <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 69 4>; |
| + interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| i2c0: i2c@e6500000 { |
| @@ -175,7 +221,7 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0 0xe6540000 0 0x428>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 178 0x4>; |
| + interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -185,7 +231,7 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0 0xe60b0000 0 0x428>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 179 0x4>; |
| + interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -195,7 +241,7 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0 0xe6550000 0 0x428>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 184 0x4>; |
| + interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -205,7 +251,7 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0 0xe6560000 0 0x428>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 185 0x4>; |
| + interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -215,7 +261,7 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0 0xe6570000 0 0x428>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 173 0x4>; |
| + interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -223,7 +269,7 @@ |
| compatible = "renesas,sh-mmcif"; |
| reg = <0 0xee200000 0 0x80>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 169 0x4>; |
| + interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; |
| reg-io-width = <4>; |
| status = "disabled"; |
| }; |
| @@ -232,7 +278,7 @@ |
| compatible = "renesas,sh-mmcif"; |
| reg = <0 0xee220000 0 0x80>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 170 0x4>; |
| + interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; |
| reg-io-width = <4>; |
| status = "disabled"; |
| }; |
| @@ -248,7 +294,7 @@ |
| compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee100000 0 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 165 4>; |
| + interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| @@ -257,7 +303,7 @@ |
| compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee120000 0 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 166 4>; |
| + interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| @@ -266,7 +312,7 @@ |
| compatible = "renesas,sdhi-r8a73a4"; |
| reg = <0 0xee140000 0 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 167 4>; |
| + interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi |
| index 4cc945a799bb..b1c2ed961eed 100644 |
| --- a/arch/arm/boot/dts/r8a7740.dtsi |
| +++ b/arch/arm/boot/dts/r8a7740.dtsi |
| @@ -10,6 +10,8 @@ |
| |
| /include/ "skeleton.dtsi" |
| |
| +#include <dt-bindings/interrupt-controller/irq.h> |
| + |
| / { |
| compatible = "renesas,r8a7740"; |
| |
| @@ -34,7 +36,7 @@ |
| |
| pmu { |
| compatible = "arm,cortex-a9-pmu"; |
| - interrupts = <0 83 4>; |
| + interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| /* irqpin0: IRQ0 - IRQ7 */ |
| @@ -48,14 +50,14 @@ |
| <0xe6900040 1>, |
| <0xe6900060 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4>; |
| + interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| /* irqpin1: IRQ8 - IRQ15 */ |
| @@ -69,14 +71,14 @@ |
| <0xe6900044 1>, |
| <0xe6900064 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4>; |
| + interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| /* irqpin2: IRQ16 - IRQ23 */ |
| @@ -90,14 +92,14 @@ |
| <0xe6900048 1>, |
| <0xe6900068 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4>; |
| + interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| /* irqpin3: IRQ24 - IRQ31 */ |
| @@ -111,14 +113,14 @@ |
| <0xe690004c 1>, |
| <0xe690006c 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4 |
| - 0 149 0x4>; |
| + interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH |
| + 0 149 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| i2c0: i2c@fff20000 { |
| @@ -127,10 +129,10 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0xfff20000 0x425>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 201 0x4 |
| - 0 202 0x4 |
| - 0 203 0x4 |
| - 0 204 0x4>; |
| + interrupts = <0 201 IRQ_TYPE_LEVEL_HIGH |
| + 0 202 IRQ_TYPE_LEVEL_HIGH |
| + 0 203 IRQ_TYPE_LEVEL_HIGH |
| + 0 204 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -140,10 +142,10 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0xe6c20000 0x425>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 70 0x4 |
| - 0 71 0x4 |
| - 0 72 0x4 |
| - 0 73 0x4>; |
| + interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH |
| + 0 71 IRQ_TYPE_LEVEL_HIGH |
| + 0 72 IRQ_TYPE_LEVEL_HIGH |
| + 0 73 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -166,8 +168,8 @@ |
| compatible = "renesas,sh-mmcif"; |
| reg = <0xe6bd0000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 56 4 |
| - 0 57 4>; |
| + interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH |
| + 0 57 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -175,9 +177,9 @@ |
| compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xe6850000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 117 4 |
| - 0 118 4 |
| - 0 119 4>; |
| + interrupts = <0 117 IRQ_TYPE_LEVEL_HIGH |
| + 0 118 IRQ_TYPE_LEVEL_HIGH |
| + 0 119 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -187,9 +189,9 @@ |
| compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xe6860000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 121 4 |
| - 0 122 4 |
| - 0 123 4>; |
| + interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH |
| + 0 122 IRQ_TYPE_LEVEL_HIGH |
| + 0 123 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -199,9 +201,9 @@ |
| compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xe6870000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 125 4 |
| - 0 126 4 |
| - 0 127 4>; |
| + interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH |
| + 0 126 IRQ_TYPE_LEVEL_HIGH |
| + 0 127 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi |
| index 819b1942aa14..3314e0aeccf5 100644 |
| --- a/arch/arm/boot/dts/r8a7778.dtsi |
| +++ b/arch/arm/boot/dts/r8a7778.dtsi |
| @@ -16,6 +16,8 @@ |
| |
| /include/ "skeleton.dtsi" |
| |
| +#include <dt-bindings/interrupt-controller/irq.h> |
| + |
| / { |
| compatible = "renesas,r8a7778"; |
| |
| @@ -51,10 +53,10 @@ |
| <0xfe780044 4>, |
| <0xfe780064 4>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 27 0x4 |
| - 0 28 0x4 |
| - 0 29 0x4 |
| - 0 30 0x4>; |
| + interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH |
| + 0 28 IRQ_TYPE_LEVEL_HIGH |
| + 0 29 IRQ_TYPE_LEVEL_HIGH |
| + 0 30 IRQ_TYPE_LEVEL_HIGH>; |
| sense-bitfield-width = <2>; |
| }; |
| |
| @@ -62,7 +64,7 @@ |
| compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| reg = <0xffc40000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 103 0x4>; |
| + interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 0 32>; |
| @@ -74,7 +76,7 @@ |
| compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| reg = <0xffc41000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 103 0x4>; |
| + interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 32 32>; |
| @@ -86,7 +88,7 @@ |
| compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| reg = <0xffc42000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 103 0x4>; |
| + interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 64 32>; |
| @@ -98,7 +100,7 @@ |
| compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| reg = <0xffc43000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 103 0x4>; |
| + interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 96 32>; |
| @@ -110,7 +112,7 @@ |
| compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| reg = <0xffc44000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 103 0x4>; |
| + interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 128 27>; |
| @@ -129,7 +131,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc70000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 67 0x4>; |
| + interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -139,7 +141,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc71000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 78 0x4>; |
| + interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -149,7 +151,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc72000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 76 0x4>; |
| + interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -159,7 +161,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc73000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 77 0x4>; |
| + interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -167,7 +169,7 @@ |
| compatible = "renesas,sh-mmcif"; |
| reg = <0xffe4e000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 61 4>; |
| + interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -175,7 +177,7 @@ |
| compatible = "renesas,sdhi-r8a7778"; |
| reg = <0xffe4c000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 87 4>; |
| + interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -185,7 +187,7 @@ |
| compatible = "renesas,sdhi-r8a7778"; |
| reg = <0xffe4d000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 88 4>; |
| + interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -195,7 +197,7 @@ |
| compatible = "renesas,sdhi-r8a7778"; |
| reg = <0xffe4f000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 86 4>; |
| + interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -207,7 +209,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc70000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 67 0x4>; |
| + interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -217,7 +219,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc71000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 78 0x4>; |
| + interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -227,7 +229,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc72000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 76 0x4>; |
| + interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -237,7 +239,7 @@ |
| compatible = "renesas,i2c-r8a7778"; |
| reg = <0xffc73000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 77 0x4>; |
| + interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi |
| index 05fd41c6012f..b2b418a8ab2d 100644 |
| --- a/arch/arm/boot/dts/r8a7779.dtsi |
| +++ b/arch/arm/boot/dts/r8a7779.dtsi |
| @@ -11,6 +11,8 @@ |
| |
| /include/ "skeleton.dtsi" |
| |
| +#include <dt-bindings/interrupt-controller/irq.h> |
| + |
| / { |
| compatible = "renesas,r8a7779"; |
| |
| @@ -52,7 +54,7 @@ |
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
| reg = <0xffc40000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 141 0x4>; |
| + interrupts = <0 141 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 0 32>; |
| @@ -64,7 +66,7 @@ |
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
| reg = <0xffc41000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 142 0x4>; |
| + interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 32 32>; |
| @@ -76,7 +78,7 @@ |
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
| reg = <0xffc42000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 143 0x4>; |
| + interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 64 32>; |
| @@ -88,7 +90,7 @@ |
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
| reg = <0xffc43000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 144 0x4>; |
| + interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 96 32>; |
| @@ -100,7 +102,7 @@ |
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
| reg = <0xffc44000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 145 0x4>; |
| + interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 128 32>; |
| @@ -112,7 +114,7 @@ |
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
| reg = <0xffc45000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 146 0x4>; |
| + interrupts = <0 146 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 160 32>; |
| @@ -124,7 +126,7 @@ |
| compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
| reg = <0xffc46000 0x2c>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 147 0x4>; |
| + interrupts = <0 147 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 192 9>; |
| @@ -143,10 +145,10 @@ |
| <0xfe780044 4>, |
| <0xfe780064 4>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 27 0x4 |
| - 0 28 0x4 |
| - 0 29 0x4 |
| - 0 30 0x4>; |
| + interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH |
| + 0 28 IRQ_TYPE_LEVEL_HIGH |
| + 0 29 IRQ_TYPE_LEVEL_HIGH |
| + 0 30 IRQ_TYPE_LEVEL_HIGH>; |
| sense-bitfield-width = <2>; |
| }; |
| |
| @@ -156,7 +158,7 @@ |
| compatible = "renesas,i2c-r8a7779"; |
| reg = <0xffc70000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 79 0x4>; |
| + interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -166,7 +168,7 @@ |
| compatible = "renesas,i2c-r8a7779"; |
| reg = <0xffc71000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 82 0x4>; |
| + interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -176,7 +178,7 @@ |
| compatible = "renesas,i2c-r8a7779"; |
| reg = <0xffc72000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 80 0x4>; |
| + interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -186,7 +188,7 @@ |
| compatible = "renesas,i2c-r8a7779"; |
| reg = <0xffc73000 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 81 0x4>; |
| + interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -204,14 +206,14 @@ |
| compatible = "renesas,rcar-sata"; |
| reg = <0xfc600000 0x2000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 100 0x4>; |
| + interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| sdhi0: sd@ffe4c000 { |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4c000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 104 4>; |
| + interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -221,7 +223,7 @@ |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4d000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 105 4>; |
| + interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -231,7 +233,7 @@ |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4e000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 107 4>; |
| + interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| @@ -241,7 +243,7 @@ |
| compatible = "renesas,sdhi-r8a7779"; |
| reg = <0xffe4f000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 106 4>; |
| + interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| cap-sdio-irq; |
| status = "disabled"; |
| diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi |
| index 839f1e761235..9ce4d47d1ad3 100644 |
| --- a/arch/arm/boot/dts/r8a7790.dtsi |
| +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| @@ -8,6 +8,9 @@ |
| * kind, whether express or implied. |
| */ |
| |
| +#include <dt-bindings/interrupt-controller/arm-gic.h> |
| +#include <dt-bindings/interrupt-controller/irq.h> |
| + |
| / { |
| compatible = "renesas,r8a7790"; |
| interrupt-parent = <&gic>; |
| @@ -84,14 +87,14 @@ |
| <0 0xf1002000 0 0x1000>, |
| <0 0xf1004000 0 0x2000>, |
| <0 0xf1006000 0 0x2000>; |
| - interrupts = <1 9 0xf04>; |
| + interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; |
| }; |
| |
| gpio0: gpio@e6050000 { |
| compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| reg = <0 0xe6050000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 4 0x4>; |
| + interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 0 32>; |
| @@ -103,7 +106,7 @@ |
| compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| reg = <0 0xe6051000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 5 0x4>; |
| + interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 32 32>; |
| @@ -115,7 +118,7 @@ |
| compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| reg = <0 0xe6052000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 6 0x4>; |
| + interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 64 32>; |
| @@ -127,7 +130,7 @@ |
| compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| reg = <0 0xe6053000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 7 0x4>; |
| + interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 96 32>; |
| @@ -139,7 +142,7 @@ |
| compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| reg = <0 0xe6054000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 8 0x4>; |
| + interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 128 32>; |
| @@ -151,7 +154,7 @@ |
| compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| reg = <0 0xe6055000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 9 0x4>; |
| + interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 160 32>; |
| @@ -161,10 +164,10 @@ |
| |
| timer { |
| compatible = "arm,armv7-timer"; |
| - interrupts = <1 13 0xf08>, |
| - <1 14 0xf08>, |
| - <1 11 0xf08>, |
| - <1 10 0xf08>; |
| + interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; |
| }; |
| |
| irqc0: interrupt-controller@e61c0000 { |
| @@ -173,7 +176,10 @@ |
| interrupt-controller; |
| reg = <0 0xe61c0000 0 0x200>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>; |
| + interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 1 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 2 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 3 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| i2c0: i2c@e6508000 { |
| @@ -182,7 +188,7 @@ |
| compatible = "renesas,i2c-r8a7790"; |
| reg = <0 0xe6508000 0 0x40>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 287 0x4>; |
| + interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -192,7 +198,7 @@ |
| compatible = "renesas,i2c-r8a7790"; |
| reg = <0 0xe6518000 0 0x40>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 288 0x4>; |
| + interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -202,7 +208,7 @@ |
| compatible = "renesas,i2c-r8a7790"; |
| reg = <0 0xe6530000 0 0x40>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 286 0x4>; |
| + interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -212,7 +218,7 @@ |
| compatible = "renesas,i2c-r8a7790"; |
| reg = <0 0xe6540000 0 0x40>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 290 0x4>; |
| + interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -220,7 +226,7 @@ |
| compatible = "renesas,sh-mmcif"; |
| reg = <0 0xee200000 0 0x80>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 169 0x4>; |
| + interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; |
| reg-io-width = <4>; |
| status = "disabled"; |
| }; |
| @@ -229,7 +235,7 @@ |
| compatible = "renesas,sh-mmcif"; |
| reg = <0 0xee220000 0 0x80>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 170 0x4>; |
| + interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; |
| reg-io-width = <4>; |
| status = "disabled"; |
| }; |
| @@ -243,7 +249,7 @@ |
| compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee100000 0 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 165 4>; |
| + interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| @@ -252,7 +258,7 @@ |
| compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee120000 0 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 166 4>; |
| + interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| @@ -261,7 +267,7 @@ |
| compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee140000 0 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 167 4>; |
| + interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| @@ -270,7 +276,7 @@ |
| compatible = "renesas,sdhi-r8a7790"; |
| reg = <0 0xee160000 0 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 168 4>; |
| + interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi |
| index 344f1f759c1a..86d5d3a509f9 100644 |
| --- a/arch/arm/boot/dts/r8a7791.dtsi |
| +++ b/arch/arm/boot/dts/r8a7791.dtsi |
| @@ -9,6 +9,9 @@ |
| * kind, whether express or implied. |
| */ |
| |
| +#include <dt-bindings/interrupt-controller/arm-gic.h> |
| +#include <dt-bindings/interrupt-controller/irq.h> |
| + |
| / { |
| compatible = "renesas,r8a7791"; |
| interrupt-parent = <&gic>; |
| @@ -43,14 +46,14 @@ |
| <0 0xf1002000 0 0x1000>, |
| <0 0xf1004000 0 0x2000>, |
| <0 0xf1006000 0 0x2000>; |
| - interrupts = <1 9 0xf04>; |
| + interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; |
| }; |
| |
| gpio0: gpio@ffc40000 { |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc40000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 4 0x4>; |
| + interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 0 32>; |
| @@ -62,7 +65,7 @@ |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc41000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 5 0x4>; |
| + interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 32 32>; |
| @@ -74,7 +77,7 @@ |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc42000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 6 0x4>; |
| + interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 64 32>; |
| @@ -86,7 +89,7 @@ |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc43000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 7 0x4>; |
| + interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 96 32>; |
| @@ -98,7 +101,7 @@ |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc44000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 8 0x4>; |
| + interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 128 32>; |
| @@ -110,7 +113,7 @@ |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc45000 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 9 0x4>; |
| + interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 160 32>; |
| @@ -122,7 +125,7 @@ |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc45400 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 10 0x4>; |
| + interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 192 32>; |
| @@ -134,7 +137,7 @@ |
| compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| reg = <0 0xffc45800 0 0x50>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 11 0x4>; |
| + interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| gpio-controller; |
| gpio-ranges = <&pfc 0 224 26>; |
| @@ -144,10 +147,10 @@ |
| |
| timer { |
| compatible = "arm,armv7-timer"; |
| - interrupts = <1 13 0xf08>, |
| - <1 14 0xf08>, |
| - <1 11 0xf08>, |
| - <1 10 0xf08>; |
| + interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
| + <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; |
| }; |
| |
| irqc0: interrupt-controller@e61c0000 { |
| @@ -156,16 +159,16 @@ |
| interrupt-controller; |
| reg = <0 0xe61c0000 0 0x200>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 0 4>, |
| - <0 1 4>, |
| - <0 2 4>, |
| - <0 3 4>, |
| - <0 12 4>, |
| - <0 13 4>, |
| - <0 14 4>, |
| - <0 15 4>, |
| - <0 16 4>, |
| - <0 17 4>; |
| + interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 1 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 2 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 3 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 12 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 13 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 14 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 15 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 16 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 17 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| pfc: pfc@e6060000 { |
| diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi |
| index 78f7201aeb24..aef8a61b5514 100644 |
| --- a/arch/arm/boot/dts/sh73a0.dtsi |
| +++ b/arch/arm/boot/dts/sh73a0.dtsi |
| @@ -10,6 +10,8 @@ |
| |
| /include/ "skeleton.dtsi" |
| |
| +#include <dt-bindings/interrupt-controller/irq.h> |
| + |
| / { |
| compatible = "renesas,sh73a0"; |
| |
| @@ -40,8 +42,8 @@ |
| |
| pmu { |
| compatible = "arm,cortex-a9-pmu"; |
| - interrupts = <0 55 4>, |
| - <0 56 4>; |
| + interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>, |
| + <0 56 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| irqpin0: irqpin@e6900000 { |
| @@ -54,14 +56,14 @@ |
| <0xe6900040 1>, |
| <0xe6900060 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 1 0x4 |
| - 0 2 0x4 |
| - 0 3 0x4 |
| - 0 4 0x4 |
| - 0 5 0x4 |
| - 0 6 0x4 |
| - 0 7 0x4 |
| - 0 8 0x4>; |
| + interrupts = <0 1 IRQ_TYPE_LEVEL_HIGH |
| + 0 2 IRQ_TYPE_LEVEL_HIGH |
| + 0 3 IRQ_TYPE_LEVEL_HIGH |
| + 0 4 IRQ_TYPE_LEVEL_HIGH |
| + 0 5 IRQ_TYPE_LEVEL_HIGH |
| + 0 6 IRQ_TYPE_LEVEL_HIGH |
| + 0 7 IRQ_TYPE_LEVEL_HIGH |
| + 0 8 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| irqpin1: irqpin@e6900004 { |
| @@ -74,14 +76,14 @@ |
| <0xe6900044 1>, |
| <0xe6900064 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 9 0x4 |
| - 0 10 0x4 |
| - 0 11 0x4 |
| - 0 12 0x4 |
| - 0 13 0x4 |
| - 0 14 0x4 |
| - 0 15 0x4 |
| - 0 16 0x4>; |
| + interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH |
| + 0 10 IRQ_TYPE_LEVEL_HIGH |
| + 0 11 IRQ_TYPE_LEVEL_HIGH |
| + 0 12 IRQ_TYPE_LEVEL_HIGH |
| + 0 13 IRQ_TYPE_LEVEL_HIGH |
| + 0 14 IRQ_TYPE_LEVEL_HIGH |
| + 0 15 IRQ_TYPE_LEVEL_HIGH |
| + 0 16 IRQ_TYPE_LEVEL_HIGH>; |
| control-parent; |
| }; |
| |
| @@ -95,14 +97,14 @@ |
| <0xe6900048 1>, |
| <0xe6900068 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 17 0x4 |
| - 0 18 0x4 |
| - 0 19 0x4 |
| - 0 20 0x4 |
| - 0 21 0x4 |
| - 0 22 0x4 |
| - 0 23 0x4 |
| - 0 24 0x4>; |
| + interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH |
| + 0 18 IRQ_TYPE_LEVEL_HIGH |
| + 0 19 IRQ_TYPE_LEVEL_HIGH |
| + 0 20 IRQ_TYPE_LEVEL_HIGH |
| + 0 21 IRQ_TYPE_LEVEL_HIGH |
| + 0 22 IRQ_TYPE_LEVEL_HIGH |
| + 0 23 IRQ_TYPE_LEVEL_HIGH |
| + 0 24 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| irqpin3: irqpin@e690000c { |
| @@ -115,14 +117,14 @@ |
| <0xe690004c 1>, |
| <0xe690006c 1>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 25 0x4 |
| - 0 26 0x4 |
| - 0 27 0x4 |
| - 0 28 0x4 |
| - 0 29 0x4 |
| - 0 30 0x4 |
| - 0 31 0x4 |
| - 0 32 0x4>; |
| + interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH |
| + 0 26 IRQ_TYPE_LEVEL_HIGH |
| + 0 27 IRQ_TYPE_LEVEL_HIGH |
| + 0 28 IRQ_TYPE_LEVEL_HIGH |
| + 0 29 IRQ_TYPE_LEVEL_HIGH |
| + 0 30 IRQ_TYPE_LEVEL_HIGH |
| + 0 31 IRQ_TYPE_LEVEL_HIGH |
| + 0 32 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| i2c0: i2c@e6820000 { |
| @@ -131,10 +133,10 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0xe6820000 0x425>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 167 0x4 |
| - 0 168 0x4 |
| - 0 169 0x4 |
| - 0 170 0x4>; |
| + interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH |
| + 0 168 IRQ_TYPE_LEVEL_HIGH |
| + 0 169 IRQ_TYPE_LEVEL_HIGH |
| + 0 170 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -144,10 +146,10 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0xe6822000 0x425>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 51 0x4 |
| - 0 52 0x4 |
| - 0 53 0x4 |
| - 0 54 0x4>; |
| + interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH |
| + 0 52 IRQ_TYPE_LEVEL_HIGH |
| + 0 53 IRQ_TYPE_LEVEL_HIGH |
| + 0 54 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -157,10 +159,10 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0xe6824000 0x425>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 171 0x4 |
| - 0 172 0x4 |
| - 0 173 0x4 |
| - 0 174 0x4>; |
| + interrupts = <0 171 IRQ_TYPE_LEVEL_HIGH |
| + 0 172 IRQ_TYPE_LEVEL_HIGH |
| + 0 173 IRQ_TYPE_LEVEL_HIGH |
| + 0 174 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -170,10 +172,10 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0xe6826000 0x425>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 183 0x4 |
| - 0 184 0x4 |
| - 0 185 0x4 |
| - 0 186 0x4>; |
| + interrupts = <0 183 IRQ_TYPE_LEVEL_HIGH |
| + 0 184 IRQ_TYPE_LEVEL_HIGH |
| + 0 185 IRQ_TYPE_LEVEL_HIGH |
| + 0 186 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -183,10 +185,10 @@ |
| compatible = "renesas,rmobile-iic"; |
| reg = <0xe6828000 0x425>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 187 0x4 |
| - 0 188 0x4 |
| - 0 189 0x4 |
| - 0 190 0x4>; |
| + interrupts = <0 187 IRQ_TYPE_LEVEL_HIGH |
| + 0 188 IRQ_TYPE_LEVEL_HIGH |
| + 0 189 IRQ_TYPE_LEVEL_HIGH |
| + 0 190 IRQ_TYPE_LEVEL_HIGH>; |
| status = "disabled"; |
| }; |
| |
| @@ -194,8 +196,8 @@ |
| compatible = "renesas,sh-mmcif"; |
| reg = <0xe6bd0000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 140 0x4 |
| - 0 141 0x4>; |
| + interrupts = <0 140 IRQ_TYPE_LEVEL_HIGH |
| + 0 141 IRQ_TYPE_LEVEL_HIGH>; |
| reg-io-width = <4>; |
| status = "disabled"; |
| }; |
| @@ -204,9 +206,9 @@ |
| compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xee100000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 83 4 |
| - 0 84 4 |
| - 0 85 4>; |
| + interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH |
| + 0 84 IRQ_TYPE_LEVEL_HIGH |
| + 0 85 IRQ_TYPE_LEVEL_HIGH>; |
| cap-sd-highspeed; |
| status = "disabled"; |
| }; |
| @@ -216,8 +218,8 @@ |
| compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xee120000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 88 4 |
| - 0 89 4>; |
| + interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH |
| + 0 89 IRQ_TYPE_LEVEL_HIGH>; |
| toshiba,mmc-wrprotect-disable; |
| cap-sd-highspeed; |
| status = "disabled"; |
| @@ -227,8 +229,8 @@ |
| compatible = "renesas,sdhi-r8a7740"; |
| reg = <0xee140000 0x100>; |
| interrupt-parent = <&gic>; |
| - interrupts = <0 104 4 |
| - 0 105 4>; |
| + interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH |
| + 0 105 IRQ_TYPE_LEVEL_HIGH>; |
| toshiba,mmc-wrprotect-disable; |
| cap-sd-highspeed; |
| status = "disabled"; |
| -- |
| 1.8.5.rc3 |
| |
