aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2012-10-24 04:47:52 -0400
committerBenoit Cousson <b-cousson@ti.com>2012-10-29 11:56:32 -0400
commit4c94ac29b5c1f0cef2281df97609f2cbcc09cf9c (patch)
treede1cc8ac3acf60a24cab5d9ad7de8c51f5f40f4e /arch/arm
parent3ce0a99cd4c23762441f0efb18c0e0ef1e9d8bfc (diff)
ARM: dts: OMAP: Move interrupt-parent to the root node to avoid duplication
The interrupt-parent attribute does not have to be added in each node since the fmwk will check for the parent as well to get it. Create an interrupt-parent for OMAP2, OMAP3, AM33xx and remove the attributes from every nodes that were using it. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Vaibhav Hiremath <hvaibhav@ti.com> Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Sebastien Guiriec <s-guiriec@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/am33xx.dtsi17
-rw-r--r--arch/arm/boot/dts/omap2.dtsi1
-rw-r--r--arch/arm/boot/dts/omap2420.dtsi2
-rw-r--r--arch/arm/boot/dts/omap2430.dtsi5
-rw-r--r--arch/arm/boot/dts/omap3.dtsi6
-rw-r--r--arch/arm/boot/dts/omap4.dtsi6
-rw-r--r--arch/arm/boot/dts/omap5.dtsi5
7 files changed, 3 insertions, 39 deletions
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 64c2efe3be92..470926946ed6 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -12,6 +12,7 @@
12 12
13/ { 13/ {
14 compatible = "ti,am33xx"; 14 compatible = "ti,am33xx";
15 interrupt-parent = <&intc>;
15 16
16 aliases { 17 aliases {
17 serial0 = &uart1; 18 serial0 = &uart1;
@@ -94,7 +95,6 @@
94 interrupt-controller; 95 interrupt-controller;
95 #interrupt-cells = <1>; 96 #interrupt-cells = <1>;
96 reg = <0x44e07000 0x1000>; 97 reg = <0x44e07000 0x1000>;
97 interrupt-parent = <&intc>;
98 interrupts = <96>; 98 interrupts = <96>;
99 }; 99 };
100 100
@@ -106,7 +106,6 @@
106 interrupt-controller; 106 interrupt-controller;
107 #interrupt-cells = <1>; 107 #interrupt-cells = <1>;
108 reg = <0x4804c000 0x1000>; 108 reg = <0x4804c000 0x1000>;
109 interrupt-parent = <&intc>;
110 interrupts = <98>; 109 interrupts = <98>;
111 }; 110 };
112 111
@@ -118,7 +117,6 @@
118 interrupt-controller; 117 interrupt-controller;
119 #interrupt-cells = <1>; 118 #interrupt-cells = <1>;
120 reg = <0x481ac000 0x1000>; 119 reg = <0x481ac000 0x1000>;
121 interrupt-parent = <&intc>;
122 interrupts = <32>; 120 interrupts = <32>;
123 }; 121 };
124 122
@@ -130,7 +128,6 @@
130 interrupt-controller; 128 interrupt-controller;
131 #interrupt-cells = <1>; 129 #interrupt-cells = <1>;
132 reg = <0x481ae000 0x1000>; 130 reg = <0x481ae000 0x1000>;
133 interrupt-parent = <&intc>;
134 interrupts = <62>; 131 interrupts = <62>;
135 }; 132 };
136 133
@@ -139,7 +136,6 @@
139 ti,hwmods = "uart1"; 136 ti,hwmods = "uart1";
140 clock-frequency = <48000000>; 137 clock-frequency = <48000000>;
141 reg = <0x44e09000 0x2000>; 138 reg = <0x44e09000 0x2000>;
142 interrupt-parent = <&intc>;
143 interrupts = <72>; 139 interrupts = <72>;
144 status = "disabled"; 140 status = "disabled";
145 }; 141 };
@@ -149,7 +145,6 @@
149 ti,hwmods = "uart2"; 145 ti,hwmods = "uart2";
150 clock-frequency = <48000000>; 146 clock-frequency = <48000000>;
151 reg = <0x48022000 0x2000>; 147 reg = <0x48022000 0x2000>;
152 interrupt-parent = <&intc>;
153 interrupts = <73>; 148 interrupts = <73>;
154 status = "disabled"; 149 status = "disabled";
155 }; 150 };
@@ -159,7 +154,6 @@
159 ti,hwmods = "uart3"; 154 ti,hwmods = "uart3";
160 clock-frequency = <48000000>; 155 clock-frequency = <48000000>;
161 reg = <0x48024000 0x2000>; 156 reg = <0x48024000 0x2000>;
162 interrupt-parent = <&intc>;
163 interrupts = <74>; 157 interrupts = <74>;
164 status = "disabled"; 158 status = "disabled";
165 }; 159 };
@@ -169,7 +163,6 @@
169 ti,hwmods = "uart4"; 163 ti,hwmods = "uart4";
170 clock-frequency = <48000000>; 164 clock-frequency = <48000000>;
171 reg = <0x481a6000 0x2000>; 165 reg = <0x481a6000 0x2000>;
172 interrupt-parent = <&intc>;
173 interrupts = <44>; 166 interrupts = <44>;
174 status = "disabled"; 167 status = "disabled";
175 }; 168 };
@@ -179,7 +172,6 @@
179 ti,hwmods = "uart5"; 172 ti,hwmods = "uart5";
180 clock-frequency = <48000000>; 173 clock-frequency = <48000000>;
181 reg = <0x481a8000 0x2000>; 174 reg = <0x481a8000 0x2000>;
182 interrupt-parent = <&intc>;
183 interrupts = <45>; 175 interrupts = <45>;
184 status = "disabled"; 176 status = "disabled";
185 }; 177 };
@@ -189,7 +181,6 @@
189 ti,hwmods = "uart6"; 181 ti,hwmods = "uart6";
190 clock-frequency = <48000000>; 182 clock-frequency = <48000000>;
191 reg = <0x481aa000 0x2000>; 183 reg = <0x481aa000 0x2000>;
192 interrupt-parent = <&intc>;
193 interrupts = <46>; 184 interrupts = <46>;
194 status = "disabled"; 185 status = "disabled";
195 }; 186 };
@@ -200,7 +191,6 @@
200 #size-cells = <0>; 191 #size-cells = <0>;
201 ti,hwmods = "i2c1"; 192 ti,hwmods = "i2c1";
202 reg = <0x44e0b000 0x1000>; 193 reg = <0x44e0b000 0x1000>;
203 interrupt-parent = <&intc>;
204 interrupts = <70>; 194 interrupts = <70>;
205 status = "disabled"; 195 status = "disabled";
206 }; 196 };
@@ -211,7 +201,6 @@
211 #size-cells = <0>; 201 #size-cells = <0>;
212 ti,hwmods = "i2c2"; 202 ti,hwmods = "i2c2";
213 reg = <0x4802a000 0x1000>; 203 reg = <0x4802a000 0x1000>;
214 interrupt-parent = <&intc>;
215 interrupts = <71>; 204 interrupts = <71>;
216 status = "disabled"; 205 status = "disabled";
217 }; 206 };
@@ -222,7 +211,6 @@
222 #size-cells = <0>; 211 #size-cells = <0>;
223 ti,hwmods = "i2c3"; 212 ti,hwmods = "i2c3";
224 reg = <0x4819c000 0x1000>; 213 reg = <0x4819c000 0x1000>;
225 interrupt-parent = <&intc>;
226 interrupts = <30>; 214 interrupts = <30>;
227 status = "disabled"; 215 status = "disabled";
228 }; 216 };
@@ -231,7 +219,6 @@
231 compatible = "ti,omap3-wdt"; 219 compatible = "ti,omap3-wdt";
232 ti,hwmods = "wd_timer2"; 220 ti,hwmods = "wd_timer2";
233 reg = <0x44e35000 0x1000>; 221 reg = <0x44e35000 0x1000>;
234 interrupt-parent = <&intc>;
235 interrupts = <91>; 222 interrupts = <91>;
236 }; 223 };
237 224
@@ -240,7 +227,6 @@
240 ti,hwmods = "d_can0"; 227 ti,hwmods = "d_can0";
241 reg = <0x481cc000 0x2000>; 228 reg = <0x481cc000 0x2000>;
242 interrupts = <52>; 229 interrupts = <52>;
243 interrupt-parent = <&intc>;
244 status = "disabled"; 230 status = "disabled";
245 }; 231 };
246 232
@@ -249,7 +235,6 @@
249 ti,hwmods = "d_can1"; 235 ti,hwmods = "d_can1";
250 reg = <0x481d0000 0x2000>; 236 reg = <0x481d0000 0x2000>;
251 interrupts = <55>; 237 interrupts = <55>;
252 interrupt-parent = <&intc>;
253 status = "disabled"; 238 status = "disabled";
254 }; 239 };
255 }; 240 };
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 581cb081cb0f..f366482216c0 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -12,6 +12,7 @@
12 12
13/ { 13/ {
14 compatible = "ti,omap2430", "ti,omap2420", "ti,omap2"; 14 compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
15 interrupt-parent = <&intc>;
15 16
16 aliases { 17 aliases {
17 serial0 = &uart1; 18 serial0 = &uart1;
diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
index bfd76b4a0ddc..4d5ce91416c3 100644
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -30,7 +30,6 @@
30 interrupts = <59>, /* TX interrupt */ 30 interrupts = <59>, /* TX interrupt */
31 <60>; /* RX interrupt */ 31 <60>; /* RX interrupt */
32 interrupt-names = "tx", "rx"; 32 interrupt-names = "tx", "rx";
33 interrupt-parent = <&intc>;
34 ti,hwmods = "mcbsp1"; 33 ti,hwmods = "mcbsp1";
35 }; 34 };
36 35
@@ -41,7 +40,6 @@
41 interrupts = <62>, /* TX interrupt */ 40 interrupts = <62>, /* TX interrupt */
42 <63>; /* RX interrupt */ 41 <63>; /* RX interrupt */
43 interrupt-names = "tx", "rx"; 42 interrupt-names = "tx", "rx";
44 interrupt-parent = <&intc>;
45 ti,hwmods = "mcbsp2"; 43 ti,hwmods = "mcbsp2";
46 }; 44 };
47 }; 45 };
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index 4565d9750f4d..fa845324b642 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -32,7 +32,6 @@
32 <60>, /* RX interrupt */ 32 <60>, /* RX interrupt */
33 <61>; /* RX overflow interrupt */ 33 <61>; /* RX overflow interrupt */
34 interrupt-names = "common", "tx", "rx", "rx_overflow"; 34 interrupt-names = "common", "tx", "rx", "rx_overflow";
35 interrupt-parent = <&intc>;
36 ti,buffer-size = <128>; 35 ti,buffer-size = <128>;
37 ti,hwmods = "mcbsp1"; 36 ti,hwmods = "mcbsp1";
38 }; 37 };
@@ -45,7 +44,6 @@
45 <62>, /* TX interrupt */ 44 <62>, /* TX interrupt */
46 <63>; /* RX interrupt */ 45 <63>; /* RX interrupt */
47 interrupt-names = "common", "tx", "rx"; 46 interrupt-names = "common", "tx", "rx";
48 interrupt-parent = <&intc>;
49 ti,buffer-size = <128>; 47 ti,buffer-size = <128>;
50 ti,hwmods = "mcbsp2"; 48 ti,hwmods = "mcbsp2";
51 }; 49 };
@@ -58,7 +56,6 @@
58 <89>, /* TX interrupt */ 56 <89>, /* TX interrupt */
59 <90>; /* RX interrupt */ 57 <90>; /* RX interrupt */
60 interrupt-names = "common", "tx", "rx"; 58 interrupt-names = "common", "tx", "rx";
61 interrupt-parent = <&intc>;
62 ti,buffer-size = <128>; 59 ti,buffer-size = <128>;
63 ti,hwmods = "mcbsp3"; 60 ti,hwmods = "mcbsp3";
64 }; 61 };
@@ -71,7 +68,6 @@
71 <54>, /* TX interrupt */ 68 <54>, /* TX interrupt */
72 <55>; /* RX interrupt */ 69 <55>; /* RX interrupt */
73 interrupt-names = "common", "tx", "rx"; 70 interrupt-names = "common", "tx", "rx";
74 interrupt-parent = <&intc>;
75 ti,buffer-size = <128>; 71 ti,buffer-size = <128>;
76 ti,hwmods = "mcbsp4"; 72 ti,hwmods = "mcbsp4";
77 }; 73 };
@@ -84,7 +80,6 @@
84 <81>, /* TX interrupt */ 80 <81>, /* TX interrupt */
85 <82>; /* RX interrupt */ 81 <82>; /* RX interrupt */
86 interrupt-names = "common", "tx", "rx"; 82 interrupt-names = "common", "tx", "rx";
87 interrupt-parent = <&intc>;
88 ti,buffer-size = <128>; 83 ti,buffer-size = <128>;
89 ti,hwmods = "mcbsp5"; 84 ti,hwmods = "mcbsp5";
90 }; 85 };
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 696e929d0304..fa155418eaad 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -12,6 +12,7 @@
12 12
13/ { 13/ {
14 compatible = "ti,omap3430", "ti,omap3"; 14 compatible = "ti,omap3430", "ti,omap3";
15 interrupt-parent = <&intc>;
15 16
16 aliases { 17 aliases {
17 serial0 = &uart1; 18 serial0 = &uart1;
@@ -240,7 +241,6 @@
240 <59>, /* TX interrupt */ 241 <59>, /* TX interrupt */
241 <60>; /* RX interrupt */ 242 <60>; /* RX interrupt */
242 interrupt-names = "common", "tx", "rx"; 243 interrupt-names = "common", "tx", "rx";
243 interrupt-parent = <&intc>;
244 ti,buffer-size = <128>; 244 ti,buffer-size = <128>;
245 ti,hwmods = "mcbsp1"; 245 ti,hwmods = "mcbsp1";
246 }; 246 };
@@ -255,7 +255,6 @@
255 <63>, /* RX interrupt */ 255 <63>, /* RX interrupt */
256 <4>; /* Sidetone */ 256 <4>; /* Sidetone */
257 interrupt-names = "common", "tx", "rx", "sidetone"; 257 interrupt-names = "common", "tx", "rx", "sidetone";
258 interrupt-parent = <&intc>;
259 ti,buffer-size = <1280>; 258 ti,buffer-size = <1280>;
260 ti,hwmods = "mcbsp2", "mcbsp2_sidetone"; 259 ti,hwmods = "mcbsp2", "mcbsp2_sidetone";
261 }; 260 };
@@ -270,7 +269,6 @@
270 <90>, /* RX interrupt */ 269 <90>, /* RX interrupt */
271 <5>; /* Sidetone */ 270 <5>; /* Sidetone */
272 interrupt-names = "common", "tx", "rx", "sidetone"; 271 interrupt-names = "common", "tx", "rx", "sidetone";
273 interrupt-parent = <&intc>;
274 ti,buffer-size = <128>; 272 ti,buffer-size = <128>;
275 ti,hwmods = "mcbsp3", "mcbsp3_sidetone"; 273 ti,hwmods = "mcbsp3", "mcbsp3_sidetone";
276 }; 274 };
@@ -283,7 +281,6 @@
283 <54>, /* TX interrupt */ 281 <54>, /* TX interrupt */
284 <55>; /* RX interrupt */ 282 <55>; /* RX interrupt */
285 interrupt-names = "common", "tx", "rx"; 283 interrupt-names = "common", "tx", "rx";
286 interrupt-parent = <&intc>;
287 ti,buffer-size = <128>; 284 ti,buffer-size = <128>;
288 ti,hwmods = "mcbsp4"; 285 ti,hwmods = "mcbsp4";
289 }; 286 };
@@ -296,7 +293,6 @@
296 <81>, /* TX interrupt */ 293 <81>, /* TX interrupt */
297 <82>; /* RX interrupt */ 294 <82>; /* RX interrupt */
298 interrupt-names = "common", "tx", "rx"; 295 interrupt-names = "common", "tx", "rx";
299 interrupt-parent = <&intc>;
300 ti,buffer-size = <128>; 296 ti,buffer-size = <128>;
301 ti,hwmods = "mcbsp5"; 297 ti,hwmods = "mcbsp5";
302 }; 298 };
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 812461efdea6..2ab6e68ccbf7 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -340,7 +340,6 @@
340 <0x49032000 0x7f>; /* L3 Interconnect */ 340 <0x49032000 0x7f>; /* L3 Interconnect */
341 reg-names = "mpu", "dma"; 341 reg-names = "mpu", "dma";
342 interrupts = <0 112 0x4>; 342 interrupts = <0 112 0x4>;
343 interrupt-parent = <&gic>;
344 ti,hwmods = "mcpdm"; 343 ti,hwmods = "mcpdm";
345 }; 344 };
346 345
@@ -350,7 +349,6 @@
350 <0x4902e000 0x7f>; /* L3 Interconnect */ 349 <0x4902e000 0x7f>; /* L3 Interconnect */
351 reg-names = "mpu", "dma"; 350 reg-names = "mpu", "dma";
352 interrupts = <0 114 0x4>; 351 interrupts = <0 114 0x4>;
353 interrupt-parent = <&gic>;
354 ti,hwmods = "dmic"; 352 ti,hwmods = "dmic";
355 }; 353 };
356 354
@@ -361,7 +359,6 @@
361 reg-names = "mpu", "dma"; 359 reg-names = "mpu", "dma";
362 interrupts = <0 17 0x4>; 360 interrupts = <0 17 0x4>;
363 interrupt-names = "common"; 361 interrupt-names = "common";
364 interrupt-parent = <&gic>;
365 ti,buffer-size = <128>; 362 ti,buffer-size = <128>;
366 ti,hwmods = "mcbsp1"; 363 ti,hwmods = "mcbsp1";
367 }; 364 };
@@ -373,7 +370,6 @@
373 reg-names = "mpu", "dma"; 370 reg-names = "mpu", "dma";
374 interrupts = <0 22 0x4>; 371 interrupts = <0 22 0x4>;
375 interrupt-names = "common"; 372 interrupt-names = "common";
376 interrupt-parent = <&gic>;
377 ti,buffer-size = <128>; 373 ti,buffer-size = <128>;
378 ti,hwmods = "mcbsp2"; 374 ti,hwmods = "mcbsp2";
379 }; 375 };
@@ -385,7 +381,6 @@
385 reg-names = "mpu", "dma"; 381 reg-names = "mpu", "dma";
386 interrupts = <0 23 0x4>; 382 interrupts = <0 23 0x4>;
387 interrupt-names = "common"; 383 interrupt-names = "common";
388 interrupt-parent = <&gic>;
389 ti,buffer-size = <128>; 384 ti,buffer-size = <128>;
390 ti,hwmods = "mcbsp3"; 385 ti,hwmods = "mcbsp3";
391 }; 386 };
@@ -396,7 +391,6 @@
396 reg-names = "mpu"; 391 reg-names = "mpu";
397 interrupts = <0 16 0x4>; 392 interrupts = <0 16 0x4>;
398 interrupt-names = "common"; 393 interrupt-names = "common";
399 interrupt-parent = <&gic>;
400 ti,buffer-size = <128>; 394 ti,buffer-size = <128>;
401 ti,hwmods = "mcbsp4"; 395 ti,hwmods = "mcbsp4";
402 }; 396 };
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 42c78beb4fdc..61a4f2ea7d3c 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -287,7 +287,6 @@
287 <0x49032000 0x7f>; /* L3 Interconnect */ 287 <0x49032000 0x7f>; /* L3 Interconnect */
288 reg-names = "mpu", "dma"; 288 reg-names = "mpu", "dma";
289 interrupts = <0 112 0x4>; 289 interrupts = <0 112 0x4>;
290 interrupt-parent = <&gic>;
291 ti,hwmods = "mcpdm"; 290 ti,hwmods = "mcpdm";
292 }; 291 };
293 292
@@ -297,7 +296,6 @@
297 <0x4902e000 0x7f>; /* L3 Interconnect */ 296 <0x4902e000 0x7f>; /* L3 Interconnect */
298 reg-names = "mpu", "dma"; 297 reg-names = "mpu", "dma";
299 interrupts = <0 114 0x4>; 298 interrupts = <0 114 0x4>;
300 interrupt-parent = <&gic>;
301 ti,hwmods = "dmic"; 299 ti,hwmods = "dmic";
302 }; 300 };
303 301
@@ -308,7 +306,6 @@
308 reg-names = "mpu", "dma"; 306 reg-names = "mpu", "dma";
309 interrupts = <0 17 0x4>; 307 interrupts = <0 17 0x4>;
310 interrupt-names = "common"; 308 interrupt-names = "common";
311 interrupt-parent = <&gic>;
312 ti,buffer-size = <128>; 309 ti,buffer-size = <128>;
313 ti,hwmods = "mcbsp1"; 310 ti,hwmods = "mcbsp1";
314 }; 311 };
@@ -320,7 +317,6 @@
320 reg-names = "mpu", "dma"; 317 reg-names = "mpu", "dma";
321 interrupts = <0 22 0x4>; 318 interrupts = <0 22 0x4>;
322 interrupt-names = "common"; 319 interrupt-names = "common";
323 interrupt-parent = <&gic>;
324 ti,buffer-size = <128>; 320 ti,buffer-size = <128>;
325 ti,hwmods = "mcbsp2"; 321 ti,hwmods = "mcbsp2";
326 }; 322 };
@@ -332,7 +328,6 @@
332 reg-names = "mpu", "dma"; 328 reg-names = "mpu", "dma";
333 interrupts = <0 23 0x4>; 329 interrupts = <0 23 0x4>;
334 interrupt-names = "common"; 330 interrupt-names = "common";
335 interrupt-parent = <&gic>;
336 ti,buffer-size = <128>; 331 ti,buffer-size = <128>;
337 ti,hwmods = "mcbsp3"; 332 ti,hwmods = "mcbsp3";
338 }; 333 };
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-07 13:35:33 -0500