diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-02-25 08:56:56 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-04 09:22:43 -0400 |
commit | f30fb03d4d3abe2da86918a92df0964cdf933e82 (patch) | |
tree | 48455ddf715e6f56afdaaee42c58a6f6a1a87a90 /arch/arm/boot/dts/imx23.dtsi | |
parent | d8880a126d96ba0f9e0191826431650c24711d47 (diff) |
ARM: dts: add generic DMA device tree binding for mxs-dma
Add generic DMA device tree binding for mxs-dma. The changes include:
* Add channel interrupts into DMA controller nodes
* Add properties '#dma-cells' and 'dma-channels' for DMA controller nodes
* And properties 'dmas' and 'dma-names' for DMA client nodes
* Update mxs-dma device tree binding doc
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index ad2d79324cd3..73fd7d0887b5 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi | |||
@@ -49,9 +49,15 @@ | |||
49 | reg = <0x80000000 0x2000>; | 49 | reg = <0x80000000 0x2000>; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | dma-apbh@80004000 { | 52 | dma_apbh: dma-apbh@80004000 { |
53 | compatible = "fsl,imx23-dma-apbh"; | 53 | compatible = "fsl,imx23-dma-apbh"; |
54 | reg = <0x80004000 0x2000>; | 54 | reg = <0x80004000 0x2000>; |
55 | interrupts = <0 14 20 0 | ||
56 | 13 13 13 13>; | ||
57 | interrupt-names = "empty", "ssp0", "ssp1", "empty", | ||
58 | "gpmi0", "gpmi1", "gpmi2", "gpmi3"; | ||
59 | #dma-cells = <1>; | ||
60 | dma-channels = <8>; | ||
55 | clocks = <&clks 15>; | 61 | clocks = <&clks 15>; |
56 | }; | 62 | }; |
57 | 63 | ||
@@ -70,6 +76,8 @@ | |||
70 | interrupt-names = "gpmi-dma", "bch"; | 76 | interrupt-names = "gpmi-dma", "bch"; |
71 | clocks = <&clks 34>; | 77 | clocks = <&clks 34>; |
72 | clock-names = "gpmi_io"; | 78 | clock-names = "gpmi_io"; |
79 | dmas = <&dma_apbh 4>; | ||
80 | dma-names = "rx-tx"; | ||
73 | fsl,gpmi-dma-channel = <4>; | 81 | fsl,gpmi-dma-channel = <4>; |
74 | status = "disabled"; | 82 | status = "disabled"; |
75 | }; | 83 | }; |
@@ -78,6 +86,8 @@ | |||
78 | reg = <0x80010000 0x2000>; | 86 | reg = <0x80010000 0x2000>; |
79 | interrupts = <15 14>; | 87 | interrupts = <15 14>; |
80 | clocks = <&clks 33>; | 88 | clocks = <&clks 33>; |
89 | dmas = <&dma_apbh 1>; | ||
90 | dma-names = "rx-tx"; | ||
81 | fsl,ssp-dma-channel = <1>; | 91 | fsl,ssp-dma-channel = <1>; |
82 | status = "disabled"; | 92 | status = "disabled"; |
83 | }; | 93 | }; |
@@ -305,9 +315,19 @@ | |||
305 | status = "disabled"; | 315 | status = "disabled"; |
306 | }; | 316 | }; |
307 | 317 | ||
308 | dma-apbx@80024000 { | 318 | dma_apbx: dma-apbx@80024000 { |
309 | compatible = "fsl,imx23-dma-apbx"; | 319 | compatible = "fsl,imx23-dma-apbx"; |
310 | reg = <0x80024000 0x2000>; | 320 | reg = <0x80024000 0x2000>; |
321 | interrupts = <7 5 9 26 | ||
322 | 19 0 25 23 | ||
323 | 60 58 9 0 | ||
324 | 0 0 0 0>; | ||
325 | interrupt-names = "audio-adc", "audio-dac", "spdif-tx", "i2c", | ||
326 | "saif0", "empty", "auart0-rx", "auart0-tx", | ||
327 | "auart1-rx", "auart1-tx", "saif1", "empty", | ||
328 | "empty", "empty", "empty", "empty"; | ||
329 | #dma-cells = <1>; | ||
330 | dma-channels = <16>; | ||
311 | clocks = <&clks 16>; | 331 | clocks = <&clks 16>; |
312 | }; | 332 | }; |
313 | 333 | ||
@@ -344,6 +364,8 @@ | |||
344 | reg = <0x80034000 0x2000>; | 364 | reg = <0x80034000 0x2000>; |
345 | interrupts = <2 20>; | 365 | interrupts = <2 20>; |
346 | clocks = <&clks 33>; | 366 | clocks = <&clks 33>; |
367 | dmas = <&dma_apbh 2>; | ||
368 | dma-names = "rx-tx"; | ||
347 | fsl,ssp-dma-channel = <2>; | 369 | fsl,ssp-dma-channel = <2>; |
348 | status = "disabled"; | 370 | status = "disabled"; |
349 | }; | 371 | }; |
@@ -369,6 +391,8 @@ | |||
369 | 391 | ||
370 | saif0: saif@80042000 { | 392 | saif0: saif@80042000 { |
371 | reg = <0x80042000 0x2000>; | 393 | reg = <0x80042000 0x2000>; |
394 | dmas = <&dma_apbx 4>; | ||
395 | dma-names = "rx-tx"; | ||
372 | status = "disabled"; | 396 | status = "disabled"; |
373 | }; | 397 | }; |
374 | 398 | ||
@@ -379,16 +403,22 @@ | |||
379 | 403 | ||
380 | saif1: saif@80046000 { | 404 | saif1: saif@80046000 { |
381 | reg = <0x80046000 0x2000>; | 405 | reg = <0x80046000 0x2000>; |
406 | dmas = <&dma_apbx 10>; | ||
407 | dma-names = "rx-tx"; | ||
382 | status = "disabled"; | 408 | status = "disabled"; |
383 | }; | 409 | }; |
384 | 410 | ||
385 | audio-out@80048000 { | 411 | audio-out@80048000 { |
386 | reg = <0x80048000 0x2000>; | 412 | reg = <0x80048000 0x2000>; |
413 | dmas = <&dma_apbx 1>; | ||
414 | dma-names = "tx"; | ||
387 | status = "disabled"; | 415 | status = "disabled"; |
388 | }; | 416 | }; |
389 | 417 | ||
390 | audio-in@8004c000 { | 418 | audio-in@8004c000 { |
391 | reg = <0x8004c000 0x2000>; | 419 | reg = <0x8004c000 0x2000>; |
420 | dmas = <&dma_apbx 0>; | ||
421 | dma-names = "rx"; | ||
392 | status = "disabled"; | 422 | status = "disabled"; |
393 | }; | 423 | }; |
394 | 424 | ||
@@ -401,11 +431,15 @@ | |||
401 | 431 | ||
402 | spdif@80054000 { | 432 | spdif@80054000 { |
403 | reg = <0x80054000 2000>; | 433 | reg = <0x80054000 2000>; |
434 | dmas = <&dma_apbx 2>; | ||
435 | dma-names = "tx"; | ||
404 | status = "disabled"; | 436 | status = "disabled"; |
405 | }; | 437 | }; |
406 | 438 | ||
407 | i2c@80058000 { | 439 | i2c@80058000 { |
408 | reg = <0x80058000 0x2000>; | 440 | reg = <0x80058000 0x2000>; |
441 | dmas = <&dma_apbx 3>; | ||
442 | dma-names = "rx-tx"; | ||
409 | status = "disabled"; | 443 | status = "disabled"; |
410 | }; | 444 | }; |
411 | 445 | ||
@@ -436,6 +470,8 @@ | |||
436 | reg = <0x8006c000 0x2000>; | 470 | reg = <0x8006c000 0x2000>; |
437 | interrupts = <24 25 23>; | 471 | interrupts = <24 25 23>; |
438 | clocks = <&clks 32>; | 472 | clocks = <&clks 32>; |
473 | dmas = <&dma_apbx 6>, <&dma_apbx 7>; | ||
474 | dma-names = "rx", "tx"; | ||
439 | status = "disabled"; | 475 | status = "disabled"; |
440 | }; | 476 | }; |
441 | 477 | ||
@@ -444,6 +480,8 @@ | |||
444 | reg = <0x8006e000 0x2000>; | 480 | reg = <0x8006e000 0x2000>; |
445 | interrupts = <59 60 58>; | 481 | interrupts = <59 60 58>; |
446 | clocks = <&clks 32>; | 482 | clocks = <&clks 32>; |
483 | dmas = <&dma_apbx 8>, <&dma_apbx 9>; | ||
484 | dma-names = "rx", "tx"; | ||
447 | status = "disabled"; | 485 | status = "disabled"; |
448 | }; | 486 | }; |
449 | 487 | ||