aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-08-20 10:28:34 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-08-21 23:34:53 -0400
commitf170b97c9ad0b8ba3e99f02cbadc7676383fee09 (patch)
treefcd875de82259c054c26d9286ee0d270d319a0ee
parent5fb1453c2ff02ce5e5298351ff774e19f8d9dbb3 (diff)
ARM: shmobile: sh73a0 dtsi: Move interrupt-parent to the top
Add an "interrupt-parent = <&gic>;" at the top, which is inherited by all child nodes, so the "interrupt-parent" properties can be removed from the individual child nodes. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/boot/dts/sh73a0.dtsi24
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 910b79079d5a..c95935563e44 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -14,6 +14,7 @@
14 14
15/ { 15/ {
16 compatible = "renesas,sh73a0"; 16 compatible = "renesas,sh73a0";
17 interrupt-parent = <&gic>;
17 18
18 cpus { 19 cpus {
19 #address-cells = <1>; 20 #address-cells = <1>;
@@ -54,7 +55,6 @@
54 <0xe6900020 1>, 55 <0xe6900020 1>,
55 <0xe6900040 1>, 56 <0xe6900040 1>,
56 <0xe6900060 1>; 57 <0xe6900060 1>;
57 interrupt-parent = <&gic>;
58 interrupts = <0 1 IRQ_TYPE_LEVEL_HIGH 58 interrupts = <0 1 IRQ_TYPE_LEVEL_HIGH
59 0 2 IRQ_TYPE_LEVEL_HIGH 59 0 2 IRQ_TYPE_LEVEL_HIGH
60 0 3 IRQ_TYPE_LEVEL_HIGH 60 0 3 IRQ_TYPE_LEVEL_HIGH
@@ -74,7 +74,6 @@
74 <0xe6900024 1>, 74 <0xe6900024 1>,
75 <0xe6900044 1>, 75 <0xe6900044 1>,
76 <0xe6900064 1>; 76 <0xe6900064 1>;
77 interrupt-parent = <&gic>;
78 interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH 77 interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH
79 0 10 IRQ_TYPE_LEVEL_HIGH 78 0 10 IRQ_TYPE_LEVEL_HIGH
80 0 11 IRQ_TYPE_LEVEL_HIGH 79 0 11 IRQ_TYPE_LEVEL_HIGH
@@ -95,7 +94,6 @@
95 <0xe6900028 1>, 94 <0xe6900028 1>,
96 <0xe6900048 1>, 95 <0xe6900048 1>,
97 <0xe6900068 1>; 96 <0xe6900068 1>;
98 interrupt-parent = <&gic>;
99 interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH 97 interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH
100 0 18 IRQ_TYPE_LEVEL_HIGH 98 0 18 IRQ_TYPE_LEVEL_HIGH
101 0 19 IRQ_TYPE_LEVEL_HIGH 99 0 19 IRQ_TYPE_LEVEL_HIGH
@@ -115,7 +113,6 @@
115 <0xe690002c 1>, 113 <0xe690002c 1>,
116 <0xe690004c 1>, 114 <0xe690004c 1>,
117 <0xe690006c 1>; 115 <0xe690006c 1>;
118 interrupt-parent = <&gic>;
119 interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH 116 interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH
120 0 26 IRQ_TYPE_LEVEL_HIGH 117 0 26 IRQ_TYPE_LEVEL_HIGH
121 0 27 IRQ_TYPE_LEVEL_HIGH 118 0 27 IRQ_TYPE_LEVEL_HIGH
@@ -131,7 +128,6 @@
131 #size-cells = <0>; 128 #size-cells = <0>;
132 compatible = "renesas,rmobile-iic"; 129 compatible = "renesas,rmobile-iic";
133 reg = <0xe6820000 0x425>; 130 reg = <0xe6820000 0x425>;
134 interrupt-parent = <&gic>;
135 interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH 131 interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH
136 0 168 IRQ_TYPE_LEVEL_HIGH 132 0 168 IRQ_TYPE_LEVEL_HIGH
137 0 169 IRQ_TYPE_LEVEL_HIGH 133 0 169 IRQ_TYPE_LEVEL_HIGH
@@ -144,7 +140,6 @@
144 #size-cells = <0>; 140 #size-cells = <0>;
145 compatible = "renesas,rmobile-iic"; 141 compatible = "renesas,rmobile-iic";
146 reg = <0xe6822000 0x425>; 142 reg = <0xe6822000 0x425>;
147 interrupt-parent = <&gic>;
148 interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH 143 interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH
149 0 52 IRQ_TYPE_LEVEL_HIGH 144 0 52 IRQ_TYPE_LEVEL_HIGH
150 0 53 IRQ_TYPE_LEVEL_HIGH 145 0 53 IRQ_TYPE_LEVEL_HIGH
@@ -157,7 +152,6 @@
157 #size-cells = <0>; 152 #size-cells = <0>;
158 compatible = "renesas,rmobile-iic"; 153 compatible = "renesas,rmobile-iic";
159 reg = <0xe6824000 0x425>; 154 reg = <0xe6824000 0x425>;
160 interrupt-parent = <&gic>;
161 interrupts = <0 171 IRQ_TYPE_LEVEL_HIGH 155 interrupts = <0 171 IRQ_TYPE_LEVEL_HIGH
162 0 172 IRQ_TYPE_LEVEL_HIGH 156 0 172 IRQ_TYPE_LEVEL_HIGH
163 0 173 IRQ_TYPE_LEVEL_HIGH 157 0 173 IRQ_TYPE_LEVEL_HIGH
@@ -170,7 +164,6 @@
170 #size-cells = <0>; 164 #size-cells = <0>;
171 compatible = "renesas,rmobile-iic"; 165 compatible = "renesas,rmobile-iic";
172 reg = <0xe6826000 0x425>; 166 reg = <0xe6826000 0x425>;
173 interrupt-parent = <&gic>;
174 interrupts = <0 183 IRQ_TYPE_LEVEL_HIGH 167 interrupts = <0 183 IRQ_TYPE_LEVEL_HIGH
175 0 184 IRQ_TYPE_LEVEL_HIGH 168 0 184 IRQ_TYPE_LEVEL_HIGH
176 0 185 IRQ_TYPE_LEVEL_HIGH 169 0 185 IRQ_TYPE_LEVEL_HIGH
@@ -183,7 +176,6 @@
183 #size-cells = <0>; 176 #size-cells = <0>;
184 compatible = "renesas,rmobile-iic"; 177 compatible = "renesas,rmobile-iic";
185 reg = <0xe6828000 0x425>; 178 reg = <0xe6828000 0x425>;
186 interrupt-parent = <&gic>;
187 interrupts = <0 187 IRQ_TYPE_LEVEL_HIGH 179 interrupts = <0 187 IRQ_TYPE_LEVEL_HIGH
188 0 188 IRQ_TYPE_LEVEL_HIGH 180 0 188 IRQ_TYPE_LEVEL_HIGH
189 0 189 IRQ_TYPE_LEVEL_HIGH 181 0 189 IRQ_TYPE_LEVEL_HIGH
@@ -194,7 +186,6 @@
194 mmcif: mmc@e6bd0000 { 186 mmcif: mmc@e6bd0000 {
195 compatible = "renesas,sh-mmcif"; 187 compatible = "renesas,sh-mmcif";
196 reg = <0xe6bd0000 0x100>; 188 reg = <0xe6bd0000 0x100>;
197 interrupt-parent = <&gic>;
198 interrupts = <0 140 IRQ_TYPE_LEVEL_HIGH 189 interrupts = <0 140 IRQ_TYPE_LEVEL_HIGH
199 0 141 IRQ_TYPE_LEVEL_HIGH>; 190 0 141 IRQ_TYPE_LEVEL_HIGH>;
200 reg-io-width = <4>; 191 reg-io-width = <4>;
@@ -204,7 +195,6 @@
204 sdhi0: sd@ee100000 { 195 sdhi0: sd@ee100000 {
205 compatible = "renesas,sdhi-sh73a0"; 196 compatible = "renesas,sdhi-sh73a0";
206 reg = <0xee100000 0x100>; 197 reg = <0xee100000 0x100>;
207 interrupt-parent = <&gic>;
208 interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH 198 interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH
209 0 84 IRQ_TYPE_LEVEL_HIGH 199 0 84 IRQ_TYPE_LEVEL_HIGH
210 0 85 IRQ_TYPE_LEVEL_HIGH>; 200 0 85 IRQ_TYPE_LEVEL_HIGH>;
@@ -216,7 +206,6 @@
216 sdhi1: sd@ee120000 { 206 sdhi1: sd@ee120000 {
217 compatible = "renesas,sdhi-sh73a0"; 207 compatible = "renesas,sdhi-sh73a0";
218 reg = <0xee120000 0x100>; 208 reg = <0xee120000 0x100>;
219 interrupt-parent = <&gic>;
220 interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH 209 interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH
221 0 89 IRQ_TYPE_LEVEL_HIGH>; 210 0 89 IRQ_TYPE_LEVEL_HIGH>;
222 toshiba,mmc-wrprotect-disable; 211 toshiba,mmc-wrprotect-disable;
@@ -227,7 +216,6 @@
227 sdhi2: sd@ee140000 { 216 sdhi2: sd@ee140000 {
228 compatible = "renesas,sdhi-sh73a0"; 217 compatible = "renesas,sdhi-sh73a0";
229 reg = <0xee140000 0x100>; 218 reg = <0xee140000 0x100>;
230 interrupt-parent = <&gic>;
231 interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH 219 interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH
232 0 105 IRQ_TYPE_LEVEL_HIGH>; 220 0 105 IRQ_TYPE_LEVEL_HIGH>;
233 toshiba,mmc-wrprotect-disable; 221 toshiba,mmc-wrprotect-disable;
@@ -238,7 +226,6 @@
238 scifa0: serial@e6c40000 { 226 scifa0: serial@e6c40000 {
239 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 227 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
240 reg = <0xe6c40000 0x100>; 228 reg = <0xe6c40000 0x100>;
241 interrupt-parent = <&gic>;
242 interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>; 229 interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
243 status = "disabled"; 230 status = "disabled";
244 }; 231 };
@@ -246,7 +233,6 @@
246 scifa1: serial@e6c50000 { 233 scifa1: serial@e6c50000 {
247 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 234 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
248 reg = <0xe6c50000 0x100>; 235 reg = <0xe6c50000 0x100>;
249 interrupt-parent = <&gic>;
250 interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>; 236 interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
251 status = "disabled"; 237 status = "disabled";
252 }; 238 };
@@ -254,7 +240,6 @@
254 scifa2: serial@e6c60000 { 240 scifa2: serial@e6c60000 {
255 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 241 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
256 reg = <0xe6c60000 0x100>; 242 reg = <0xe6c60000 0x100>;
257 interrupt-parent = <&gic>;
258 interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>; 243 interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
259 status = "disabled"; 244 status = "disabled";
260 }; 245 };
@@ -262,7 +247,6 @@
262 scifa3: serial@e6c70000 { 247 scifa3: serial@e6c70000 {
263 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 248 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
264 reg = <0xe6c70000 0x100>; 249 reg = <0xe6c70000 0x100>;
265 interrupt-parent = <&gic>;
266 interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>; 250 interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
267 status = "disabled"; 251 status = "disabled";
268 }; 252 };
@@ -270,7 +254,6 @@
270 scifa4: serial@e6c80000 { 254 scifa4: serial@e6c80000 {
271 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 255 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
272 reg = <0xe6c80000 0x100>; 256 reg = <0xe6c80000 0x100>;
273 interrupt-parent = <&gic>;
274 interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; 257 interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;
275 status = "disabled"; 258 status = "disabled";
276 }; 259 };
@@ -278,7 +261,6 @@
278 scifa5: serial@e6cb0000 { 261 scifa5: serial@e6cb0000 {
279 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 262 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
280 reg = <0xe6cb0000 0x100>; 263 reg = <0xe6cb0000 0x100>;
281 interrupt-parent = <&gic>;
282 interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>; 264 interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
283 status = "disabled"; 265 status = "disabled";
284 }; 266 };
@@ -286,7 +268,6 @@
286 scifa6: serial@e6cc0000 { 268 scifa6: serial@e6cc0000 {
287 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 269 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
288 reg = <0xe6cc0000 0x100>; 270 reg = <0xe6cc0000 0x100>;
289 interrupt-parent = <&gic>;
290 interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>; 271 interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
291 status = "disabled"; 272 status = "disabled";
292 }; 273 };
@@ -294,7 +275,6 @@
294 scifa7: serial@e6cd0000 { 275 scifa7: serial@e6cd0000 {
295 compatible = "renesas,scifa-sh73a0", "renesas,scifa"; 276 compatible = "renesas,scifa-sh73a0", "renesas,scifa";
296 reg = <0xe6cd0000 0x100>; 277 reg = <0xe6cd0000 0x100>;
297 interrupt-parent = <&gic>;
298 interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>; 278 interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>;
299 status = "disabled"; 279 status = "disabled";
300 }; 280 };
@@ -302,7 +282,6 @@
302 scifb8: serial@e6c30000 { 282 scifb8: serial@e6c30000 {
303 compatible = "renesas,scifb-sh73a0", "renesas,scifb"; 283 compatible = "renesas,scifb-sh73a0", "renesas,scifb";
304 reg = <0xe6c30000 0x100>; 284 reg = <0xe6c30000 0x100>;
305 interrupt-parent = <&gic>;
306 interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>; 285 interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
307 status = "disabled"; 286 status = "disabled";
308 }; 287 };
@@ -328,7 +307,6 @@
328 #sound-dai-cells = <1>; 307 #sound-dai-cells = <1>;
329 compatible = "renesas,sh_fsi2"; 308 compatible = "renesas,sh_fsi2";
330 reg = <0xec230000 0x400>; 309 reg = <0xec230000 0x400>;
331 interrupt-parent = <&gic>;
332 interrupts = <0 146 0x4>; 310 interrupts = <0 146 0x4>;
333 status = "disabled"; 311 status = "disabled";
334 }; 312 };