aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2012-04-26 14:47:59 -0400
committerBenoit Cousson <benoit.cousson@linaro.org>2013-04-08 18:21:05 -0400
commit2c2dc545f16db1fefc524d96e65909d2802a6a89 (patch)
tree68dbab28d16a717dd20861afc32bee39c8aa8a92
parent9b07b47769cb1d4e92600b69137f4ba3b47a2901 (diff)
ARM: dts: OMAP2+: Add SDMA controller bindings and nodes
Add SDMA controller binding for OMAP2+ devices and populate DMA client information for SPI and MMC peripheral on OMAP3+ devices. Please note that OMAP24xx devices do not have SPI and MMC bindings available yet and so DMA client information is not populated. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
Diffstat
-rw-r--r--arch/arm/boot/dts/omap2.dtsi12
-rw-r--r--arch/arm/boot/dts/omap3.dtsi40
-rw-r--r--arch/arm/boot/dts/omap4.dtsi41
-rw-r--r--arch/arm/boot/dts/omap5.dtsi41
4 files changed, 134 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 27f5ea1928cc..84183f053f53 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -54,6 +54,18 @@
54 reg = <0x480FE000 0x1000>; 54 reg = <0x480FE000 0x1000>;
55 }; 55 };
56 56
57 sdma: dma-controller@48056000 {
58 compatible = "ti,omap2430-sdma", "ti,omap2420-sdma";
59 reg = <0x48056000 0x1000>;
60 interrupts = <12>,
61 <13>,
62 <14>,
63 <15>;
64 #dma-cells = <1>;
65 #dma-channels = <32>;
66 #dma-requests = <64>;
67 };
68
57 uart1: serial@4806a000 { 69 uart1: serial@4806a000 {
58 compatible = "ti,omap2-uart"; 70 compatible = "ti,omap2-uart";
59 ti,hwmods = "uart1"; 71 ti,hwmods = "uart1";
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 6c419c0b2840..ab9cc6b836b1 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -81,6 +81,18 @@
81 reg = <0x48200000 0x1000>; 81 reg = <0x48200000 0x1000>;
82 }; 82 };
83 83
84 sdma: dma-controller@48056000 {
85 compatible = "ti,omap3630-sdma", "ti,omap3430-sdma";
86 reg = <0x48056000 0x1000>;
87 interrupts = <12>,
88 <13>,
89 <14>,
90 <15>;
91 #dma-cells = <1>;
92 #dma-channels = <32>;
93 #dma-requests = <96>;
94 };
95
84 omap3_pmx_core: pinmux@48002030 { 96 omap3_pmx_core: pinmux@48002030 {
85 compatible = "ti,omap3-padconf", "pinctrl-single"; 97 compatible = "ti,omap3-padconf", "pinctrl-single";
86 reg = <0x48002030 0x05cc>; 98 reg = <0x48002030 0x05cc>;
@@ -198,6 +210,16 @@
198 #size-cells = <0>; 210 #size-cells = <0>;
199 ti,hwmods = "mcspi1"; 211 ti,hwmods = "mcspi1";
200 ti,spi-num-cs = <4>; 212 ti,spi-num-cs = <4>;
213 dmas = <&sdma 35>,
214 <&sdma 36>,
215 <&sdma 37>,
216 <&sdma 38>,
217 <&sdma 39>,
218 <&sdma 40>,
219 <&sdma 41>,
220 <&sdma 42>;
221 dma-names = "tx0", "rx0", "tx1", "rx1",
222 "tx2", "rx2", "tx3", "rx3";
201 }; 223 };
202 224
203 mcspi2: spi@4809a000 { 225 mcspi2: spi@4809a000 {
@@ -206,6 +228,11 @@
206 #size-cells = <0>; 228 #size-cells = <0>;
207 ti,hwmods = "mcspi2"; 229 ti,hwmods = "mcspi2";
208 ti,spi-num-cs = <2>; 230 ti,spi-num-cs = <2>;
231 dmas = <&sdma 43>,
232 <&sdma 44>,
233 <&sdma 45>,
234 <&sdma 46>;
235 dma-names = "tx0", "rx0", "tx1", "rx1";
209 }; 236 };
210 237
211 mcspi3: spi@480b8000 { 238 mcspi3: spi@480b8000 {
@@ -214,6 +241,11 @@
214 #size-cells = <0>; 241 #size-cells = <0>;
215 ti,hwmods = "mcspi3"; 242 ti,hwmods = "mcspi3";
216 ti,spi-num-cs = <2>; 243 ti,spi-num-cs = <2>;
244 dmas = <&sdma 15>,
245 <&sdma 16>,
246 <&sdma 23>,
247 <&sdma 24>;
248 dma-names = "tx0", "rx0", "tx1", "rx1";
217 }; 249 };
218 250
219 mcspi4: spi@480ba000 { 251 mcspi4: spi@480ba000 {
@@ -222,22 +254,30 @@
222 #size-cells = <0>; 254 #size-cells = <0>;
223 ti,hwmods = "mcspi4"; 255 ti,hwmods = "mcspi4";
224 ti,spi-num-cs = <1>; 256 ti,spi-num-cs = <1>;
257 dmas = <&sdma 70>, <&sdma 71>;
258 dma-names = "tx0", "rx0";
225 }; 259 };
226 260
227 mmc1: mmc@4809c000 { 261 mmc1: mmc@4809c000 {
228 compatible = "ti,omap3-hsmmc"; 262 compatible = "ti,omap3-hsmmc";
229 ti,hwmods = "mmc1"; 263 ti,hwmods = "mmc1";
230 ti,dual-volt; 264 ti,dual-volt;
265 dmas = <&sdma 61>, <&sdma 62>;
266 dma-names = "tx", "rx";
231 }; 267 };
232 268
233 mmc2: mmc@480b4000 { 269 mmc2: mmc@480b4000 {
234 compatible = "ti,omap3-hsmmc"; 270 compatible = "ti,omap3-hsmmc";
235 ti,hwmods = "mmc2"; 271 ti,hwmods = "mmc2";
272 dmas = <&sdma 47>, <&sdma 48>;
273 dma-names = "tx", "rx";
236 }; 274 };
237 275
238 mmc3: mmc@480ad000 { 276 mmc3: mmc@480ad000 {
239 compatible = "ti,omap3-hsmmc"; 277 compatible = "ti,omap3-hsmmc";
240 ti,hwmods = "mmc3"; 278 ti,hwmods = "mmc3";
279 dmas = <&sdma 77>, <&sdma 78>;
280 dma-names = "tx", "rx";
241 }; 281 };
242 282
243 wdt2: wdt@48314000 { 283 wdt2: wdt@48314000 {
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 07831644a01d..e5ac072178e1 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -118,6 +118,18 @@
118 pinctrl-single,function-mask = <0x7fff>; 118 pinctrl-single,function-mask = <0x7fff>;
119 }; 119 };
120 120
121 sdma: dma-controller@4a056000 {
122 compatible = "ti,omap4430-sdma";
123 reg = <0x4a056000 0x1000>;
124 interrupts = <0 12 0x4>,
125 <0 13 0x4>,
126 <0 14 0x4>,
127 <0 15 0x4>;
128 #dma-cells = <1>;
129 #dma-channels = <32>;
130 #dma-requests = <127>;
131 };
132
121 gpio1: gpio@4a310000 { 133 gpio1: gpio@4a310000 {
122 compatible = "ti,omap4-gpio"; 134 compatible = "ti,omap4-gpio";
123 reg = <0x4a310000 0x200>; 135 reg = <0x4a310000 0x200>;
@@ -260,6 +272,16 @@
260 #size-cells = <0>; 272 #size-cells = <0>;
261 ti,hwmods = "mcspi1"; 273 ti,hwmods = "mcspi1";
262 ti,spi-num-cs = <4>; 274 ti,spi-num-cs = <4>;
275 dmas = <&sdma 35>,
276 <&sdma 36>,
277 <&sdma 37>,
278 <&sdma 38>,
279 <&sdma 39>,
280 <&sdma 40>,
281 <&sdma 41>,
282 <&sdma 42>;
283 dma-names = "tx0", "rx0", "tx1", "rx1",
284 "tx2", "rx2", "tx3", "rx3";
263 }; 285 };
264 286
265 mcspi2: spi@4809a000 { 287 mcspi2: spi@4809a000 {
@@ -270,6 +292,11 @@
270 #size-cells = <0>; 292 #size-cells = <0>;
271 ti,hwmods = "mcspi2"; 293 ti,hwmods = "mcspi2";
272 ti,spi-num-cs = <2>; 294 ti,spi-num-cs = <2>;
295 dmas = <&sdma 43>,
296 <&sdma 44>,
297 <&sdma 45>,
298 <&sdma 46>;
299 dma-names = "tx0", "rx0", "tx1", "rx1";
273 }; 300 };
274 301
275 mcspi3: spi@480b8000 { 302 mcspi3: spi@480b8000 {
@@ -280,6 +307,8 @@
280 #size-cells = <0>; 307 #size-cells = <0>;
281 ti,hwmods = "mcspi3"; 308 ti,hwmods = "mcspi3";
282 ti,spi-num-cs = <2>; 309 ti,spi-num-cs = <2>;
310 dmas = <&sdma 15>, <&sdma 16>;
311 dma-names = "tx0", "rx0";
283 }; 312 };
284 313
285 mcspi4: spi@480ba000 { 314 mcspi4: spi@480ba000 {
@@ -290,6 +319,8 @@
290 #size-cells = <0>; 319 #size-cells = <0>;
291 ti,hwmods = "mcspi4"; 320 ti,hwmods = "mcspi4";
292 ti,spi-num-cs = <1>; 321 ti,spi-num-cs = <1>;
322 dmas = <&sdma 70>, <&sdma 71>;
323 dma-names = "tx0", "rx0";
293 }; 324 };
294 325
295 mmc1: mmc@4809c000 { 326 mmc1: mmc@4809c000 {
@@ -299,6 +330,8 @@
299 ti,hwmods = "mmc1"; 330 ti,hwmods = "mmc1";
300 ti,dual-volt; 331 ti,dual-volt;
301 ti,needs-special-reset; 332 ti,needs-special-reset;
333 dmas = <&sdma 61>, <&sdma 62>;
334 dma-names = "tx", "rx";
302 }; 335 };
303 336
304 mmc2: mmc@480b4000 { 337 mmc2: mmc@480b4000 {
@@ -307,6 +340,8 @@
307 interrupts = <0 86 0x4>; 340 interrupts = <0 86 0x4>;
308 ti,hwmods = "mmc2"; 341 ti,hwmods = "mmc2";
309 ti,needs-special-reset; 342 ti,needs-special-reset;
343 dmas = <&sdma 47>, <&sdma 48>;
344 dma-names = "tx", "rx";
310 }; 345 };
311 346
312 mmc3: mmc@480ad000 { 347 mmc3: mmc@480ad000 {
@@ -315,6 +350,8 @@
315 interrupts = <0 94 0x4>; 350 interrupts = <0 94 0x4>;
316 ti,hwmods = "mmc3"; 351 ti,hwmods = "mmc3";
317 ti,needs-special-reset; 352 ti,needs-special-reset;
353 dmas = <&sdma 77>, <&sdma 78>;
354 dma-names = "tx", "rx";
318 }; 355 };
319 356
320 mmc4: mmc@480d1000 { 357 mmc4: mmc@480d1000 {
@@ -323,6 +360,8 @@
323 interrupts = <0 96 0x4>; 360 interrupts = <0 96 0x4>;
324 ti,hwmods = "mmc4"; 361 ti,hwmods = "mmc4";
325 ti,needs-special-reset; 362 ti,needs-special-reset;
363 dmas = <&sdma 57>, <&sdma 58>;
364 dma-names = "tx", "rx";
326 }; 365 };
327 366
328 mmc5: mmc@480d5000 { 367 mmc5: mmc@480d5000 {
@@ -331,6 +370,8 @@
331 interrupts = <0 59 0x4>; 370 interrupts = <0 59 0x4>;
332 ti,hwmods = "mmc5"; 371 ti,hwmods = "mmc5";
333 ti,needs-special-reset; 372 ti,needs-special-reset;
373 dmas = <&sdma 59>, <&sdma 60>;
374 dma-names = "tx", "rx";
334 }; 375 };
335 376
336 wdt2: wdt@4a314000 { 377 wdt2: wdt@4a314000 {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 130fbf283608..f8404998eb77 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -108,6 +108,18 @@
108 <0x48212000 0x1000>; 108 <0x48212000 0x1000>;
109 }; 109 };
110 110
111 sdma: dma-controller@4a056000 {
112 compatible = "ti,omap4430-sdma";
113 reg = <0x4a056000 0x1000>;
114 interrupts = <0 12 0x4>,
115 <0 13 0x4>,
116 <0 14 0x4>,
117 <0 15 0x4>;
118 #dma-cells = <1>;
119 #dma-channels = <32>;
120 #dma-requests = <127>;
121 };
122
111 gpio1: gpio@4ae10000 { 123 gpio1: gpio@4ae10000 {
112 compatible = "ti,omap4-gpio"; 124 compatible = "ti,omap4-gpio";
113 reg = <0x4ae10000 0x200>; 125 reg = <0x4ae10000 0x200>;
@@ -249,6 +261,16 @@
249 #size-cells = <0>; 261 #size-cells = <0>;
250 ti,hwmods = "mcspi1"; 262 ti,hwmods = "mcspi1";
251 ti,spi-num-cs = <4>; 263 ti,spi-num-cs = <4>;
264 dmas = <&sdma 35>,
265 <&sdma 36>,
266 <&sdma 37>,
267 <&sdma 38>,
268 <&sdma 39>,
269 <&sdma 40>,
270 <&sdma 41>,
271 <&sdma 42>;
272 dma-names = "tx0", "rx0", "tx1", "rx1",
273 "tx2", "rx2", "tx3", "rx3";
252 }; 274 };
253 275
254 mcspi2: spi@4809a000 { 276 mcspi2: spi@4809a000 {
@@ -259,6 +281,11 @@
259 #size-cells = <0>; 281 #size-cells = <0>;
260 ti,hwmods = "mcspi2"; 282 ti,hwmods = "mcspi2";
261 ti,spi-num-cs = <2>; 283 ti,spi-num-cs = <2>;
284 dmas = <&sdma 43>,
285 <&sdma 44>,
286 <&sdma 45>,
287 <&sdma 46>;
288 dma-names = "tx0", "rx0", "tx1", "rx1";
262 }; 289 };
263 290
264 mcspi3: spi@480b8000 { 291 mcspi3: spi@480b8000 {
@@ -269,6 +296,8 @@
269 #size-cells = <0>; 296 #size-cells = <0>;
270 ti,hwmods = "mcspi3"; 297 ti,hwmods = "mcspi3";
271 ti,spi-num-cs = <2>; 298 ti,spi-num-cs = <2>;
299 dmas = <&sdma 15>, <&sdma 16>;
300 dma-names = "tx0", "rx0";
272 }; 301 };
273 302
274 mcspi4: spi@480ba000 { 303 mcspi4: spi@480ba000 {
@@ -279,6 +308,8 @@
279 #size-cells = <0>; 308 #size-cells = <0>;
280 ti,hwmods = "mcspi4"; 309 ti,hwmods = "mcspi4";
281 ti,spi-num-cs = <1>; 310 ti,spi-num-cs = <1>;
311 dmas = <&sdma 70>, <&sdma 71>;
312 dma-names = "tx0", "rx0";
282 }; 313 };
283 314
284 uart1: serial@4806a000 { 315 uart1: serial@4806a000 {
@@ -336,6 +367,8 @@
336 ti,hwmods = "mmc1"; 367 ti,hwmods = "mmc1";
337 ti,dual-volt; 368 ti,dual-volt;
338 ti,needs-special-reset; 369 ti,needs-special-reset;
370 dmas = <&sdma 61>, <&sdma 62>;
371 dma-names = "tx", "rx";
339 }; 372 };
340 373
341 mmc2: mmc@480b4000 { 374 mmc2: mmc@480b4000 {
@@ -344,6 +377,8 @@
344 interrupts = <0 86 0x4>; 377 interrupts = <0 86 0x4>;
345 ti,hwmods = "mmc2"; 378 ti,hwmods = "mmc2";
346 ti,needs-special-reset; 379 ti,needs-special-reset;
380 dmas = <&sdma 47>, <&sdma 48>;
381 dma-names = "tx", "rx";
347 }; 382 };
348 383
349 mmc3: mmc@480ad000 { 384 mmc3: mmc@480ad000 {
@@ -352,6 +387,8 @@
352 interrupts = <0 94 0x4>; 387 interrupts = <0 94 0x4>;
353 ti,hwmods = "mmc3"; 388 ti,hwmods = "mmc3";
354 ti,needs-special-reset; 389 ti,needs-special-reset;
390 dmas = <&sdma 77>, <&sdma 78>;
391 dma-names = "tx", "rx";
355 }; 392 };
356 393
357 mmc4: mmc@480d1000 { 394 mmc4: mmc@480d1000 {
@@ -360,6 +397,8 @@
360 interrupts = <0 96 0x4>; 397 interrupts = <0 96 0x4>;
361 ti,hwmods = "mmc4"; 398 ti,hwmods = "mmc4";
362 ti,needs-special-reset; 399 ti,needs-special-reset;
400 dmas = <&sdma 57>, <&sdma 58>;
401 dma-names = "tx", "rx";
363 }; 402 };
364 403
365 mmc5: mmc@480d5000 { 404 mmc5: mmc@480d5000 {
@@ -368,6 +407,8 @@
368 interrupts = <0 59 0x4>; 407 interrupts = <0 59 0x4>;
369 ti,hwmods = "mmc5"; 408 ti,hwmods = "mmc5";
370 ti,needs-special-reset; 409 ti,needs-special-reset;
410 dmas = <&sdma 59>, <&sdma 60>;
411 dma-names = "tx", "rx";
371 }; 412 };
372 413
373 keypad: keypad@4ae1c000 { 414 keypad: keypad@4ae1c000 {
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-19 02:57:33 -0400