diff options
author | Benoit Cousson <b-cousson@ti.com> | 2012-10-24 04:47:52 -0400 |
---|---|---|
committer | Benoit Cousson <b-cousson@ti.com> | 2012-10-29 11:56:32 -0400 |
commit | 4c94ac29b5c1f0cef2281df97609f2cbcc09cf9c (patch) | |
tree | de1cc8ac3acf60a24cab5d9ad7de8c51f5f40f4e /arch/arm/boot/dts/am33xx.dtsi | |
parent | 3ce0a99cd4c23762441f0efb18c0e0ef1e9d8bfc (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/boot/dts/am33xx.dtsi')
-rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 17 |
1 files changed, 1 insertions, 16 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 | }; |