diff options
author | Sebastien Guiriec <s-guiriec@ti.com> | 2013-03-11 03:50:21 -0400 |
---|---|---|
committer | Benoit Cousson <benoit.cousson@linaro.org> | 2013-04-08 18:21:10 -0400 |
commit | 4e4ead73bfa8d5bb51b24f36cb4913aa47467156 (patch) | |
tree | f66d373f55698c1f2c67ef1d887b606592732140 | |
parent | 678fac41938299d33b980ad0e7b81438d3d88836 (diff) |
ARM: dts: OMAP2+: Add SDMA Audio IPs bindings
Populate DMA client information for McBSP DMIC and McPDM periperhal on
OMAP2+ devices.
Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/omap2420.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap2430.dtsi | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 17 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 14 |
5 files changed, 67 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi index eee902f3eaa5..455b239b8884 100644 --- a/arch/arm/boot/dts/omap2420.dtsi +++ b/arch/arm/boot/dts/omap2420.dtsi | |||
@@ -92,6 +92,9 @@ | |||
92 | <60>; /* RX interrupt */ | 92 | <60>; /* RX interrupt */ |
93 | interrupt-names = "tx", "rx"; | 93 | interrupt-names = "tx", "rx"; |
94 | ti,hwmods = "mcbsp1"; | 94 | ti,hwmods = "mcbsp1"; |
95 | dmas = <&sdma 31>, | ||
96 | <&sdma 32>; | ||
97 | dma-names = "tx", "rx"; | ||
95 | }; | 98 | }; |
96 | 99 | ||
97 | mcbsp2: mcbsp@48076000 { | 100 | mcbsp2: mcbsp@48076000 { |
@@ -102,6 +105,9 @@ | |||
102 | <63>; /* RX interrupt */ | 105 | <63>; /* RX interrupt */ |
103 | interrupt-names = "tx", "rx"; | 106 | interrupt-names = "tx", "rx"; |
104 | ti,hwmods = "mcbsp2"; | 107 | ti,hwmods = "mcbsp2"; |
108 | dmas = <&sdma 33>, | ||
109 | <&sdma 34>; | ||
110 | dma-names = "tx", "rx"; | ||
105 | }; | 111 | }; |
106 | 112 | ||
107 | timer1: timer@48028000 { | 113 | timer1: timer@48028000 { |
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi index fb74382874bd..477b120243ca 100644 --- a/arch/arm/boot/dts/omap2430.dtsi +++ b/arch/arm/boot/dts/omap2430.dtsi | |||
@@ -106,6 +106,9 @@ | |||
106 | interrupt-names = "common", "tx", "rx", "rx_overflow"; | 106 | interrupt-names = "common", "tx", "rx", "rx_overflow"; |
107 | ti,buffer-size = <128>; | 107 | ti,buffer-size = <128>; |
108 | ti,hwmods = "mcbsp1"; | 108 | ti,hwmods = "mcbsp1"; |
109 | dmas = <&sdma 31>, | ||
110 | <&sdma 32>; | ||
111 | dma-names = "tx", "rx"; | ||
109 | }; | 112 | }; |
110 | 113 | ||
111 | mcbsp2: mcbsp@48076000 { | 114 | mcbsp2: mcbsp@48076000 { |
@@ -118,6 +121,9 @@ | |||
118 | interrupt-names = "common", "tx", "rx"; | 121 | interrupt-names = "common", "tx", "rx"; |
119 | ti,buffer-size = <128>; | 122 | ti,buffer-size = <128>; |
120 | ti,hwmods = "mcbsp2"; | 123 | ti,hwmods = "mcbsp2"; |
124 | dmas = <&sdma 33>, | ||
125 | <&sdma 34>; | ||
126 | dma-names = "tx", "rx"; | ||
121 | }; | 127 | }; |
122 | 128 | ||
123 | mcbsp3: mcbsp@4808c000 { | 129 | mcbsp3: mcbsp@4808c000 { |
@@ -130,6 +136,9 @@ | |||
130 | interrupt-names = "common", "tx", "rx"; | 136 | interrupt-names = "common", "tx", "rx"; |
131 | ti,buffer-size = <128>; | 137 | ti,buffer-size = <128>; |
132 | ti,hwmods = "mcbsp3"; | 138 | ti,hwmods = "mcbsp3"; |
139 | dmas = <&sdma 17>, | ||
140 | <&sdma 18>; | ||
141 | dma-names = "tx", "rx"; | ||
133 | }; | 142 | }; |
134 | 143 | ||
135 | mcbsp4: mcbsp@4808e000 { | 144 | mcbsp4: mcbsp@4808e000 { |
@@ -142,6 +151,9 @@ | |||
142 | interrupt-names = "common", "tx", "rx"; | 151 | interrupt-names = "common", "tx", "rx"; |
143 | ti,buffer-size = <128>; | 152 | ti,buffer-size = <128>; |
144 | ti,hwmods = "mcbsp4"; | 153 | ti,hwmods = "mcbsp4"; |
154 | dmas = <&sdma 19>, | ||
155 | <&sdma 20>; | ||
156 | dma-names = "tx", "rx"; | ||
145 | }; | 157 | }; |
146 | 158 | ||
147 | mcbsp5: mcbsp@48096000 { | 159 | mcbsp5: mcbsp@48096000 { |
@@ -154,6 +166,9 @@ | |||
154 | interrupt-names = "common", "tx", "rx"; | 166 | interrupt-names = "common", "tx", "rx"; |
155 | ti,buffer-size = <128>; | 167 | ti,buffer-size = <128>; |
156 | ti,hwmods = "mcbsp5"; | 168 | ti,hwmods = "mcbsp5"; |
169 | dmas = <&sdma 21>, | ||
170 | <&sdma 22>; | ||
171 | dma-names = "tx", "rx"; | ||
157 | }; | 172 | }; |
158 | 173 | ||
159 | timer1: timer@49018000 { | 174 | timer1: timer@49018000 { |
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 534cfe3c07bd..7146e9480645 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -307,6 +307,9 @@ | |||
307 | interrupt-names = "common", "tx", "rx"; | 307 | interrupt-names = "common", "tx", "rx"; |
308 | ti,buffer-size = <128>; | 308 | ti,buffer-size = <128>; |
309 | ti,hwmods = "mcbsp1"; | 309 | ti,hwmods = "mcbsp1"; |
310 | dmas = <&sdma 31>, | ||
311 | <&sdma 32>; | ||
312 | dma-names = "tx", "rx"; | ||
310 | }; | 313 | }; |
311 | 314 | ||
312 | mcbsp2: mcbsp@49022000 { | 315 | mcbsp2: mcbsp@49022000 { |
@@ -321,6 +324,9 @@ | |||
321 | interrupt-names = "common", "tx", "rx", "sidetone"; | 324 | interrupt-names = "common", "tx", "rx", "sidetone"; |
322 | ti,buffer-size = <1280>; | 325 | ti,buffer-size = <1280>; |
323 | ti,hwmods = "mcbsp2", "mcbsp2_sidetone"; | 326 | ti,hwmods = "mcbsp2", "mcbsp2_sidetone"; |
327 | dmas = <&sdma 33>, | ||
328 | <&sdma 34>; | ||
329 | dma-names = "tx", "rx"; | ||
324 | }; | 330 | }; |
325 | 331 | ||
326 | mcbsp3: mcbsp@49024000 { | 332 | mcbsp3: mcbsp@49024000 { |
@@ -335,6 +341,9 @@ | |||
335 | interrupt-names = "common", "tx", "rx", "sidetone"; | 341 | interrupt-names = "common", "tx", "rx", "sidetone"; |
336 | ti,buffer-size = <128>; | 342 | ti,buffer-size = <128>; |
337 | ti,hwmods = "mcbsp3", "mcbsp3_sidetone"; | 343 | ti,hwmods = "mcbsp3", "mcbsp3_sidetone"; |
344 | dmas = <&sdma 17>, | ||
345 | <&sdma 18>; | ||
346 | dma-names = "tx", "rx"; | ||
338 | }; | 347 | }; |
339 | 348 | ||
340 | mcbsp4: mcbsp@49026000 { | 349 | mcbsp4: mcbsp@49026000 { |
@@ -347,6 +356,9 @@ | |||
347 | interrupt-names = "common", "tx", "rx"; | 356 | interrupt-names = "common", "tx", "rx"; |
348 | ti,buffer-size = <128>; | 357 | ti,buffer-size = <128>; |
349 | ti,hwmods = "mcbsp4"; | 358 | ti,hwmods = "mcbsp4"; |
359 | dmas = <&sdma 19>, | ||
360 | <&sdma 20>; | ||
361 | dma-names = "tx", "rx"; | ||
350 | }; | 362 | }; |
351 | 363 | ||
352 | mcbsp5: mcbsp@48096000 { | 364 | mcbsp5: mcbsp@48096000 { |
@@ -359,6 +371,9 @@ | |||
359 | interrupt-names = "common", "tx", "rx"; | 371 | interrupt-names = "common", "tx", "rx"; |
360 | ti,buffer-size = <128>; | 372 | ti,buffer-size = <128>; |
361 | ti,hwmods = "mcbsp5"; | 373 | ti,hwmods = "mcbsp5"; |
374 | dmas = <&sdma 21>, | ||
375 | <&sdma 22>; | ||
376 | dma-names = "tx", "rx"; | ||
362 | }; | 377 | }; |
363 | 378 | ||
364 | timer1: timer@48318000 { | 379 | timer1: timer@48318000 { |
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index b55f9fa4a697..a32af6e4d94c 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -399,6 +399,9 @@ | |||
399 | reg-names = "mpu", "dma"; | 399 | reg-names = "mpu", "dma"; |
400 | interrupts = <0 112 0x4>; | 400 | interrupts = <0 112 0x4>; |
401 | ti,hwmods = "mcpdm"; | 401 | ti,hwmods = "mcpdm"; |
402 | dmas = <&sdma 65>, | ||
403 | <&sdma 66>; | ||
404 | dma-names = "up_link", "dn_link"; | ||
402 | }; | 405 | }; |
403 | 406 | ||
404 | dmic: dmic@4012e000 { | 407 | dmic: dmic@4012e000 { |
@@ -408,6 +411,8 @@ | |||
408 | reg-names = "mpu", "dma"; | 411 | reg-names = "mpu", "dma"; |
409 | interrupts = <0 114 0x4>; | 412 | interrupts = <0 114 0x4>; |
410 | ti,hwmods = "dmic"; | 413 | ti,hwmods = "dmic"; |
414 | dmas = <&sdma 67>; | ||
415 | dma-names = "up_link"; | ||
411 | }; | 416 | }; |
412 | 417 | ||
413 | mcbsp1: mcbsp@40122000 { | 418 | mcbsp1: mcbsp@40122000 { |
@@ -419,6 +424,9 @@ | |||
419 | interrupt-names = "common"; | 424 | interrupt-names = "common"; |
420 | ti,buffer-size = <128>; | 425 | ti,buffer-size = <128>; |
421 | ti,hwmods = "mcbsp1"; | 426 | ti,hwmods = "mcbsp1"; |
427 | dmas = <&sdma 33>, | ||
428 | <&sdma 34>; | ||
429 | dma-names = "tx", "rx"; | ||
422 | }; | 430 | }; |
423 | 431 | ||
424 | mcbsp2: mcbsp@40124000 { | 432 | mcbsp2: mcbsp@40124000 { |
@@ -430,6 +438,9 @@ | |||
430 | interrupt-names = "common"; | 438 | interrupt-names = "common"; |
431 | ti,buffer-size = <128>; | 439 | ti,buffer-size = <128>; |
432 | ti,hwmods = "mcbsp2"; | 440 | ti,hwmods = "mcbsp2"; |
441 | dmas = <&sdma 17>, | ||
442 | <&sdma 18>; | ||
443 | dma-names = "tx", "rx"; | ||
433 | }; | 444 | }; |
434 | 445 | ||
435 | mcbsp3: mcbsp@40126000 { | 446 | mcbsp3: mcbsp@40126000 { |
@@ -441,6 +452,9 @@ | |||
441 | interrupt-names = "common"; | 452 | interrupt-names = "common"; |
442 | ti,buffer-size = <128>; | 453 | ti,buffer-size = <128>; |
443 | ti,hwmods = "mcbsp3"; | 454 | ti,hwmods = "mcbsp3"; |
455 | dmas = <&sdma 19>, | ||
456 | <&sdma 20>; | ||
457 | dma-names = "tx", "rx"; | ||
444 | }; | 458 | }; |
445 | 459 | ||
446 | mcbsp4: mcbsp@48096000 { | 460 | mcbsp4: mcbsp@48096000 { |
@@ -451,6 +465,9 @@ | |||
451 | interrupt-names = "common"; | 465 | interrupt-names = "common"; |
452 | ti,buffer-size = <128>; | 466 | ti,buffer-size = <128>; |
453 | ti,hwmods = "mcbsp4"; | 467 | ti,hwmods = "mcbsp4"; |
468 | dmas = <&sdma 31>, | ||
469 | <&sdma 32>; | ||
470 | dma-names = "tx", "rx"; | ||
454 | }; | 471 | }; |
455 | 472 | ||
456 | keypad: keypad@4a31c000 { | 473 | keypad: keypad@4a31c000 { |
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index b4d2eb99815f..b760c116e7f7 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
@@ -434,6 +434,9 @@ | |||
434 | reg-names = "mpu", "dma"; | 434 | reg-names = "mpu", "dma"; |
435 | interrupts = <0 112 0x4>; | 435 | interrupts = <0 112 0x4>; |
436 | ti,hwmods = "mcpdm"; | 436 | ti,hwmods = "mcpdm"; |
437 | dmas = <&sdma 65>, | ||
438 | <&sdma 66>; | ||
439 | dma-names = "up_link", "dn_link"; | ||
437 | }; | 440 | }; |
438 | 441 | ||
439 | dmic: dmic@4012e000 { | 442 | dmic: dmic@4012e000 { |
@@ -443,6 +446,8 @@ | |||
443 | reg-names = "mpu", "dma"; | 446 | reg-names = "mpu", "dma"; |
444 | interrupts = <0 114 0x4>; | 447 | interrupts = <0 114 0x4>; |
445 | ti,hwmods = "dmic"; | 448 | ti,hwmods = "dmic"; |
449 | dmas = <&sdma 67>; | ||
450 | dma-names = "up_link"; | ||
446 | }; | 451 | }; |
447 | 452 | ||
448 | mcbsp1: mcbsp@40122000 { | 453 | mcbsp1: mcbsp@40122000 { |
@@ -454,6 +459,9 @@ | |||
454 | interrupt-names = "common"; | 459 | interrupt-names = "common"; |
455 | ti,buffer-size = <128>; | 460 | ti,buffer-size = <128>; |
456 | ti,hwmods = "mcbsp1"; | 461 | ti,hwmods = "mcbsp1"; |
462 | dmas = <&sdma 33>, | ||
463 | <&sdma 34>; | ||
464 | dma-names = "tx", "rx"; | ||
457 | }; | 465 | }; |
458 | 466 | ||
459 | mcbsp2: mcbsp@40124000 { | 467 | mcbsp2: mcbsp@40124000 { |
@@ -465,6 +473,9 @@ | |||
465 | interrupt-names = "common"; | 473 | interrupt-names = "common"; |
466 | ti,buffer-size = <128>; | 474 | ti,buffer-size = <128>; |
467 | ti,hwmods = "mcbsp2"; | 475 | ti,hwmods = "mcbsp2"; |
476 | dmas = <&sdma 17>, | ||
477 | <&sdma 18>; | ||
478 | dma-names = "tx", "rx"; | ||
468 | }; | 479 | }; |
469 | 480 | ||
470 | mcbsp3: mcbsp@40126000 { | 481 | mcbsp3: mcbsp@40126000 { |
@@ -476,6 +487,9 @@ | |||
476 | interrupt-names = "common"; | 487 | interrupt-names = "common"; |
477 | ti,buffer-size = <128>; | 488 | ti,buffer-size = <128>; |
478 | ti,hwmods = "mcbsp3"; | 489 | ti,hwmods = "mcbsp3"; |
490 | dmas = <&sdma 19>, | ||
491 | <&sdma 20>; | ||
492 | dma-names = "tx", "rx"; | ||
479 | }; | 493 | }; |
480 | 494 | ||
481 | timer1: timer@4ae18000 { | 495 | timer1: timer@4ae18000 { |