diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-18 21:18:25 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 03:27:07 -0500 |
commit | 5f75e73c376c247a2c7bbe6f3fa3901b2d8f1a9c (patch) | |
tree | 442757dadcd8e07c5e578a438bda15951a5c3b31 /arch/arm/boot | |
parent | 31c46cbf5b8bab87e89028977521c84f2d871040 (diff) |
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/r8a73a4.dtsi | 108 | ||||
-rw-r--r-- | arch/arm/boot/dts/r8a7740.dtsi | 106 | ||||
-rw-r--r-- | arch/arm/boot/dts/r8a7778.dtsi | 44 | ||||
-rw-r--r-- | arch/arm/boot/dts/r8a7779.dtsi | 42 | ||||
-rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 50 | ||||
-rw-r--r-- | arch/arm/boot/dts/r8a7791.dtsi | 49 | ||||
-rw-r--r-- | 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 @@ | |||
9 | * kind, whether express or implied. | 9 | * kind, whether express or implied. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
13 | #include <dt-bindings/interrupt-controller/irq.h> | ||
14 | |||
12 | / { | 15 | / { |
13 | compatible = "renesas,r8a73a4"; | 16 | compatible = "renesas,r8a73a4"; |
14 | interrupt-parent = <&gic>; | 17 | interrupt-parent = <&gic>; |
@@ -36,15 +39,15 @@ | |||
36 | <0 0xf1002000 0 0x1000>, | 39 | <0 0xf1002000 0 0x1000>, |
37 | <0 0xf1004000 0 0x2000>, | 40 | <0 0xf1004000 0 0x2000>, |
38 | <0 0xf1006000 0 0x2000>; | 41 | <0 0xf1006000 0 0x2000>; |
39 | interrupts = <1 9 0xf04>; | 42 | interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; |
40 | }; | 43 | }; |
41 | 44 | ||
42 | timer { | 45 | timer { |
43 | compatible = "arm,armv7-timer"; | 46 | compatible = "arm,armv7-timer"; |
44 | interrupts = <1 13 0xf08>, | 47 | interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
45 | <1 14 0xf08>, | 48 | <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
46 | <1 11 0xf08>, | 49 | <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
47 | <1 10 0xf08>; | 50 | <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; |
48 | }; | 51 | }; |
49 | 52 | ||
50 | irqc0: interrupt-controller@e61c0000 { | 53 | irqc0: interrupt-controller@e61c0000 { |
@@ -53,14 +56,38 @@ | |||
53 | interrupt-controller; | 56 | interrupt-controller; |
54 | reg = <0 0xe61c0000 0 0x200>; | 57 | reg = <0 0xe61c0000 0 0x200>; |
55 | interrupt-parent = <&gic>; | 58 | interrupt-parent = <&gic>; |
56 | interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>, | 59 | interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, |
57 | <0 4 4>, <0 5 4>, <0 6 4>, <0 7 4>, | 60 | <0 1 IRQ_TYPE_LEVEL_HIGH>, |
58 | <0 8 4>, <0 9 4>, <0 10 4>, <0 11 4>, | 61 | <0 2 IRQ_TYPE_LEVEL_HIGH>, |
59 | <0 12 4>, <0 13 4>, <0 14 4>, <0 15 4>, | 62 | <0 3 IRQ_TYPE_LEVEL_HIGH>, |
60 | <0 16 4>, <0 17 4>, <0 18 4>, <0 19 4>, | 63 | <0 4 IRQ_TYPE_LEVEL_HIGH>, |
61 | <0 20 4>, <0 21 4>, <0 22 4>, <0 23 4>, | 64 | <0 5 IRQ_TYPE_LEVEL_HIGH>, |
62 | <0 24 4>, <0 25 4>, <0 26 4>, <0 27 4>, | 65 | <0 6 IRQ_TYPE_LEVEL_HIGH>, |
63 | <0 28 4>, <0 29 4>, <0 30 4>, <0 31 4>; | 66 | <0 7 IRQ_TYPE_LEVEL_HIGH>, |
67 | <0 8 IRQ_TYPE_LEVEL_HIGH>, | ||
68 | <0 9 IRQ_TYPE_LEVEL_HIGH>, | ||
69 | <0 10 IRQ_TYPE_LEVEL_HIGH>, | ||
70 | <0 11 IRQ_TYPE_LEVEL_HIGH>, | ||
71 | <0 12 IRQ_TYPE_LEVEL_HIGH>, | ||
72 | <0 13 IRQ_TYPE_LEVEL_HIGH>, | ||
73 | <0 14 IRQ_TYPE_LEVEL_HIGH>, | ||
74 | <0 15 IRQ_TYPE_LEVEL_HIGH>, | ||
75 | <0 16 IRQ_TYPE_LEVEL_HIGH>, | ||
76 | <0 17 IRQ_TYPE_LEVEL_HIGH>, | ||
77 | <0 18 IRQ_TYPE_LEVEL_HIGH>, | ||
78 | <0 19 IRQ_TYPE_LEVEL_HIGH>, | ||
79 | <0 20 IRQ_TYPE_LEVEL_HIGH>, | ||
80 | <0 21 IRQ_TYPE_LEVEL_HIGH>, | ||
81 | <0 22 IRQ_TYPE_LEVEL_HIGH>, | ||
82 | <0 23 IRQ_TYPE_LEVEL_HIGH>, | ||
83 | <0 24 IRQ_TYPE_LEVEL_HIGH>, | ||
84 | <0 25 IRQ_TYPE_LEVEL_HIGH>, | ||
85 | <0 26 IRQ_TYPE_LEVEL_HIGH>, | ||
86 | <0 27 IRQ_TYPE_LEVEL_HIGH>, | ||
87 | <0 28 IRQ_TYPE_LEVEL_HIGH>, | ||
88 | <0 29 IRQ_TYPE_LEVEL_HIGH>, | ||
89 | <0 30 IRQ_TYPE_LEVEL_HIGH>, | ||
90 | <0 31 IRQ_TYPE_LEVEL_HIGH>; | ||
64 | }; | 91 | }; |
65 | 92 | ||
66 | irqc1: interrupt-controller@e61c0200 { | 93 | irqc1: interrupt-controller@e61c0200 { |
@@ -69,13 +96,32 @@ | |||
69 | interrupt-controller; | 96 | interrupt-controller; |
70 | reg = <0 0xe61c0200 0 0x200>; | 97 | reg = <0 0xe61c0200 0 0x200>; |
71 | interrupt-parent = <&gic>; | 98 | interrupt-parent = <&gic>; |
72 | interrupts = <0 32 4>, <0 33 4>, <0 34 4>, <0 35 4>, | 99 | interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>, |
73 | <0 36 4>, <0 37 4>, <0 38 4>, <0 39 4>, | 100 | <0 33 IRQ_TYPE_LEVEL_HIGH>, |
74 | <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>, | 101 | <0 34 IRQ_TYPE_LEVEL_HIGH>, |
75 | <0 44 4>, <0 45 4>, <0 46 4>, <0 47 4>, | 102 | <0 35 IRQ_TYPE_LEVEL_HIGH>, |
76 | <0 48 4>, <0 49 4>, <0 50 4>, <0 51 4>, | 103 | <0 36 IRQ_TYPE_LEVEL_HIGH>, |
77 | <0 52 4>, <0 53 4>, <0 54 4>, <0 55 4>, | 104 | <0 37 IRQ_TYPE_LEVEL_HIGH>, |
78 | <0 56 4>, <0 57 4>; | 105 | <0 38 IRQ_TYPE_LEVEL_HIGH>, |
106 | <0 39 IRQ_TYPE_LEVEL_HIGH>, | ||
107 | <0 40 IRQ_TYPE_LEVEL_HIGH>, | ||
108 | <0 41 IRQ_TYPE_LEVEL_HIGH>, | ||
109 | <0 42 IRQ_TYPE_LEVEL_HIGH>, | ||
110 | <0 43 IRQ_TYPE_LEVEL_HIGH>, | ||
111 | <0 44 IRQ_TYPE_LEVEL_HIGH>, | ||
112 | <0 45 IRQ_TYPE_LEVEL_HIGH>, | ||
113 | <0 46 IRQ_TYPE_LEVEL_HIGH>, | ||
114 | <0 47 IRQ_TYPE_LEVEL_HIGH>, | ||
115 | <0 48 IRQ_TYPE_LEVEL_HIGH>, | ||
116 | <0 49 IRQ_TYPE_LEVEL_HIGH>, | ||
117 | <0 50 IRQ_TYPE_LEVEL_HIGH>, | ||
118 | <0 51 IRQ_TYPE_LEVEL_HIGH>, | ||
119 | <0 52 IRQ_TYPE_LEVEL_HIGH>, | ||
120 | <0 53 IRQ_TYPE_LEVEL_HIGH>, | ||
121 | <0 54 IRQ_TYPE_LEVEL_HIGH>, | ||
122 | <0 55 IRQ_TYPE_LEVEL_HIGH>, | ||
123 | <0 56 IRQ_TYPE_LEVEL_HIGH>, | ||
124 | <0 57 IRQ_TYPE_LEVEL_HIGH>; | ||
79 | }; | 125 | }; |
80 | 126 | ||
81 | dmac: dma-multiplexer@0 { | 127 | dmac: dma-multiplexer@0 { |
@@ -126,7 +172,7 @@ | |||
126 | reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>, | 172 | reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>, |
127 | <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>; | 173 | <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>; |
128 | interrupt-parent = <&gic>; | 174 | interrupt-parent = <&gic>; |
129 | interrupts = <0 69 4>; | 175 | interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>; |
130 | }; | 176 | }; |
131 | 177 | ||
132 | i2c0: i2c@e6500000 { | 178 | i2c0: i2c@e6500000 { |
@@ -175,7 +221,7 @@ | |||
175 | compatible = "renesas,rmobile-iic"; | 221 | compatible = "renesas,rmobile-iic"; |
176 | reg = <0 0xe6540000 0 0x428>; | 222 | reg = <0 0xe6540000 0 0x428>; |
177 | interrupt-parent = <&gic>; | 223 | interrupt-parent = <&gic>; |
178 | interrupts = <0 178 0x4>; | 224 | interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>; |
179 | status = "disabled"; | 225 | status = "disabled"; |
180 | }; | 226 | }; |
181 | 227 | ||
@@ -185,7 +231,7 @@ | |||
185 | compatible = "renesas,rmobile-iic"; | 231 | compatible = "renesas,rmobile-iic"; |
186 | reg = <0 0xe60b0000 0 0x428>; | 232 | reg = <0 0xe60b0000 0 0x428>; |
187 | interrupt-parent = <&gic>; | 233 | interrupt-parent = <&gic>; |
188 | interrupts = <0 179 0x4>; | 234 | interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>; |
189 | status = "disabled"; | 235 | status = "disabled"; |
190 | }; | 236 | }; |
191 | 237 | ||
@@ -195,7 +241,7 @@ | |||
195 | compatible = "renesas,rmobile-iic"; | 241 | compatible = "renesas,rmobile-iic"; |
196 | reg = <0 0xe6550000 0 0x428>; | 242 | reg = <0 0xe6550000 0 0x428>; |
197 | interrupt-parent = <&gic>; | 243 | interrupt-parent = <&gic>; |
198 | interrupts = <0 184 0x4>; | 244 | interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; |
199 | status = "disabled"; | 245 | status = "disabled"; |
200 | }; | 246 | }; |
201 | 247 | ||
@@ -205,7 +251,7 @@ | |||
205 | compatible = "renesas,rmobile-iic"; | 251 | compatible = "renesas,rmobile-iic"; |
206 | reg = <0 0xe6560000 0 0x428>; | 252 | reg = <0 0xe6560000 0 0x428>; |
207 | interrupt-parent = <&gic>; | 253 | interrupt-parent = <&gic>; |
208 | interrupts = <0 185 0x4>; | 254 | interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>; |
209 | status = "disabled"; | 255 | status = "disabled"; |
210 | }; | 256 | }; |
211 | 257 | ||
@@ -215,7 +261,7 @@ | |||
215 | compatible = "renesas,rmobile-iic"; | 261 | compatible = "renesas,rmobile-iic"; |
216 | reg = <0 0xe6570000 0 0x428>; | 262 | reg = <0 0xe6570000 0 0x428>; |
217 | interrupt-parent = <&gic>; | 263 | interrupt-parent = <&gic>; |
218 | interrupts = <0 173 0x4>; | 264 | interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>; |
219 | status = "disabled"; | 265 | status = "disabled"; |
220 | }; | 266 | }; |
221 | 267 | ||
@@ -223,7 +269,7 @@ | |||
223 | compatible = "renesas,sh-mmcif"; | 269 | compatible = "renesas,sh-mmcif"; |
224 | reg = <0 0xee200000 0 0x80>; | 270 | reg = <0 0xee200000 0 0x80>; |
225 | interrupt-parent = <&gic>; | 271 | interrupt-parent = <&gic>; |
226 | interrupts = <0 169 0x4>; | 272 | interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; |
227 | reg-io-width = <4>; | 273 | reg-io-width = <4>; |
228 | status = "disabled"; | 274 | status = "disabled"; |
229 | }; | 275 | }; |
@@ -232,7 +278,7 @@ | |||
232 | compatible = "renesas,sh-mmcif"; | 278 | compatible = "renesas,sh-mmcif"; |
233 | reg = <0 0xee220000 0 0x80>; | 279 | reg = <0 0xee220000 0 0x80>; |
234 | interrupt-parent = <&gic>; | 280 | interrupt-parent = <&gic>; |
235 | interrupts = <0 170 0x4>; | 281 | interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; |
236 | reg-io-width = <4>; | 282 | reg-io-width = <4>; |
237 | status = "disabled"; | 283 | status = "disabled"; |
238 | }; | 284 | }; |
@@ -248,7 +294,7 @@ | |||
248 | compatible = "renesas,sdhi-r8a73a4"; | 294 | compatible = "renesas,sdhi-r8a73a4"; |
249 | reg = <0 0xee100000 0 0x100>; | 295 | reg = <0 0xee100000 0 0x100>; |
250 | interrupt-parent = <&gic>; | 296 | interrupt-parent = <&gic>; |
251 | interrupts = <0 165 4>; | 297 | interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; |
252 | cap-sd-highspeed; | 298 | cap-sd-highspeed; |
253 | status = "disabled"; | 299 | status = "disabled"; |
254 | }; | 300 | }; |
@@ -257,7 +303,7 @@ | |||
257 | compatible = "renesas,sdhi-r8a73a4"; | 303 | compatible = "renesas,sdhi-r8a73a4"; |
258 | reg = <0 0xee120000 0 0x100>; | 304 | reg = <0 0xee120000 0 0x100>; |
259 | interrupt-parent = <&gic>; | 305 | interrupt-parent = <&gic>; |
260 | interrupts = <0 166 4>; | 306 | interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; |
261 | cap-sd-highspeed; | 307 | cap-sd-highspeed; |
262 | status = "disabled"; | 308 | status = "disabled"; |
263 | }; | 309 | }; |
@@ -266,7 +312,7 @@ | |||
266 | compatible = "renesas,sdhi-r8a73a4"; | 312 | compatible = "renesas,sdhi-r8a73a4"; |
267 | reg = <0 0xee140000 0 0x100>; | 313 | reg = <0 0xee140000 0 0x100>; |
268 | interrupt-parent = <&gic>; | 314 | interrupt-parent = <&gic>; |
269 | interrupts = <0 167 4>; | 315 | interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; |
270 | cap-sd-highspeed; | 316 | cap-sd-highspeed; |
271 | status = "disabled"; | 317 | status = "disabled"; |
272 | }; | 318 | }; |
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 @@ | |||
10 | 10 | ||
11 | /include/ "skeleton.dtsi" | 11 | /include/ "skeleton.dtsi" |
12 | 12 | ||
13 | #include <dt-bindings/interrupt-controller/irq.h> | ||
14 | |||
13 | / { | 15 | / { |
14 | compatible = "renesas,r8a7740"; | 16 | compatible = "renesas,r8a7740"; |
15 | 17 | ||
@@ -34,7 +36,7 @@ | |||
34 | 36 | ||
35 | pmu { | 37 | pmu { |
36 | compatible = "arm,cortex-a9-pmu"; | 38 | compatible = "arm,cortex-a9-pmu"; |
37 | interrupts = <0 83 4>; | 39 | interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>; |
38 | }; | 40 | }; |
39 | 41 | ||
40 | /* irqpin0: IRQ0 - IRQ7 */ | 42 | /* irqpin0: IRQ0 - IRQ7 */ |
@@ -48,14 +50,14 @@ | |||
48 | <0xe6900040 1>, | 50 | <0xe6900040 1>, |
49 | <0xe6900060 1>; | 51 | <0xe6900060 1>; |
50 | interrupt-parent = <&gic>; | 52 | interrupt-parent = <&gic>; |
51 | interrupts = <0 149 0x4 | 53 | interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
52 | 0 149 0x4 | 54 | 0 149 IRQ_TYPE_LEVEL_HIGH |
53 | 0 149 0x4 | 55 | 0 149 IRQ_TYPE_LEVEL_HIGH |
54 | 0 149 0x4 | 56 | 0 149 IRQ_TYPE_LEVEL_HIGH |
55 | 0 149 0x4 | 57 | 0 149 IRQ_TYPE_LEVEL_HIGH |
56 | 0 149 0x4 | 58 | 0 149 IRQ_TYPE_LEVEL_HIGH |
57 | 0 149 0x4 | 59 | 0 149 IRQ_TYPE_LEVEL_HIGH |
58 | 0 149 0x4>; | 60 | 0 149 IRQ_TYPE_LEVEL_HIGH>; |
59 | }; | 61 | }; |
60 | 62 | ||
61 | /* irqpin1: IRQ8 - IRQ15 */ | 63 | /* irqpin1: IRQ8 - IRQ15 */ |
@@ -69,14 +71,14 @@ | |||
69 | <0xe6900044 1>, | 71 | <0xe6900044 1>, |
70 | <0xe6900064 1>; | 72 | <0xe6900064 1>; |
71 | interrupt-parent = <&gic>; | 73 | interrupt-parent = <&gic>; |
72 | interrupts = <0 149 0x4 | 74 | interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
73 | 0 149 0x4 | 75 | 0 149 IRQ_TYPE_LEVEL_HIGH |
74 | 0 149 0x4 | 76 | 0 149 IRQ_TYPE_LEVEL_HIGH |
75 | 0 149 0x4 | 77 | 0 149 IRQ_TYPE_LEVEL_HIGH |
76 | 0 149 0x4 | 78 | 0 149 IRQ_TYPE_LEVEL_HIGH |
77 | 0 149 0x4 | 79 | 0 149 IRQ_TYPE_LEVEL_HIGH |
78 | 0 149 0x4 | 80 | 0 149 IRQ_TYPE_LEVEL_HIGH |
79 | 0 149 0x4>; | 81 | 0 149 IRQ_TYPE_LEVEL_HIGH>; |
80 | }; | 82 | }; |
81 | 83 | ||
82 | /* irqpin2: IRQ16 - IRQ23 */ | 84 | /* irqpin2: IRQ16 - IRQ23 */ |
@@ -90,14 +92,14 @@ | |||
90 | <0xe6900048 1>, | 92 | <0xe6900048 1>, |
91 | <0xe6900068 1>; | 93 | <0xe6900068 1>; |
92 | interrupt-parent = <&gic>; | 94 | interrupt-parent = <&gic>; |
93 | interrupts = <0 149 0x4 | 95 | interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
94 | 0 149 0x4 | 96 | 0 149 IRQ_TYPE_LEVEL_HIGH |
95 | 0 149 0x4 | 97 | 0 149 IRQ_TYPE_LEVEL_HIGH |
96 | 0 149 0x4 | 98 | 0 149 IRQ_TYPE_LEVEL_HIGH |
97 | 0 149 0x4 | 99 | 0 149 IRQ_TYPE_LEVEL_HIGH |
98 | 0 149 0x4 | 100 | 0 149 IRQ_TYPE_LEVEL_HIGH |
99 | 0 149 0x4 | 101 | 0 149 IRQ_TYPE_LEVEL_HIGH |
100 | 0 149 0x4>; | 102 | 0 149 IRQ_TYPE_LEVEL_HIGH>; |
101 | }; | 103 | }; |
102 | 104 | ||
103 | /* irqpin3: IRQ24 - IRQ31 */ | 105 | /* irqpin3: IRQ24 - IRQ31 */ |
@@ -111,14 +113,14 @@ | |||
111 | <0xe690004c 1>, | 113 | <0xe690004c 1>, |
112 | <0xe690006c 1>; | 114 | <0xe690006c 1>; |
113 | interrupt-parent = <&gic>; | 115 | interrupt-parent = <&gic>; |
114 | interrupts = <0 149 0x4 | 116 | interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH |
115 | 0 149 0x4 | 117 | 0 149 IRQ_TYPE_LEVEL_HIGH |
116 | 0 149 0x4 | 118 | 0 149 IRQ_TYPE_LEVEL_HIGH |
117 | 0 149 0x4 | 119 | 0 149 IRQ_TYPE_LEVEL_HIGH |
118 | 0 149 0x4 | 120 | 0 149 IRQ_TYPE_LEVEL_HIGH |
119 | 0 149 0x4 | 121 | 0 149 IRQ_TYPE_LEVEL_HIGH |
120 | 0 149 0x4 | 122 | 0 149 IRQ_TYPE_LEVEL_HIGH |
121 | 0 149 0x4>; | 123 | 0 149 IRQ_TYPE_LEVEL_HIGH>; |
122 | }; | 124 | }; |
123 | 125 | ||
124 | i2c0: i2c@fff20000 { | 126 | i2c0: i2c@fff20000 { |
@@ -127,10 +129,10 @@ | |||
127 | compatible = "renesas,rmobile-iic"; | 129 | compatible = "renesas,rmobile-iic"; |
128 | reg = <0xfff20000 0x425>; | 130 | reg = <0xfff20000 0x425>; |
129 | interrupt-parent = <&gic>; | 131 | interrupt-parent = <&gic>; |
130 | interrupts = <0 201 0x4 | 132 | interrupts = <0 201 IRQ_TYPE_LEVEL_HIGH |
131 | 0 202 0x4 | 133 | 0 202 IRQ_TYPE_LEVEL_HIGH |
132 | 0 203 0x4 | 134 | 0 203 IRQ_TYPE_LEVEL_HIGH |
133 | 0 204 0x4>; | 135 | 0 204 IRQ_TYPE_LEVEL_HIGH>; |
134 | status = "disabled"; | 136 | status = "disabled"; |
135 | }; | 137 | }; |
136 | 138 | ||
@@ -140,10 +142,10 @@ | |||
140 | compatible = "renesas,rmobile-iic"; | 142 | compatible = "renesas,rmobile-iic"; |
141 | reg = <0xe6c20000 0x425>; | 143 | reg = <0xe6c20000 0x425>; |
142 | interrupt-parent = <&gic>; | 144 | interrupt-parent = <&gic>; |
143 | interrupts = <0 70 0x4 | 145 | interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH |
144 | 0 71 0x4 | 146 | 0 71 IRQ_TYPE_LEVEL_HIGH |
145 | 0 72 0x4 | 147 | 0 72 IRQ_TYPE_LEVEL_HIGH |
146 | 0 73 0x4>; | 148 | 0 73 IRQ_TYPE_LEVEL_HIGH>; |
147 | status = "disabled"; | 149 | status = "disabled"; |
148 | }; | 150 | }; |
149 | 151 | ||
@@ -166,8 +168,8 @@ | |||
166 | compatible = "renesas,sh-mmcif"; | 168 | compatible = "renesas,sh-mmcif"; |
167 | reg = <0xe6bd0000 0x100>; | 169 | reg = <0xe6bd0000 0x100>; |
168 | interrupt-parent = <&gic>; | 170 | interrupt-parent = <&gic>; |
169 | interrupts = <0 56 4 | 171 | interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH |
170 | 0 57 4>; | 172 | 0 57 IRQ_TYPE_LEVEL_HIGH>; |
171 | status = "disabled"; | 173 | status = "disabled"; |
172 | }; | 174 | }; |
173 | 175 | ||
@@ -175,9 +177,9 @@ | |||
175 | compatible = "renesas,sdhi-r8a7740"; | 177 | compatible = "renesas,sdhi-r8a7740"; |
176 | reg = <0xe6850000 0x100>; | 178 | reg = <0xe6850000 0x100>; |
177 | interrupt-parent = <&gic>; | 179 | interrupt-parent = <&gic>; |
178 | interrupts = <0 117 4 | 180 | interrupts = <0 117 IRQ_TYPE_LEVEL_HIGH |
179 | 0 118 4 | 181 | 0 118 IRQ_TYPE_LEVEL_HIGH |
180 | 0 119 4>; | 182 | 0 119 IRQ_TYPE_LEVEL_HIGH>; |
181 | cap-sd-highspeed; | 183 | cap-sd-highspeed; |
182 | cap-sdio-irq; | 184 | cap-sdio-irq; |
183 | status = "disabled"; | 185 | status = "disabled"; |
@@ -187,9 +189,9 @@ | |||
187 | compatible = "renesas,sdhi-r8a7740"; | 189 | compatible = "renesas,sdhi-r8a7740"; |
188 | reg = <0xe6860000 0x100>; | 190 | reg = <0xe6860000 0x100>; |
189 | interrupt-parent = <&gic>; | 191 | interrupt-parent = <&gic>; |
190 | interrupts = <0 121 4 | 192 | interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH |
191 | 0 122 4 | 193 | 0 122 IRQ_TYPE_LEVEL_HIGH |
192 | 0 123 4>; | 194 | 0 123 IRQ_TYPE_LEVEL_HIGH>; |
193 | cap-sd-highspeed; | 195 | cap-sd-highspeed; |
194 | cap-sdio-irq; | 196 | cap-sdio-irq; |
195 | status = "disabled"; | 197 | status = "disabled"; |
@@ -199,9 +201,9 @@ | |||
199 | compatible = "renesas,sdhi-r8a7740"; | 201 | compatible = "renesas,sdhi-r8a7740"; |
200 | reg = <0xe6870000 0x100>; | 202 | reg = <0xe6870000 0x100>; |
201 | interrupt-parent = <&gic>; | 203 | interrupt-parent = <&gic>; |
202 | interrupts = <0 125 4 | 204 | interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH |
203 | 0 126 4 | 205 | 0 126 IRQ_TYPE_LEVEL_HIGH |
204 | 0 127 4>; | 206 | 0 127 IRQ_TYPE_LEVEL_HIGH>; |
205 | cap-sd-highspeed; | 207 | cap-sd-highspeed; |
206 | cap-sdio-irq; | 208 | cap-sdio-irq; |
207 | status = "disabled"; | 209 | 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 @@ | |||
16 | 16 | ||
17 | /include/ "skeleton.dtsi" | 17 | /include/ "skeleton.dtsi" |
18 | 18 | ||
19 | #include <dt-bindings/interrupt-controller/irq.h> | ||
20 | |||
19 | / { | 21 | / { |
20 | compatible = "renesas,r8a7778"; | 22 | compatible = "renesas,r8a7778"; |
21 | 23 | ||
@@ -51,10 +53,10 @@ | |||
51 | <0xfe780044 4>, | 53 | <0xfe780044 4>, |
52 | <0xfe780064 4>; | 54 | <0xfe780064 4>; |
53 | interrupt-parent = <&gic>; | 55 | interrupt-parent = <&gic>; |
54 | interrupts = <0 27 0x4 | 56 | interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH |
55 | 0 28 0x4 | 57 | 0 28 IRQ_TYPE_LEVEL_HIGH |
56 | 0 29 0x4 | 58 | 0 29 IRQ_TYPE_LEVEL_HIGH |
57 | 0 30 0x4>; | 59 | 0 30 IRQ_TYPE_LEVEL_HIGH>; |
58 | sense-bitfield-width = <2>; | 60 | sense-bitfield-width = <2>; |
59 | }; | 61 | }; |
60 | 62 | ||
@@ -62,7 +64,7 @@ | |||
62 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 64 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
63 | reg = <0xffc40000 0x2c>; | 65 | reg = <0xffc40000 0x2c>; |
64 | interrupt-parent = <&gic>; | 66 | interrupt-parent = <&gic>; |
65 | interrupts = <0 103 0x4>; | 67 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
66 | #gpio-cells = <2>; | 68 | #gpio-cells = <2>; |
67 | gpio-controller; | 69 | gpio-controller; |
68 | gpio-ranges = <&pfc 0 0 32>; | 70 | gpio-ranges = <&pfc 0 0 32>; |
@@ -74,7 +76,7 @@ | |||
74 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 76 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
75 | reg = <0xffc41000 0x2c>; | 77 | reg = <0xffc41000 0x2c>; |
76 | interrupt-parent = <&gic>; | 78 | interrupt-parent = <&gic>; |
77 | interrupts = <0 103 0x4>; | 79 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
78 | #gpio-cells = <2>; | 80 | #gpio-cells = <2>; |
79 | gpio-controller; | 81 | gpio-controller; |
80 | gpio-ranges = <&pfc 0 32 32>; | 82 | gpio-ranges = <&pfc 0 32 32>; |
@@ -86,7 +88,7 @@ | |||
86 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 88 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
87 | reg = <0xffc42000 0x2c>; | 89 | reg = <0xffc42000 0x2c>; |
88 | interrupt-parent = <&gic>; | 90 | interrupt-parent = <&gic>; |
89 | interrupts = <0 103 0x4>; | 91 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
90 | #gpio-cells = <2>; | 92 | #gpio-cells = <2>; |
91 | gpio-controller; | 93 | gpio-controller; |
92 | gpio-ranges = <&pfc 0 64 32>; | 94 | gpio-ranges = <&pfc 0 64 32>; |
@@ -98,7 +100,7 @@ | |||
98 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 100 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
99 | reg = <0xffc43000 0x2c>; | 101 | reg = <0xffc43000 0x2c>; |
100 | interrupt-parent = <&gic>; | 102 | interrupt-parent = <&gic>; |
101 | interrupts = <0 103 0x4>; | 103 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
102 | #gpio-cells = <2>; | 104 | #gpio-cells = <2>; |
103 | gpio-controller; | 105 | gpio-controller; |
104 | gpio-ranges = <&pfc 0 96 32>; | 106 | gpio-ranges = <&pfc 0 96 32>; |
@@ -110,7 +112,7 @@ | |||
110 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; | 112 | compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
111 | reg = <0xffc44000 0x2c>; | 113 | reg = <0xffc44000 0x2c>; |
112 | interrupt-parent = <&gic>; | 114 | interrupt-parent = <&gic>; |
113 | interrupts = <0 103 0x4>; | 115 | interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>; |
114 | #gpio-cells = <2>; | 116 | #gpio-cells = <2>; |
115 | gpio-controller; | 117 | gpio-controller; |
116 | gpio-ranges = <&pfc 0 128 27>; | 118 | gpio-ranges = <&pfc 0 128 27>; |
@@ -129,7 +131,7 @@ | |||
129 | compatible = "renesas,i2c-r8a7778"; | 131 | compatible = "renesas,i2c-r8a7778"; |
130 | reg = <0xffc70000 0x1000>; | 132 | reg = <0xffc70000 0x1000>; |
131 | interrupt-parent = <&gic>; | 133 | interrupt-parent = <&gic>; |
132 | interrupts = <0 67 0x4>; | 134 | interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; |
133 | status = "disabled"; | 135 | status = "disabled"; |
134 | }; | 136 | }; |
135 | 137 | ||
@@ -139,7 +141,7 @@ | |||
139 | compatible = "renesas,i2c-r8a7778"; | 141 | compatible = "renesas,i2c-r8a7778"; |
140 | reg = <0xffc71000 0x1000>; | 142 | reg = <0xffc71000 0x1000>; |
141 | interrupt-parent = <&gic>; | 143 | interrupt-parent = <&gic>; |
142 | interrupts = <0 78 0x4>; | 144 | interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; |
143 | status = "disabled"; | 145 | status = "disabled"; |
144 | }; | 146 | }; |
145 | 147 | ||
@@ -149,7 +151,7 @@ | |||
149 | compatible = "renesas,i2c-r8a7778"; | 151 | compatible = "renesas,i2c-r8a7778"; |
150 | reg = <0xffc72000 0x1000>; | 152 | reg = <0xffc72000 0x1000>; |
151 | interrupt-parent = <&gic>; | 153 | interrupt-parent = <&gic>; |
152 | interrupts = <0 76 0x4>; | 154 | interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; |
153 | status = "disabled"; | 155 | status = "disabled"; |
154 | }; | 156 | }; |
155 | 157 | ||
@@ -159,7 +161,7 @@ | |||
159 | compatible = "renesas,i2c-r8a7778"; | 161 | compatible = "renesas,i2c-r8a7778"; |
160 | reg = <0xffc73000 0x1000>; | 162 | reg = <0xffc73000 0x1000>; |
161 | interrupt-parent = <&gic>; | 163 | interrupt-parent = <&gic>; |
162 | interrupts = <0 77 0x4>; | 164 | interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; |
163 | status = "disabled"; | 165 | status = "disabled"; |
164 | }; | 166 | }; |
165 | 167 | ||
@@ -167,7 +169,7 @@ | |||
167 | compatible = "renesas,sh-mmcif"; | 169 | compatible = "renesas,sh-mmcif"; |
168 | reg = <0xffe4e000 0x100>; | 170 | reg = <0xffe4e000 0x100>; |
169 | interrupt-parent = <&gic>; | 171 | interrupt-parent = <&gic>; |
170 | interrupts = <0 61 4>; | 172 | interrupts = <0 61 IRQ_TYPE_LEVEL_HIGH>; |
171 | status = "disabled"; | 173 | status = "disabled"; |
172 | }; | 174 | }; |
173 | 175 | ||
@@ -175,7 +177,7 @@ | |||
175 | compatible = "renesas,sdhi-r8a7778"; | 177 | compatible = "renesas,sdhi-r8a7778"; |
176 | reg = <0xffe4c000 0x100>; | 178 | reg = <0xffe4c000 0x100>; |
177 | interrupt-parent = <&gic>; | 179 | interrupt-parent = <&gic>; |
178 | interrupts = <0 87 4>; | 180 | interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; |
179 | cap-sd-highspeed; | 181 | cap-sd-highspeed; |
180 | cap-sdio-irq; | 182 | cap-sdio-irq; |
181 | status = "disabled"; | 183 | status = "disabled"; |
@@ -185,7 +187,7 @@ | |||
185 | compatible = "renesas,sdhi-r8a7778"; | 187 | compatible = "renesas,sdhi-r8a7778"; |
186 | reg = <0xffe4d000 0x100>; | 188 | reg = <0xffe4d000 0x100>; |
187 | interrupt-parent = <&gic>; | 189 | interrupt-parent = <&gic>; |
188 | interrupts = <0 88 4>; | 190 | interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; |
189 | cap-sd-highspeed; | 191 | cap-sd-highspeed; |
190 | cap-sdio-irq; | 192 | cap-sdio-irq; |
191 | status = "disabled"; | 193 | status = "disabled"; |
@@ -195,7 +197,7 @@ | |||
195 | compatible = "renesas,sdhi-r8a7778"; | 197 | compatible = "renesas,sdhi-r8a7778"; |
196 | reg = <0xffe4f000 0x100>; | 198 | reg = <0xffe4f000 0x100>; |
197 | interrupt-parent = <&gic>; | 199 | interrupt-parent = <&gic>; |
198 | interrupts = <0 86 4>; | 200 | interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; |
199 | cap-sd-highspeed; | 201 | cap-sd-highspeed; |
200 | cap-sdio-irq; | 202 | cap-sdio-irq; |
201 | status = "disabled"; | 203 | status = "disabled"; |
@@ -207,7 +209,7 @@ | |||
207 | compatible = "renesas,i2c-r8a7778"; | 209 | compatible = "renesas,i2c-r8a7778"; |
208 | reg = <0xffc70000 0x1000>; | 210 | reg = <0xffc70000 0x1000>; |
209 | interrupt-parent = <&gic>; | 211 | interrupt-parent = <&gic>; |
210 | interrupts = <0 67 0x4>; | 212 | interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>; |
211 | status = "disabled"; | 213 | status = "disabled"; |
212 | }; | 214 | }; |
213 | 215 | ||
@@ -217,7 +219,7 @@ | |||
217 | compatible = "renesas,i2c-r8a7778"; | 219 | compatible = "renesas,i2c-r8a7778"; |
218 | reg = <0xffc71000 0x1000>; | 220 | reg = <0xffc71000 0x1000>; |
219 | interrupt-parent = <&gic>; | 221 | interrupt-parent = <&gic>; |
220 | interrupts = <0 78 0x4>; | 222 | interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; |
221 | status = "disabled"; | 223 | status = "disabled"; |
222 | }; | 224 | }; |
223 | 225 | ||
@@ -227,7 +229,7 @@ | |||
227 | compatible = "renesas,i2c-r8a7778"; | 229 | compatible = "renesas,i2c-r8a7778"; |
228 | reg = <0xffc72000 0x1000>; | 230 | reg = <0xffc72000 0x1000>; |
229 | interrupt-parent = <&gic>; | 231 | interrupt-parent = <&gic>; |
230 | interrupts = <0 76 0x4>; | 232 | interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>; |
231 | status = "disabled"; | 233 | status = "disabled"; |
232 | }; | 234 | }; |
233 | 235 | ||
@@ -237,7 +239,7 @@ | |||
237 | compatible = "renesas,i2c-r8a7778"; | 239 | compatible = "renesas,i2c-r8a7778"; |
238 | reg = <0xffc73000 0x1000>; | 240 | reg = <0xffc73000 0x1000>; |
239 | interrupt-parent = <&gic>; | 241 | interrupt-parent = <&gic>; |
240 | interrupts = <0 77 0x4>; | 242 | interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; |
241 | status = "disabled"; | 243 | status = "disabled"; |
242 | }; | 244 | }; |
243 | 245 | ||
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 @@ | |||
11 | 11 | ||
12 | /include/ "skeleton.dtsi" | 12 | /include/ "skeleton.dtsi" |
13 | 13 | ||
14 | #include <dt-bindings/interrupt-controller/irq.h> | ||
15 | |||
14 | / { | 16 | / { |
15 | compatible = "renesas,r8a7779"; | 17 | compatible = "renesas,r8a7779"; |
16 | 18 | ||
@@ -52,7 +54,7 @@ | |||
52 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | 54 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
53 | reg = <0xffc40000 0x2c>; | 55 | reg = <0xffc40000 0x2c>; |
54 | interrupt-parent = <&gic>; | 56 | interrupt-parent = <&gic>; |
55 | interrupts = <0 141 0x4>; | 57 | interrupts = <0 141 IRQ_TYPE_LEVEL_HIGH>; |
56 | #gpio-cells = <2>; | 58 | #gpio-cells = <2>; |
57 | gpio-controller; | 59 | gpio-controller; |
58 | gpio-ranges = <&pfc 0 0 32>; | 60 | gpio-ranges = <&pfc 0 0 32>; |
@@ -64,7 +66,7 @@ | |||
64 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | 66 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
65 | reg = <0xffc41000 0x2c>; | 67 | reg = <0xffc41000 0x2c>; |
66 | interrupt-parent = <&gic>; | 68 | interrupt-parent = <&gic>; |
67 | interrupts = <0 142 0x4>; | 69 | interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>; |
68 | #gpio-cells = <2>; | 70 | #gpio-cells = <2>; |
69 | gpio-controller; | 71 | gpio-controller; |
70 | gpio-ranges = <&pfc 0 32 32>; | 72 | gpio-ranges = <&pfc 0 32 32>; |
@@ -76,7 +78,7 @@ | |||
76 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | 78 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
77 | reg = <0xffc42000 0x2c>; | 79 | reg = <0xffc42000 0x2c>; |
78 | interrupt-parent = <&gic>; | 80 | interrupt-parent = <&gic>; |
79 | interrupts = <0 143 0x4>; | 81 | interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>; |
80 | #gpio-cells = <2>; | 82 | #gpio-cells = <2>; |
81 | gpio-controller; | 83 | gpio-controller; |
82 | gpio-ranges = <&pfc 0 64 32>; | 84 | gpio-ranges = <&pfc 0 64 32>; |
@@ -88,7 +90,7 @@ | |||
88 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | 90 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
89 | reg = <0xffc43000 0x2c>; | 91 | reg = <0xffc43000 0x2c>; |
90 | interrupt-parent = <&gic>; | 92 | interrupt-parent = <&gic>; |
91 | interrupts = <0 144 0x4>; | 93 | interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>; |
92 | #gpio-cells = <2>; | 94 | #gpio-cells = <2>; |
93 | gpio-controller; | 95 | gpio-controller; |
94 | gpio-ranges = <&pfc 0 96 32>; | 96 | gpio-ranges = <&pfc 0 96 32>; |
@@ -100,7 +102,7 @@ | |||
100 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | 102 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
101 | reg = <0xffc44000 0x2c>; | 103 | reg = <0xffc44000 0x2c>; |
102 | interrupt-parent = <&gic>; | 104 | interrupt-parent = <&gic>; |
103 | interrupts = <0 145 0x4>; | 105 | interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>; |
104 | #gpio-cells = <2>; | 106 | #gpio-cells = <2>; |
105 | gpio-controller; | 107 | gpio-controller; |
106 | gpio-ranges = <&pfc 0 128 32>; | 108 | gpio-ranges = <&pfc 0 128 32>; |
@@ -112,7 +114,7 @@ | |||
112 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | 114 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
113 | reg = <0xffc45000 0x2c>; | 115 | reg = <0xffc45000 0x2c>; |
114 | interrupt-parent = <&gic>; | 116 | interrupt-parent = <&gic>; |
115 | interrupts = <0 146 0x4>; | 117 | interrupts = <0 146 IRQ_TYPE_LEVEL_HIGH>; |
116 | #gpio-cells = <2>; | 118 | #gpio-cells = <2>; |
117 | gpio-controller; | 119 | gpio-controller; |
118 | gpio-ranges = <&pfc 0 160 32>; | 120 | gpio-ranges = <&pfc 0 160 32>; |
@@ -124,7 +126,7 @@ | |||
124 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; | 126 | compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar"; |
125 | reg = <0xffc46000 0x2c>; | 127 | reg = <0xffc46000 0x2c>; |
126 | interrupt-parent = <&gic>; | 128 | interrupt-parent = <&gic>; |
127 | interrupts = <0 147 0x4>; | 129 | interrupts = <0 147 IRQ_TYPE_LEVEL_HIGH>; |
128 | #gpio-cells = <2>; | 130 | #gpio-cells = <2>; |
129 | gpio-controller; | 131 | gpio-controller; |
130 | gpio-ranges = <&pfc 0 192 9>; | 132 | gpio-ranges = <&pfc 0 192 9>; |
@@ -143,10 +145,10 @@ | |||
143 | <0xfe780044 4>, | 145 | <0xfe780044 4>, |
144 | <0xfe780064 4>; | 146 | <0xfe780064 4>; |
145 | interrupt-parent = <&gic>; | 147 | interrupt-parent = <&gic>; |
146 | interrupts = <0 27 0x4 | 148 | interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH |
147 | 0 28 0x4 | 149 | 0 28 IRQ_TYPE_LEVEL_HIGH |
148 | 0 29 0x4 | 150 | 0 29 IRQ_TYPE_LEVEL_HIGH |
149 | 0 30 0x4>; | 151 | 0 30 IRQ_TYPE_LEVEL_HIGH>; |
150 | sense-bitfield-width = <2>; | 152 | sense-bitfield-width = <2>; |
151 | }; | 153 | }; |
152 | 154 | ||
@@ -156,7 +158,7 @@ | |||
156 | compatible = "renesas,i2c-r8a7779"; | 158 | compatible = "renesas,i2c-r8a7779"; |
157 | reg = <0xffc70000 0x1000>; | 159 | reg = <0xffc70000 0x1000>; |
158 | interrupt-parent = <&gic>; | 160 | interrupt-parent = <&gic>; |
159 | interrupts = <0 79 0x4>; | 161 | interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>; |
160 | status = "disabled"; | 162 | status = "disabled"; |
161 | }; | 163 | }; |
162 | 164 | ||
@@ -166,7 +168,7 @@ | |||
166 | compatible = "renesas,i2c-r8a7779"; | 168 | compatible = "renesas,i2c-r8a7779"; |
167 | reg = <0xffc71000 0x1000>; | 169 | reg = <0xffc71000 0x1000>; |
168 | interrupt-parent = <&gic>; | 170 | interrupt-parent = <&gic>; |
169 | interrupts = <0 82 0x4>; | 171 | interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; |
170 | status = "disabled"; | 172 | status = "disabled"; |
171 | }; | 173 | }; |
172 | 174 | ||
@@ -176,7 +178,7 @@ | |||
176 | compatible = "renesas,i2c-r8a7779"; | 178 | compatible = "renesas,i2c-r8a7779"; |
177 | reg = <0xffc72000 0x1000>; | 179 | reg = <0xffc72000 0x1000>; |
178 | interrupt-parent = <&gic>; | 180 | interrupt-parent = <&gic>; |
179 | interrupts = <0 80 0x4>; | 181 | interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>; |
180 | status = "disabled"; | 182 | status = "disabled"; |
181 | }; | 183 | }; |
182 | 184 | ||
@@ -186,7 +188,7 @@ | |||
186 | compatible = "renesas,i2c-r8a7779"; | 188 | compatible = "renesas,i2c-r8a7779"; |
187 | reg = <0xffc73000 0x1000>; | 189 | reg = <0xffc73000 0x1000>; |
188 | interrupt-parent = <&gic>; | 190 | interrupt-parent = <&gic>; |
189 | interrupts = <0 81 0x4>; | 191 | interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>; |
190 | status = "disabled"; | 192 | status = "disabled"; |
191 | }; | 193 | }; |
192 | 194 | ||
@@ -204,14 +206,14 @@ | |||
204 | compatible = "renesas,rcar-sata"; | 206 | compatible = "renesas,rcar-sata"; |
205 | reg = <0xfc600000 0x2000>; | 207 | reg = <0xfc600000 0x2000>; |
206 | interrupt-parent = <&gic>; | 208 | interrupt-parent = <&gic>; |
207 | interrupts = <0 100 0x4>; | 209 | interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>; |
208 | }; | 210 | }; |
209 | 211 | ||
210 | sdhi0: sd@ffe4c000 { | 212 | sdhi0: sd@ffe4c000 { |
211 | compatible = "renesas,sdhi-r8a7779"; | 213 | compatible = "renesas,sdhi-r8a7779"; |
212 | reg = <0xffe4c000 0x100>; | 214 | reg = <0xffe4c000 0x100>; |
213 | interrupt-parent = <&gic>; | 215 | interrupt-parent = <&gic>; |
214 | interrupts = <0 104 4>; | 216 | interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>; |
215 | cap-sd-highspeed; | 217 | cap-sd-highspeed; |
216 | cap-sdio-irq; | 218 | cap-sdio-irq; |
217 | status = "disabled"; | 219 | status = "disabled"; |
@@ -221,7 +223,7 @@ | |||
221 | compatible = "renesas,sdhi-r8a7779"; | 223 | compatible = "renesas,sdhi-r8a7779"; |
222 | reg = <0xffe4d000 0x100>; | 224 | reg = <0xffe4d000 0x100>; |
223 | interrupt-parent = <&gic>; | 225 | interrupt-parent = <&gic>; |
224 | interrupts = <0 105 4>; | 226 | interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; |
225 | cap-sd-highspeed; | 227 | cap-sd-highspeed; |
226 | cap-sdio-irq; | 228 | cap-sdio-irq; |
227 | status = "disabled"; | 229 | status = "disabled"; |
@@ -231,7 +233,7 @@ | |||
231 | compatible = "renesas,sdhi-r8a7779"; | 233 | compatible = "renesas,sdhi-r8a7779"; |
232 | reg = <0xffe4e000 0x100>; | 234 | reg = <0xffe4e000 0x100>; |
233 | interrupt-parent = <&gic>; | 235 | interrupt-parent = <&gic>; |
234 | interrupts = <0 107 4>; | 236 | interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; |
235 | cap-sd-highspeed; | 237 | cap-sd-highspeed; |
236 | cap-sdio-irq; | 238 | cap-sdio-irq; |
237 | status = "disabled"; | 239 | status = "disabled"; |
@@ -241,7 +243,7 @@ | |||
241 | compatible = "renesas,sdhi-r8a7779"; | 243 | compatible = "renesas,sdhi-r8a7779"; |
242 | reg = <0xffe4f000 0x100>; | 244 | reg = <0xffe4f000 0x100>; |
243 | interrupt-parent = <&gic>; | 245 | interrupt-parent = <&gic>; |
244 | interrupts = <0 106 4>; | 246 | interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; |
245 | cap-sd-highspeed; | 247 | cap-sd-highspeed; |
246 | cap-sdio-irq; | 248 | cap-sdio-irq; |
247 | status = "disabled"; | 249 | status = "disabled"; |
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 5ae7db640e75..3800952f139f 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi | |||
@@ -8,6 +8,9 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
12 | #include <dt-bindings/interrupt-controller/irq.h> | ||
13 | |||
11 | / { | 14 | / { |
12 | compatible = "renesas,r8a7790"; | 15 | compatible = "renesas,r8a7790"; |
13 | interrupt-parent = <&gic>; | 16 | interrupt-parent = <&gic>; |
@@ -84,14 +87,14 @@ | |||
84 | <0 0xf1002000 0 0x1000>, | 87 | <0 0xf1002000 0 0x1000>, |
85 | <0 0xf1004000 0 0x2000>, | 88 | <0 0xf1004000 0 0x2000>, |
86 | <0 0xf1006000 0 0x2000>; | 89 | <0 0xf1006000 0 0x2000>; |
87 | interrupts = <1 9 0xf04>; | 90 | interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; |
88 | }; | 91 | }; |
89 | 92 | ||
90 | gpio0: gpio@ffc40000 { | 93 | gpio0: gpio@ffc40000 { |
91 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 94 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
92 | reg = <0 0xffc40000 0 0x2c>; | 95 | reg = <0 0xffc40000 0 0x2c>; |
93 | interrupt-parent = <&gic>; | 96 | interrupt-parent = <&gic>; |
94 | interrupts = <0 4 0x4>; | 97 | interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>; |
95 | #gpio-cells = <2>; | 98 | #gpio-cells = <2>; |
96 | gpio-controller; | 99 | gpio-controller; |
97 | gpio-ranges = <&pfc 0 0 32>; | 100 | gpio-ranges = <&pfc 0 0 32>; |
@@ -103,7 +106,7 @@ | |||
103 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 106 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
104 | reg = <0 0xffc41000 0 0x2c>; | 107 | reg = <0 0xffc41000 0 0x2c>; |
105 | interrupt-parent = <&gic>; | 108 | interrupt-parent = <&gic>; |
106 | interrupts = <0 5 0x4>; | 109 | interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>; |
107 | #gpio-cells = <2>; | 110 | #gpio-cells = <2>; |
108 | gpio-controller; | 111 | gpio-controller; |
109 | gpio-ranges = <&pfc 0 32 32>; | 112 | gpio-ranges = <&pfc 0 32 32>; |
@@ -115,7 +118,7 @@ | |||
115 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 118 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
116 | reg = <0 0xffc42000 0 0x2c>; | 119 | reg = <0 0xffc42000 0 0x2c>; |
117 | interrupt-parent = <&gic>; | 120 | interrupt-parent = <&gic>; |
118 | interrupts = <0 6 0x4>; | 121 | interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; |
119 | #gpio-cells = <2>; | 122 | #gpio-cells = <2>; |
120 | gpio-controller; | 123 | gpio-controller; |
121 | gpio-ranges = <&pfc 0 64 32>; | 124 | gpio-ranges = <&pfc 0 64 32>; |
@@ -127,7 +130,7 @@ | |||
127 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 130 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
128 | reg = <0 0xffc43000 0 0x2c>; | 131 | reg = <0 0xffc43000 0 0x2c>; |
129 | interrupt-parent = <&gic>; | 132 | interrupt-parent = <&gic>; |
130 | interrupts = <0 7 0x4>; | 133 | interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>; |
131 | #gpio-cells = <2>; | 134 | #gpio-cells = <2>; |
132 | gpio-controller; | 135 | gpio-controller; |
133 | gpio-ranges = <&pfc 0 96 32>; | 136 | gpio-ranges = <&pfc 0 96 32>; |
@@ -139,7 +142,7 @@ | |||
139 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 142 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
140 | reg = <0 0xffc44000 0 0x2c>; | 143 | reg = <0 0xffc44000 0 0x2c>; |
141 | interrupt-parent = <&gic>; | 144 | interrupt-parent = <&gic>; |
142 | interrupts = <0 8 0x4>; | 145 | interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; |
143 | #gpio-cells = <2>; | 146 | #gpio-cells = <2>; |
144 | gpio-controller; | 147 | gpio-controller; |
145 | gpio-ranges = <&pfc 0 128 32>; | 148 | gpio-ranges = <&pfc 0 128 32>; |
@@ -151,7 +154,7 @@ | |||
151 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 154 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
152 | reg = <0 0xffc45000 0 0x2c>; | 155 | reg = <0 0xffc45000 0 0x2c>; |
153 | interrupt-parent = <&gic>; | 156 | interrupt-parent = <&gic>; |
154 | interrupts = <0 9 0x4>; | 157 | interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; |
155 | #gpio-cells = <2>; | 158 | #gpio-cells = <2>; |
156 | gpio-controller; | 159 | gpio-controller; |
157 | gpio-ranges = <&pfc 0 160 32>; | 160 | gpio-ranges = <&pfc 0 160 32>; |
@@ -161,10 +164,10 @@ | |||
161 | 164 | ||
162 | timer { | 165 | timer { |
163 | compatible = "arm,armv7-timer"; | 166 | compatible = "arm,armv7-timer"; |
164 | interrupts = <1 13 0xf08>, | 167 | interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
165 | <1 14 0xf08>, | 168 | <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
166 | <1 11 0xf08>, | 169 | <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
167 | <1 10 0xf08>; | 170 | <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; |
168 | }; | 171 | }; |
169 | 172 | ||
170 | irqc0: interrupt-controller@e61c0000 { | 173 | irqc0: interrupt-controller@e61c0000 { |
@@ -173,7 +176,10 @@ | |||
173 | interrupt-controller; | 176 | interrupt-controller; |
174 | reg = <0 0xe61c0000 0 0x200>; | 177 | reg = <0 0xe61c0000 0 0x200>; |
175 | interrupt-parent = <&gic>; | 178 | interrupt-parent = <&gic>; |
176 | interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>; | 179 | interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, |
180 | <0 1 IRQ_TYPE_LEVEL_HIGH>, | ||
181 | <0 2 IRQ_TYPE_LEVEL_HIGH>, | ||
182 | <0 3 IRQ_TYPE_LEVEL_HIGH>; | ||
177 | }; | 183 | }; |
178 | 184 | ||
179 | i2c0: i2c@e6508000 { | 185 | i2c0: i2c@e6508000 { |
@@ -182,7 +188,7 @@ | |||
182 | compatible = "renesas,i2c-r8a7790"; | 188 | compatible = "renesas,i2c-r8a7790"; |
183 | reg = <0 0xe6508000 0 0x40>; | 189 | reg = <0 0xe6508000 0 0x40>; |
184 | interrupt-parent = <&gic>; | 190 | interrupt-parent = <&gic>; |
185 | interrupts = <0 287 0x4>; | 191 | interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>; |
186 | status = "disabled"; | 192 | status = "disabled"; |
187 | }; | 193 | }; |
188 | 194 | ||
@@ -192,7 +198,7 @@ | |||
192 | compatible = "renesas,i2c-r8a7790"; | 198 | compatible = "renesas,i2c-r8a7790"; |
193 | reg = <0 0xe6518000 0 0x40>; | 199 | reg = <0 0xe6518000 0 0x40>; |
194 | interrupt-parent = <&gic>; | 200 | interrupt-parent = <&gic>; |
195 | interrupts = <0 288 0x4>; | 201 | interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>; |
196 | status = "disabled"; | 202 | status = "disabled"; |
197 | }; | 203 | }; |
198 | 204 | ||
@@ -202,7 +208,7 @@ | |||
202 | compatible = "renesas,i2c-r8a7790"; | 208 | compatible = "renesas,i2c-r8a7790"; |
203 | reg = <0 0xe6530000 0 0x40>; | 209 | reg = <0 0xe6530000 0 0x40>; |
204 | interrupt-parent = <&gic>; | 210 | interrupt-parent = <&gic>; |
205 | interrupts = <0 286 0x4>; | 211 | interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>; |
206 | status = "disabled"; | 212 | status = "disabled"; |
207 | }; | 213 | }; |
208 | 214 | ||
@@ -212,7 +218,7 @@ | |||
212 | compatible = "renesas,i2c-r8a7790"; | 218 | compatible = "renesas,i2c-r8a7790"; |
213 | reg = <0 0xe6540000 0 0x40>; | 219 | reg = <0 0xe6540000 0 0x40>; |
214 | interrupt-parent = <&gic>; | 220 | interrupt-parent = <&gic>; |
215 | interrupts = <0 290 0x4>; | 221 | interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>; |
216 | status = "disabled"; | 222 | status = "disabled"; |
217 | }; | 223 | }; |
218 | 224 | ||
@@ -220,7 +226,7 @@ | |||
220 | compatible = "renesas,sh-mmcif"; | 226 | compatible = "renesas,sh-mmcif"; |
221 | reg = <0 0xee200000 0 0x80>; | 227 | reg = <0 0xee200000 0 0x80>; |
222 | interrupt-parent = <&gic>; | 228 | interrupt-parent = <&gic>; |
223 | interrupts = <0 169 0x4>; | 229 | interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>; |
224 | reg-io-width = <4>; | 230 | reg-io-width = <4>; |
225 | status = "disabled"; | 231 | status = "disabled"; |
226 | }; | 232 | }; |
@@ -229,7 +235,7 @@ | |||
229 | compatible = "renesas,sh-mmcif"; | 235 | compatible = "renesas,sh-mmcif"; |
230 | reg = <0 0xee220000 0 0x80>; | 236 | reg = <0 0xee220000 0 0x80>; |
231 | interrupt-parent = <&gic>; | 237 | interrupt-parent = <&gic>; |
232 | interrupts = <0 170 0x4>; | 238 | interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>; |
233 | reg-io-width = <4>; | 239 | reg-io-width = <4>; |
234 | status = "disabled"; | 240 | status = "disabled"; |
235 | }; | 241 | }; |
@@ -243,7 +249,7 @@ | |||
243 | compatible = "renesas,sdhi-r8a7790"; | 249 | compatible = "renesas,sdhi-r8a7790"; |
244 | reg = <0 0xee100000 0 0x100>; | 250 | reg = <0 0xee100000 0 0x100>; |
245 | interrupt-parent = <&gic>; | 251 | interrupt-parent = <&gic>; |
246 | interrupts = <0 165 4>; | 252 | interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; |
247 | cap-sd-highspeed; | 253 | cap-sd-highspeed; |
248 | status = "disabled"; | 254 | status = "disabled"; |
249 | }; | 255 | }; |
@@ -252,7 +258,7 @@ | |||
252 | compatible = "renesas,sdhi-r8a7790"; | 258 | compatible = "renesas,sdhi-r8a7790"; |
253 | reg = <0 0xee120000 0 0x100>; | 259 | reg = <0 0xee120000 0 0x100>; |
254 | interrupt-parent = <&gic>; | 260 | interrupt-parent = <&gic>; |
255 | interrupts = <0 166 4>; | 261 | interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; |
256 | cap-sd-highspeed; | 262 | cap-sd-highspeed; |
257 | status = "disabled"; | 263 | status = "disabled"; |
258 | }; | 264 | }; |
@@ -261,7 +267,7 @@ | |||
261 | compatible = "renesas,sdhi-r8a7790"; | 267 | compatible = "renesas,sdhi-r8a7790"; |
262 | reg = <0 0xee140000 0 0x100>; | 268 | reg = <0 0xee140000 0 0x100>; |
263 | interrupt-parent = <&gic>; | 269 | interrupt-parent = <&gic>; |
264 | interrupts = <0 167 4>; | 270 | interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; |
265 | cap-sd-highspeed; | 271 | cap-sd-highspeed; |
266 | status = "disabled"; | 272 | status = "disabled"; |
267 | }; | 273 | }; |
@@ -270,7 +276,7 @@ | |||
270 | compatible = "renesas,sdhi-r8a7790"; | 276 | compatible = "renesas,sdhi-r8a7790"; |
271 | reg = <0 0xee160000 0 0x100>; | 277 | reg = <0 0xee160000 0 0x100>; |
272 | interrupt-parent = <&gic>; | 278 | interrupt-parent = <&gic>; |
273 | interrupts = <0 168 4>; | 279 | interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; |
274 | cap-sd-highspeed; | 280 | cap-sd-highspeed; |
275 | status = "disabled"; | 281 | status = "disabled"; |
276 | }; | 282 | }; |
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 @@ | |||
9 | * kind, whether express or implied. | 9 | * kind, whether express or implied. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
13 | #include <dt-bindings/interrupt-controller/irq.h> | ||
14 | |||
12 | / { | 15 | / { |
13 | compatible = "renesas,r8a7791"; | 16 | compatible = "renesas,r8a7791"; |
14 | interrupt-parent = <&gic>; | 17 | interrupt-parent = <&gic>; |
@@ -43,14 +46,14 @@ | |||
43 | <0 0xf1002000 0 0x1000>, | 46 | <0 0xf1002000 0 0x1000>, |
44 | <0 0xf1004000 0 0x2000>, | 47 | <0 0xf1004000 0 0x2000>, |
45 | <0 0xf1006000 0 0x2000>; | 48 | <0 0xf1006000 0 0x2000>; |
46 | interrupts = <1 9 0xf04>; | 49 | interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; |
47 | }; | 50 | }; |
48 | 51 | ||
49 | gpio0: gpio@ffc40000 { | 52 | gpio0: gpio@ffc40000 { |
50 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 53 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
51 | reg = <0 0xffc40000 0 0x50>; | 54 | reg = <0 0xffc40000 0 0x50>; |
52 | interrupt-parent = <&gic>; | 55 | interrupt-parent = <&gic>; |
53 | interrupts = <0 4 0x4>; | 56 | interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>; |
54 | #gpio-cells = <2>; | 57 | #gpio-cells = <2>; |
55 | gpio-controller; | 58 | gpio-controller; |
56 | gpio-ranges = <&pfc 0 0 32>; | 59 | gpio-ranges = <&pfc 0 0 32>; |
@@ -62,7 +65,7 @@ | |||
62 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 65 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
63 | reg = <0 0xffc41000 0 0x50>; | 66 | reg = <0 0xffc41000 0 0x50>; |
64 | interrupt-parent = <&gic>; | 67 | interrupt-parent = <&gic>; |
65 | interrupts = <0 5 0x4>; | 68 | interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>; |
66 | #gpio-cells = <2>; | 69 | #gpio-cells = <2>; |
67 | gpio-controller; | 70 | gpio-controller; |
68 | gpio-ranges = <&pfc 0 32 32>; | 71 | gpio-ranges = <&pfc 0 32 32>; |
@@ -74,7 +77,7 @@ | |||
74 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 77 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
75 | reg = <0 0xffc42000 0 0x50>; | 78 | reg = <0 0xffc42000 0 0x50>; |
76 | interrupt-parent = <&gic>; | 79 | interrupt-parent = <&gic>; |
77 | interrupts = <0 6 0x4>; | 80 | interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; |
78 | #gpio-cells = <2>; | 81 | #gpio-cells = <2>; |
79 | gpio-controller; | 82 | gpio-controller; |
80 | gpio-ranges = <&pfc 0 64 32>; | 83 | gpio-ranges = <&pfc 0 64 32>; |
@@ -86,7 +89,7 @@ | |||
86 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 89 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
87 | reg = <0 0xffc43000 0 0x50>; | 90 | reg = <0 0xffc43000 0 0x50>; |
88 | interrupt-parent = <&gic>; | 91 | interrupt-parent = <&gic>; |
89 | interrupts = <0 7 0x4>; | 92 | interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>; |
90 | #gpio-cells = <2>; | 93 | #gpio-cells = <2>; |
91 | gpio-controller; | 94 | gpio-controller; |
92 | gpio-ranges = <&pfc 0 96 32>; | 95 | gpio-ranges = <&pfc 0 96 32>; |
@@ -98,7 +101,7 @@ | |||
98 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 101 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
99 | reg = <0 0xffc44000 0 0x50>; | 102 | reg = <0 0xffc44000 0 0x50>; |
100 | interrupt-parent = <&gic>; | 103 | interrupt-parent = <&gic>; |
101 | interrupts = <0 8 0x4>; | 104 | interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; |
102 | #gpio-cells = <2>; | 105 | #gpio-cells = <2>; |
103 | gpio-controller; | 106 | gpio-controller; |
104 | gpio-ranges = <&pfc 0 128 32>; | 107 | gpio-ranges = <&pfc 0 128 32>; |
@@ -110,7 +113,7 @@ | |||
110 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 113 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
111 | reg = <0 0xffc45000 0 0x50>; | 114 | reg = <0 0xffc45000 0 0x50>; |
112 | interrupt-parent = <&gic>; | 115 | interrupt-parent = <&gic>; |
113 | interrupts = <0 9 0x4>; | 116 | interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; |
114 | #gpio-cells = <2>; | 117 | #gpio-cells = <2>; |
115 | gpio-controller; | 118 | gpio-controller; |
116 | gpio-ranges = <&pfc 0 160 32>; | 119 | gpio-ranges = <&pfc 0 160 32>; |
@@ -122,7 +125,7 @@ | |||
122 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 125 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
123 | reg = <0 0xffc45400 0 0x50>; | 126 | reg = <0 0xffc45400 0 0x50>; |
124 | interrupt-parent = <&gic>; | 127 | interrupt-parent = <&gic>; |
125 | interrupts = <0 10 0x4>; | 128 | interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; |
126 | #gpio-cells = <2>; | 129 | #gpio-cells = <2>; |
127 | gpio-controller; | 130 | gpio-controller; |
128 | gpio-ranges = <&pfc 0 192 32>; | 131 | gpio-ranges = <&pfc 0 192 32>; |
@@ -134,7 +137,7 @@ | |||
134 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; | 137 | compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
135 | reg = <0 0xffc45800 0 0x50>; | 138 | reg = <0 0xffc45800 0 0x50>; |
136 | interrupt-parent = <&gic>; | 139 | interrupt-parent = <&gic>; |
137 | interrupts = <0 11 0x4>; | 140 | interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>; |
138 | #gpio-cells = <2>; | 141 | #gpio-cells = <2>; |
139 | gpio-controller; | 142 | gpio-controller; |
140 | gpio-ranges = <&pfc 0 224 26>; | 143 | gpio-ranges = <&pfc 0 224 26>; |
@@ -144,10 +147,10 @@ | |||
144 | 147 | ||
145 | timer { | 148 | timer { |
146 | compatible = "arm,armv7-timer"; | 149 | compatible = "arm,armv7-timer"; |
147 | interrupts = <1 13 0xf08>, | 150 | interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
148 | <1 14 0xf08>, | 151 | <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
149 | <1 11 0xf08>, | 152 | <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, |
150 | <1 10 0xf08>; | 153 | <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; |
151 | }; | 154 | }; |
152 | 155 | ||
153 | irqc0: interrupt-controller@e61c0000 { | 156 | irqc0: interrupt-controller@e61c0000 { |
@@ -156,16 +159,16 @@ | |||
156 | interrupt-controller; | 159 | interrupt-controller; |
157 | reg = <0 0xe61c0000 0 0x200>; | 160 | reg = <0 0xe61c0000 0 0x200>; |
158 | interrupt-parent = <&gic>; | 161 | interrupt-parent = <&gic>; |
159 | interrupts = <0 0 4>, | 162 | interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>, |
160 | <0 1 4>, | 163 | <0 1 IRQ_TYPE_LEVEL_HIGH>, |
161 | <0 2 4>, | 164 | <0 2 IRQ_TYPE_LEVEL_HIGH>, |
162 | <0 3 4>, | 165 | <0 3 IRQ_TYPE_LEVEL_HIGH>, |
163 | <0 12 4>, | 166 | <0 12 IRQ_TYPE_LEVEL_HIGH>, |
164 | <0 13 4>, | 167 | <0 13 IRQ_TYPE_LEVEL_HIGH>, |
165 | <0 14 4>, | 168 | <0 14 IRQ_TYPE_LEVEL_HIGH>, |
166 | <0 15 4>, | 169 | <0 15 IRQ_TYPE_LEVEL_HIGH>, |
167 | <0 16 4>, | 170 | <0 16 IRQ_TYPE_LEVEL_HIGH>, |
168 | <0 17 4>; | 171 | <0 17 IRQ_TYPE_LEVEL_HIGH>; |
169 | }; | 172 | }; |
170 | 173 | ||
171 | pfc: pfc@e6060000 { | 174 | 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 @@ | |||
10 | 10 | ||
11 | /include/ "skeleton.dtsi" | 11 | /include/ "skeleton.dtsi" |
12 | 12 | ||
13 | #include <dt-bindings/interrupt-controller/irq.h> | ||
14 | |||
13 | / { | 15 | / { |
14 | compatible = "renesas,sh73a0"; | 16 | compatible = "renesas,sh73a0"; |
15 | 17 | ||
@@ -40,8 +42,8 @@ | |||
40 | 42 | ||
41 | pmu { | 43 | pmu { |
42 | compatible = "arm,cortex-a9-pmu"; | 44 | compatible = "arm,cortex-a9-pmu"; |
43 | interrupts = <0 55 4>, | 45 | interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>, |
44 | <0 56 4>; | 46 | <0 56 IRQ_TYPE_LEVEL_HIGH>; |
45 | }; | 47 | }; |
46 | 48 | ||
47 | irqpin0: irqpin@e6900000 { | 49 | irqpin0: irqpin@e6900000 { |
@@ -54,14 +56,14 @@ | |||
54 | <0xe6900040 1>, | 56 | <0xe6900040 1>, |
55 | <0xe6900060 1>; | 57 | <0xe6900060 1>; |
56 | interrupt-parent = <&gic>; | 58 | interrupt-parent = <&gic>; |
57 | interrupts = <0 1 0x4 | 59 | interrupts = <0 1 IRQ_TYPE_LEVEL_HIGH |
58 | 0 2 0x4 | 60 | 0 2 IRQ_TYPE_LEVEL_HIGH |
59 | 0 3 0x4 | 61 | 0 3 IRQ_TYPE_LEVEL_HIGH |
60 | 0 4 0x4 | 62 | 0 4 IRQ_TYPE_LEVEL_HIGH |
61 | 0 5 0x4 | 63 | 0 5 IRQ_TYPE_LEVEL_HIGH |
62 | 0 6 0x4 | 64 | 0 6 IRQ_TYPE_LEVEL_HIGH |
63 | 0 7 0x4 | 65 | 0 7 IRQ_TYPE_LEVEL_HIGH |
64 | 0 8 0x4>; | 66 | 0 8 IRQ_TYPE_LEVEL_HIGH>; |
65 | }; | 67 | }; |
66 | 68 | ||
67 | irqpin1: irqpin@e6900004 { | 69 | irqpin1: irqpin@e6900004 { |
@@ -74,14 +76,14 @@ | |||
74 | <0xe6900044 1>, | 76 | <0xe6900044 1>, |
75 | <0xe6900064 1>; | 77 | <0xe6900064 1>; |
76 | interrupt-parent = <&gic>; | 78 | interrupt-parent = <&gic>; |
77 | interrupts = <0 9 0x4 | 79 | interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH |
78 | 0 10 0x4 | 80 | 0 10 IRQ_TYPE_LEVEL_HIGH |
79 | 0 11 0x4 | 81 | 0 11 IRQ_TYPE_LEVEL_HIGH |
80 | 0 12 0x4 | 82 | 0 12 IRQ_TYPE_LEVEL_HIGH |
81 | 0 13 0x4 | 83 | 0 13 IRQ_TYPE_LEVEL_HIGH |
82 | 0 14 0x4 | 84 | 0 14 IRQ_TYPE_LEVEL_HIGH |
83 | 0 15 0x4 | 85 | 0 15 IRQ_TYPE_LEVEL_HIGH |
84 | 0 16 0x4>; | 86 | 0 16 IRQ_TYPE_LEVEL_HIGH>; |
85 | control-parent; | 87 | control-parent; |
86 | }; | 88 | }; |
87 | 89 | ||
@@ -95,14 +97,14 @@ | |||
95 | <0xe6900048 1>, | 97 | <0xe6900048 1>, |
96 | <0xe6900068 1>; | 98 | <0xe6900068 1>; |
97 | interrupt-parent = <&gic>; | 99 | interrupt-parent = <&gic>; |
98 | interrupts = <0 17 0x4 | 100 | interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH |
99 | 0 18 0x4 | 101 | 0 18 IRQ_TYPE_LEVEL_HIGH |
100 | 0 19 0x4 | 102 | 0 19 IRQ_TYPE_LEVEL_HIGH |
101 | 0 20 0x4 | 103 | 0 20 IRQ_TYPE_LEVEL_HIGH |
102 | 0 21 0x4 | 104 | 0 21 IRQ_TYPE_LEVEL_HIGH |
103 | 0 22 0x4 | 105 | 0 22 IRQ_TYPE_LEVEL_HIGH |
104 | 0 23 0x4 | 106 | 0 23 IRQ_TYPE_LEVEL_HIGH |
105 | 0 24 0x4>; | 107 | 0 24 IRQ_TYPE_LEVEL_HIGH>; |
106 | }; | 108 | }; |
107 | 109 | ||
108 | irqpin3: irqpin@e690000c { | 110 | irqpin3: irqpin@e690000c { |
@@ -115,14 +117,14 @@ | |||
115 | <0xe690004c 1>, | 117 | <0xe690004c 1>, |
116 | <0xe690006c 1>; | 118 | <0xe690006c 1>; |
117 | interrupt-parent = <&gic>; | 119 | interrupt-parent = <&gic>; |
118 | interrupts = <0 25 0x4 | 120 | interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH |
119 | 0 26 0x4 | 121 | 0 26 IRQ_TYPE_LEVEL_HIGH |
120 | 0 27 0x4 | 122 | 0 27 IRQ_TYPE_LEVEL_HIGH |
121 | 0 28 0x4 | 123 | 0 28 IRQ_TYPE_LEVEL_HIGH |
122 | 0 29 0x4 | 124 | 0 29 IRQ_TYPE_LEVEL_HIGH |
123 | 0 30 0x4 | 125 | 0 30 IRQ_TYPE_LEVEL_HIGH |
124 | 0 31 0x4 | 126 | 0 31 IRQ_TYPE_LEVEL_HIGH |
125 | 0 32 0x4>; | 127 | 0 32 IRQ_TYPE_LEVEL_HIGH>; |
126 | }; | 128 | }; |
127 | 129 | ||
128 | i2c0: i2c@e6820000 { | 130 | i2c0: i2c@e6820000 { |
@@ -131,10 +133,10 @@ | |||
131 | compatible = "renesas,rmobile-iic"; | 133 | compatible = "renesas,rmobile-iic"; |
132 | reg = <0xe6820000 0x425>; | 134 | reg = <0xe6820000 0x425>; |
133 | interrupt-parent = <&gic>; | 135 | interrupt-parent = <&gic>; |
134 | interrupts = <0 167 0x4 | 136 | interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH |
135 | 0 168 0x4 | 137 | 0 168 IRQ_TYPE_LEVEL_HIGH |
136 | 0 169 0x4 | 138 | 0 169 IRQ_TYPE_LEVEL_HIGH |
137 | 0 170 0x4>; | 139 | 0 170 IRQ_TYPE_LEVEL_HIGH>; |
138 | status = "disabled"; | 140 | status = "disabled"; |
139 | }; | 141 | }; |
140 | 142 | ||
@@ -144,10 +146,10 @@ | |||
144 | compatible = "renesas,rmobile-iic"; | 146 | compatible = "renesas,rmobile-iic"; |
145 | reg = <0xe6822000 0x425>; | 147 | reg = <0xe6822000 0x425>; |
146 | interrupt-parent = <&gic>; | 148 | interrupt-parent = <&gic>; |
147 | interrupts = <0 51 0x4 | 149 | interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH |
148 | 0 52 0x4 | 150 | 0 52 IRQ_TYPE_LEVEL_HIGH |
149 | 0 53 0x4 | 151 | 0 53 IRQ_TYPE_LEVEL_HIGH |
150 | 0 54 0x4>; | 152 | 0 54 IRQ_TYPE_LEVEL_HIGH>; |
151 | status = "disabled"; | 153 | status = "disabled"; |
152 | }; | 154 | }; |
153 | 155 | ||
@@ -157,10 +159,10 @@ | |||
157 | compatible = "renesas,rmobile-iic"; | 159 | compatible = "renesas,rmobile-iic"; |
158 | reg = <0xe6824000 0x425>; | 160 | reg = <0xe6824000 0x425>; |
159 | interrupt-parent = <&gic>; | 161 | interrupt-parent = <&gic>; |
160 | interrupts = <0 171 0x4 | 162 | interrupts = <0 171 IRQ_TYPE_LEVEL_HIGH |
161 | 0 172 0x4 | 163 | 0 172 IRQ_TYPE_LEVEL_HIGH |
162 | 0 173 0x4 | 164 | 0 173 IRQ_TYPE_LEVEL_HIGH |
163 | 0 174 0x4>; | 165 | 0 174 IRQ_TYPE_LEVEL_HIGH>; |
164 | status = "disabled"; | 166 | status = "disabled"; |
165 | }; | 167 | }; |
166 | 168 | ||
@@ -170,10 +172,10 @@ | |||
170 | compatible = "renesas,rmobile-iic"; | 172 | compatible = "renesas,rmobile-iic"; |
171 | reg = <0xe6826000 0x425>; | 173 | reg = <0xe6826000 0x425>; |
172 | interrupt-parent = <&gic>; | 174 | interrupt-parent = <&gic>; |
173 | interrupts = <0 183 0x4 | 175 | interrupts = <0 183 IRQ_TYPE_LEVEL_HIGH |
174 | 0 184 0x4 | 176 | 0 184 IRQ_TYPE_LEVEL_HIGH |
175 | 0 185 0x4 | 177 | 0 185 IRQ_TYPE_LEVEL_HIGH |
176 | 0 186 0x4>; | 178 | 0 186 IRQ_TYPE_LEVEL_HIGH>; |
177 | status = "disabled"; | 179 | status = "disabled"; |
178 | }; | 180 | }; |
179 | 181 | ||
@@ -183,10 +185,10 @@ | |||
183 | compatible = "renesas,rmobile-iic"; | 185 | compatible = "renesas,rmobile-iic"; |
184 | reg = <0xe6828000 0x425>; | 186 | reg = <0xe6828000 0x425>; |
185 | interrupt-parent = <&gic>; | 187 | interrupt-parent = <&gic>; |
186 | interrupts = <0 187 0x4 | 188 | interrupts = <0 187 IRQ_TYPE_LEVEL_HIGH |
187 | 0 188 0x4 | 189 | 0 188 IRQ_TYPE_LEVEL_HIGH |
188 | 0 189 0x4 | 190 | 0 189 IRQ_TYPE_LEVEL_HIGH |
189 | 0 190 0x4>; | 191 | 0 190 IRQ_TYPE_LEVEL_HIGH>; |
190 | status = "disabled"; | 192 | status = "disabled"; |
191 | }; | 193 | }; |
192 | 194 | ||
@@ -194,8 +196,8 @@ | |||
194 | compatible = "renesas,sh-mmcif"; | 196 | compatible = "renesas,sh-mmcif"; |
195 | reg = <0xe6bd0000 0x100>; | 197 | reg = <0xe6bd0000 0x100>; |
196 | interrupt-parent = <&gic>; | 198 | interrupt-parent = <&gic>; |
197 | interrupts = <0 140 0x4 | 199 | interrupts = <0 140 IRQ_TYPE_LEVEL_HIGH |
198 | 0 141 0x4>; | 200 | 0 141 IRQ_TYPE_LEVEL_HIGH>; |
199 | reg-io-width = <4>; | 201 | reg-io-width = <4>; |
200 | status = "disabled"; | 202 | status = "disabled"; |
201 | }; | 203 | }; |
@@ -204,9 +206,9 @@ | |||
204 | compatible = "renesas,sdhi-r8a7740"; | 206 | compatible = "renesas,sdhi-r8a7740"; |
205 | reg = <0xee100000 0x100>; | 207 | reg = <0xee100000 0x100>; |
206 | interrupt-parent = <&gic>; | 208 | interrupt-parent = <&gic>; |
207 | interrupts = <0 83 4 | 209 | interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH |
208 | 0 84 4 | 210 | 0 84 IRQ_TYPE_LEVEL_HIGH |
209 | 0 85 4>; | 211 | 0 85 IRQ_TYPE_LEVEL_HIGH>; |
210 | cap-sd-highspeed; | 212 | cap-sd-highspeed; |
211 | status = "disabled"; | 213 | status = "disabled"; |
212 | }; | 214 | }; |
@@ -216,8 +218,8 @@ | |||
216 | compatible = "renesas,sdhi-r8a7740"; | 218 | compatible = "renesas,sdhi-r8a7740"; |
217 | reg = <0xee120000 0x100>; | 219 | reg = <0xee120000 0x100>; |
218 | interrupt-parent = <&gic>; | 220 | interrupt-parent = <&gic>; |
219 | interrupts = <0 88 4 | 221 | interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH |
220 | 0 89 4>; | 222 | 0 89 IRQ_TYPE_LEVEL_HIGH>; |
221 | toshiba,mmc-wrprotect-disable; | 223 | toshiba,mmc-wrprotect-disable; |
222 | cap-sd-highspeed; | 224 | cap-sd-highspeed; |
223 | status = "disabled"; | 225 | status = "disabled"; |
@@ -227,8 +229,8 @@ | |||
227 | compatible = "renesas,sdhi-r8a7740"; | 229 | compatible = "renesas,sdhi-r8a7740"; |
228 | reg = <0xee140000 0x100>; | 230 | reg = <0xee140000 0x100>; |
229 | interrupt-parent = <&gic>; | 231 | interrupt-parent = <&gic>; |
230 | interrupts = <0 104 4 | 232 | interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH |
231 | 0 105 4>; | 233 | 0 105 IRQ_TYPE_LEVEL_HIGH>; |
232 | toshiba,mmc-wrprotect-disable; | 234 | toshiba,mmc-wrprotect-disable; |
233 | cap-sd-highspeed; | 235 | cap-sd-highspeed; |
234 | status = "disabled"; | 236 | status = "disabled"; |