diff options
author | Benoit Cousson <b-cousson@ti.com> | 2012-09-05 05:38:23 -0400 |
---|---|---|
committer | Benoit Cousson <b-cousson@ti.com> | 2012-09-07 13:23:05 -0400 |
commit | 48420dbcf2168004f8a5ed9f1ecd2d877dc798da (patch) | |
tree | d0582a44c8749c69969e5b81ec9960017956cd22 | |
parent | 4462b31cf416e74e54a37b57de7177cc4d244699 (diff) |
ARM: dts: OMAP4: Add reg and interrupts for every nodes
Thanks to Vaibhav <hvaibhav@ti.com> omap_device fix
(ARM: OMAP: omap_device: Fix up resource names when booted with devicetre),
we can now specify reg and interrupts using standard device tree
attributes.
Update the OMAP4 dtsi file with missing reg and interrupts attributes.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 9f851dfe7507..75095e306d77 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -97,6 +97,8 @@ | |||
97 | 97 | ||
98 | gpio1: gpio@4a310000 { | 98 | gpio1: gpio@4a310000 { |
99 | compatible = "ti,omap4-gpio"; | 99 | compatible = "ti,omap4-gpio"; |
100 | reg = <0x4a310000 0x200>; | ||
101 | interrupts = <0 29 0x4>; | ||
100 | ti,hwmods = "gpio1"; | 102 | ti,hwmods = "gpio1"; |
101 | gpio-controller; | 103 | gpio-controller; |
102 | #gpio-cells = <2>; | 104 | #gpio-cells = <2>; |
@@ -106,6 +108,8 @@ | |||
106 | 108 | ||
107 | gpio2: gpio@48055000 { | 109 | gpio2: gpio@48055000 { |
108 | compatible = "ti,omap4-gpio"; | 110 | compatible = "ti,omap4-gpio"; |
111 | reg = <0x48055000 0x200>; | ||
112 | interrupts = <0 30 0x4>; | ||
109 | ti,hwmods = "gpio2"; | 113 | ti,hwmods = "gpio2"; |
110 | gpio-controller; | 114 | gpio-controller; |
111 | #gpio-cells = <2>; | 115 | #gpio-cells = <2>; |
@@ -115,6 +119,8 @@ | |||
115 | 119 | ||
116 | gpio3: gpio@48057000 { | 120 | gpio3: gpio@48057000 { |
117 | compatible = "ti,omap4-gpio"; | 121 | compatible = "ti,omap4-gpio"; |
122 | reg = <0x48057000 0x200>; | ||
123 | interrupts = <0 31 0x4>; | ||
118 | ti,hwmods = "gpio3"; | 124 | ti,hwmods = "gpio3"; |
119 | gpio-controller; | 125 | gpio-controller; |
120 | #gpio-cells = <2>; | 126 | #gpio-cells = <2>; |
@@ -124,6 +130,8 @@ | |||
124 | 130 | ||
125 | gpio4: gpio@48059000 { | 131 | gpio4: gpio@48059000 { |
126 | compatible = "ti,omap4-gpio"; | 132 | compatible = "ti,omap4-gpio"; |
133 | reg = <0x48059000 0x200>; | ||
134 | interrupts = <0 32 0x4>; | ||
127 | ti,hwmods = "gpio4"; | 135 | ti,hwmods = "gpio4"; |
128 | gpio-controller; | 136 | gpio-controller; |
129 | #gpio-cells = <2>; | 137 | #gpio-cells = <2>; |
@@ -133,6 +141,8 @@ | |||
133 | 141 | ||
134 | gpio5: gpio@4805b000 { | 142 | gpio5: gpio@4805b000 { |
135 | compatible = "ti,omap4-gpio"; | 143 | compatible = "ti,omap4-gpio"; |
144 | reg = <0x4805b000 0x200>; | ||
145 | interrupts = <0 33 0x4>; | ||
136 | ti,hwmods = "gpio5"; | 146 | ti,hwmods = "gpio5"; |
137 | gpio-controller; | 147 | gpio-controller; |
138 | #gpio-cells = <2>; | 148 | #gpio-cells = <2>; |
@@ -142,6 +152,8 @@ | |||
142 | 152 | ||
143 | gpio6: gpio@4805d000 { | 153 | gpio6: gpio@4805d000 { |
144 | compatible = "ti,omap4-gpio"; | 154 | compatible = "ti,omap4-gpio"; |
155 | reg = <0x4805d000 0x200>; | ||
156 | interrupts = <0 34 0x4>; | ||
145 | ti,hwmods = "gpio6"; | 157 | ti,hwmods = "gpio6"; |
146 | gpio-controller; | 158 | gpio-controller; |
147 | #gpio-cells = <2>; | 159 | #gpio-cells = <2>; |
@@ -151,30 +163,40 @@ | |||
151 | 163 | ||
152 | uart1: serial@4806a000 { | 164 | uart1: serial@4806a000 { |
153 | compatible = "ti,omap4-uart"; | 165 | compatible = "ti,omap4-uart"; |
166 | reg = <0x4806a000 0x100>; | ||
167 | interrupts = <0 72 0x4>; | ||
154 | ti,hwmods = "uart1"; | 168 | ti,hwmods = "uart1"; |
155 | clock-frequency = <48000000>; | 169 | clock-frequency = <48000000>; |
156 | }; | 170 | }; |
157 | 171 | ||
158 | uart2: serial@4806c000 { | 172 | uart2: serial@4806c000 { |
159 | compatible = "ti,omap4-uart"; | 173 | compatible = "ti,omap4-uart"; |
174 | reg = <0x4806c000 0x100>; | ||
175 | interrupts = <0 73 0x4>; | ||
160 | ti,hwmods = "uart2"; | 176 | ti,hwmods = "uart2"; |
161 | clock-frequency = <48000000>; | 177 | clock-frequency = <48000000>; |
162 | }; | 178 | }; |
163 | 179 | ||
164 | uart3: serial@48020000 { | 180 | uart3: serial@48020000 { |
165 | compatible = "ti,omap4-uart"; | 181 | compatible = "ti,omap4-uart"; |
182 | reg = <0x48020000 0x100>; | ||
183 | interrupts = <0 74 0x4>; | ||
166 | ti,hwmods = "uart3"; | 184 | ti,hwmods = "uart3"; |
167 | clock-frequency = <48000000>; | 185 | clock-frequency = <48000000>; |
168 | }; | 186 | }; |
169 | 187 | ||
170 | uart4: serial@4806e000 { | 188 | uart4: serial@4806e000 { |
171 | compatible = "ti,omap4-uart"; | 189 | compatible = "ti,omap4-uart"; |
190 | reg = <0x4806e000 0x100>; | ||
191 | interrupts = <0 70 0x4>; | ||
172 | ti,hwmods = "uart4"; | 192 | ti,hwmods = "uart4"; |
173 | clock-frequency = <48000000>; | 193 | clock-frequency = <48000000>; |
174 | }; | 194 | }; |
175 | 195 | ||
176 | i2c1: i2c@48070000 { | 196 | i2c1: i2c@48070000 { |
177 | compatible = "ti,omap4-i2c"; | 197 | compatible = "ti,omap4-i2c"; |
198 | reg = <0x48070000 0x100>; | ||
199 | interrupts = <0 56 0x4>; | ||
178 | #address-cells = <1>; | 200 | #address-cells = <1>; |
179 | #size-cells = <0>; | 201 | #size-cells = <0>; |
180 | ti,hwmods = "i2c1"; | 202 | ti,hwmods = "i2c1"; |
@@ -182,6 +204,8 @@ | |||
182 | 204 | ||
183 | i2c2: i2c@48072000 { | 205 | i2c2: i2c@48072000 { |
184 | compatible = "ti,omap4-i2c"; | 206 | compatible = "ti,omap4-i2c"; |
207 | reg = <0x48072000 0x100>; | ||
208 | interrupts = <0 57 0x4>; | ||
185 | #address-cells = <1>; | 209 | #address-cells = <1>; |
186 | #size-cells = <0>; | 210 | #size-cells = <0>; |
187 | ti,hwmods = "i2c2"; | 211 | ti,hwmods = "i2c2"; |
@@ -189,6 +213,8 @@ | |||
189 | 213 | ||
190 | i2c3: i2c@48060000 { | 214 | i2c3: i2c@48060000 { |
191 | compatible = "ti,omap4-i2c"; | 215 | compatible = "ti,omap4-i2c"; |
216 | reg = <0x48060000 0x100>; | ||
217 | interrupts = <0 61 0x4>; | ||
192 | #address-cells = <1>; | 218 | #address-cells = <1>; |
193 | #size-cells = <0>; | 219 | #size-cells = <0>; |
194 | ti,hwmods = "i2c3"; | 220 | ti,hwmods = "i2c3"; |
@@ -196,6 +222,8 @@ | |||
196 | 222 | ||
197 | i2c4: i2c@48350000 { | 223 | i2c4: i2c@48350000 { |
198 | compatible = "ti,omap4-i2c"; | 224 | compatible = "ti,omap4-i2c"; |
225 | reg = <0x48350000 0x100>; | ||
226 | interrupts = <0 62 0x4>; | ||
199 | #address-cells = <1>; | 227 | #address-cells = <1>; |
200 | #size-cells = <0>; | 228 | #size-cells = <0>; |
201 | ti,hwmods = "i2c4"; | 229 | ti,hwmods = "i2c4"; |
@@ -203,6 +231,8 @@ | |||
203 | 231 | ||
204 | mcspi1: spi@48098000 { | 232 | mcspi1: spi@48098000 { |
205 | compatible = "ti,omap4-mcspi"; | 233 | compatible = "ti,omap4-mcspi"; |
234 | reg = <0x48098000 0x200>; | ||
235 | interrupts = <0 65 0x4>; | ||
206 | #address-cells = <1>; | 236 | #address-cells = <1>; |
207 | #size-cells = <0>; | 237 | #size-cells = <0>; |
208 | ti,hwmods = "mcspi1"; | 238 | ti,hwmods = "mcspi1"; |
@@ -211,6 +241,8 @@ | |||
211 | 241 | ||
212 | mcspi2: spi@4809a000 { | 242 | mcspi2: spi@4809a000 { |
213 | compatible = "ti,omap4-mcspi"; | 243 | compatible = "ti,omap4-mcspi"; |
244 | reg = <0x4809a000 0x200>; | ||
245 | interrupts = <0 66 0x4>; | ||
214 | #address-cells = <1>; | 246 | #address-cells = <1>; |
215 | #size-cells = <0>; | 247 | #size-cells = <0>; |
216 | ti,hwmods = "mcspi2"; | 248 | ti,hwmods = "mcspi2"; |
@@ -219,6 +251,8 @@ | |||
219 | 251 | ||
220 | mcspi3: spi@480b8000 { | 252 | mcspi3: spi@480b8000 { |
221 | compatible = "ti,omap4-mcspi"; | 253 | compatible = "ti,omap4-mcspi"; |
254 | reg = <0x480b8000 0x200>; | ||
255 | interrupts = <0 91 0x4>; | ||
222 | #address-cells = <1>; | 256 | #address-cells = <1>; |
223 | #size-cells = <0>; | 257 | #size-cells = <0>; |
224 | ti,hwmods = "mcspi3"; | 258 | ti,hwmods = "mcspi3"; |
@@ -227,6 +261,8 @@ | |||
227 | 261 | ||
228 | mcspi4: spi@480ba000 { | 262 | mcspi4: spi@480ba000 { |
229 | compatible = "ti,omap4-mcspi"; | 263 | compatible = "ti,omap4-mcspi"; |
264 | reg = <0x480ba000 0x200>; | ||
265 | interrupts = <0 48 0x4>; | ||
230 | #address-cells = <1>; | 266 | #address-cells = <1>; |
231 | #size-cells = <0>; | 267 | #size-cells = <0>; |
232 | ti,hwmods = "mcspi4"; | 268 | ti,hwmods = "mcspi4"; |
@@ -235,6 +271,8 @@ | |||
235 | 271 | ||
236 | mmc1: mmc@4809c000 { | 272 | mmc1: mmc@4809c000 { |
237 | compatible = "ti,omap4-hsmmc"; | 273 | compatible = "ti,omap4-hsmmc"; |
274 | reg = <0x4809c000 0x400>; | ||
275 | interrupts = <0 83 0x4>; | ||
238 | ti,hwmods = "mmc1"; | 276 | ti,hwmods = "mmc1"; |
239 | ti,dual-volt; | 277 | ti,dual-volt; |
240 | ti,needs-special-reset; | 278 | ti,needs-special-reset; |
@@ -242,30 +280,40 @@ | |||
242 | 280 | ||
243 | mmc2: mmc@480b4000 { | 281 | mmc2: mmc@480b4000 { |
244 | compatible = "ti,omap4-hsmmc"; | 282 | compatible = "ti,omap4-hsmmc"; |
283 | reg = <0x480b4000 0x400>; | ||
284 | interrupts = <0 86 0x4>; | ||
245 | ti,hwmods = "mmc2"; | 285 | ti,hwmods = "mmc2"; |
246 | ti,needs-special-reset; | 286 | ti,needs-special-reset; |
247 | }; | 287 | }; |
248 | 288 | ||
249 | mmc3: mmc@480ad000 { | 289 | mmc3: mmc@480ad000 { |
250 | compatible = "ti,omap4-hsmmc"; | 290 | compatible = "ti,omap4-hsmmc"; |
291 | reg = <0x480ad000 0x400>; | ||
292 | interrupts = <0 94 0x4>; | ||
251 | ti,hwmods = "mmc3"; | 293 | ti,hwmods = "mmc3"; |
252 | ti,needs-special-reset; | 294 | ti,needs-special-reset; |
253 | }; | 295 | }; |
254 | 296 | ||
255 | mmc4: mmc@480d1000 { | 297 | mmc4: mmc@480d1000 { |
256 | compatible = "ti,omap4-hsmmc"; | 298 | compatible = "ti,omap4-hsmmc"; |
299 | reg = <0x480d1000 0x400>; | ||
300 | interrupts = <0 96 0x4>; | ||
257 | ti,hwmods = "mmc4"; | 301 | ti,hwmods = "mmc4"; |
258 | ti,needs-special-reset; | 302 | ti,needs-special-reset; |
259 | }; | 303 | }; |
260 | 304 | ||
261 | mmc5: mmc@480d5000 { | 305 | mmc5: mmc@480d5000 { |
262 | compatible = "ti,omap4-hsmmc"; | 306 | compatible = "ti,omap4-hsmmc"; |
307 | reg = <0x480d5000 0x400>; | ||
308 | interrupts = <0 59 0x4>; | ||
263 | ti,hwmods = "mmc5"; | 309 | ti,hwmods = "mmc5"; |
264 | ti,needs-special-reset; | 310 | ti,needs-special-reset; |
265 | }; | 311 | }; |
266 | 312 | ||
267 | wdt2: wdt@4a314000 { | 313 | wdt2: wdt@4a314000 { |
268 | compatible = "ti,omap4-wdt", "ti,omap3-wdt"; | 314 | compatible = "ti,omap4-wdt", "ti,omap3-wdt"; |
315 | reg = <0x4a314000 0x80>; | ||
316 | interrupts = <0 80 0x4>; | ||
269 | ti,hwmods = "wd_timer2"; | 317 | ti,hwmods = "wd_timer2"; |
270 | }; | 318 | }; |
271 | 319 | ||
@@ -338,11 +386,16 @@ | |||
338 | 386 | ||
339 | keypad: keypad@4a31c000 { | 387 | keypad: keypad@4a31c000 { |
340 | compatible = "ti,omap4-keypad"; | 388 | compatible = "ti,omap4-keypad"; |
389 | reg = <0x4a31c000 0x80>; | ||
390 | interrupts = <0 120 0x4>; | ||
391 | reg-names = "mpu"; | ||
341 | ti,hwmods = "kbd"; | 392 | ti,hwmods = "kbd"; |
342 | }; | 393 | }; |
343 | 394 | ||
344 | emif1: emif@4c000000 { | 395 | emif1: emif@4c000000 { |
345 | compatible = "ti,emif-4d"; | 396 | compatible = "ti,emif-4d"; |
397 | reg = <0x4c000000 0x100>; | ||
398 | interrupts = <0 110 0x4>; | ||
346 | ti,hwmods = "emif1"; | 399 | ti,hwmods = "emif1"; |
347 | phy-type = <1>; | 400 | phy-type = <1>; |
348 | hw-caps-read-idle-ctrl; | 401 | hw-caps-read-idle-ctrl; |
@@ -352,6 +405,8 @@ | |||
352 | 405 | ||
353 | emif2: emif@4d000000 { | 406 | emif2: emif@4d000000 { |
354 | compatible = "ti,emif-4d"; | 407 | compatible = "ti,emif-4d"; |
408 | reg = <0x4d000000 0x100>; | ||
409 | interrupts = <0 111 0x4>; | ||
355 | ti,hwmods = "emif2"; | 410 | ti,hwmods = "emif2"; |
356 | phy-type = <1>; | 411 | phy-type = <1>; |
357 | hw-caps-read-idle-ctrl; | 412 | hw-caps-read-idle-ctrl; |