diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 08:12:35 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 08:12:35 -0400 |
| commit | 265d9c673d47fcd5812d69dc07104b706285de56 (patch) | |
| tree | ebb686a2ecbf702c4a5cab975cf86fbc10dac5e7 /Documentation/devicetree | |
| parent | 592745e2f8afbaeafcf72645f0a2b0285644e091 (diff) | |
| parent | e5ffa401eacd0e74178e20ba932200fc9fe41c07 (diff) | |
Merge branch 'topic/sh' into for-linus
Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/shdma.txt | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/Documentation/devicetree/bindings/dma/shdma.txt b/Documentation/devicetree/bindings/dma/shdma.txt index c15994aa1939..2a3f3b8946b9 100644 --- a/Documentation/devicetree/bindings/dma/shdma.txt +++ b/Documentation/devicetree/bindings/dma/shdma.txt | |||
| @@ -22,42 +22,51 @@ Optional properties (currently unused): | |||
| 22 | * DMA controller | 22 | * DMA controller |
| 23 | 23 | ||
| 24 | Required properties: | 24 | Required properties: |
| 25 | - compatible: should be "renesas,shdma" | 25 | - compatible: should be of the form "renesas,shdma-<soc>", where <soc> should |
| 26 | be replaced with the desired SoC model, e.g. | ||
| 27 | "renesas,shdma-r8a73a4" for the system DMAC on r8a73a4 SoC | ||
| 26 | 28 | ||
| 27 | Example: | 29 | Example: |
| 28 | dmac: dma-mux0 { | 30 | dmac: dma-multiplexer@0 { |
| 29 | compatible = "renesas,shdma-mux"; | 31 | compatible = "renesas,shdma-mux"; |
| 30 | #dma-cells = <1>; | 32 | #dma-cells = <1>; |
| 31 | dma-channels = <6>; | 33 | dma-channels = <20>; |
| 32 | dma-requests = <256>; | 34 | dma-requests = <256>; |
| 33 | reg = <0 0>; /* Needed for AUXDATA */ | 35 | #address-cells = <2>; |
| 34 | #address-cells = <1>; | 36 | #size-cells = <2>; |
| 35 | #size-cells = <1>; | ||
| 36 | ranges; | 37 | ranges; |
| 37 | 38 | ||
| 38 | dma0: shdma@fe008020 { | 39 | dma0: dma-controller@e6700020 { |
| 39 | compatible = "renesas,shdma"; | 40 | compatible = "renesas,shdma-r8a73a4"; |
| 40 | reg = <0xfe008020 0x270>, | 41 | reg = <0 0xe6700020 0 0x89e0>; |
| 41 | <0xfe009000 0xc>; | ||
| 42 | interrupt-parent = <&gic>; | 42 | interrupt-parent = <&gic>; |
| 43 | interrupts = <0 34 4 | 43 | interrupts = <0 220 4 |
| 44 | 0 28 4 | 44 | 0 200 4 |
| 45 | 0 29 4 | 45 | 0 201 4 |
| 46 | 0 30 4 | 46 | 0 202 4 |
| 47 | 0 31 4 | 47 | 0 203 4 |
| 48 | 0 32 4 | 48 | 0 204 4 |
| 49 | 0 33 4>; | 49 | 0 205 4 |
| 50 | 0 206 4 | ||
| 51 | 0 207 4 | ||
| 52 | 0 208 4 | ||
| 53 | 0 209 4 | ||
| 54 | 0 210 4 | ||
| 55 | 0 211 4 | ||
| 56 | 0 212 4 | ||
| 57 | 0 213 4 | ||
| 58 | 0 214 4 | ||
| 59 | 0 215 4 | ||
| 60 | 0 216 4 | ||
| 61 | 0 217 4 | ||
| 62 | 0 218 4 | ||
| 63 | 0 219 4>; | ||
| 50 | interrupt-names = "error", | 64 | interrupt-names = "error", |
| 51 | "ch0", "ch1", "ch2", "ch3", | 65 | "ch0", "ch1", "ch2", "ch3", |
| 52 | "ch4", "ch5"; | 66 | "ch4", "ch5", "ch6", "ch7", |
| 53 | }; | 67 | "ch8", "ch9", "ch10", "ch11", |
| 54 | 68 | "ch12", "ch13", "ch14", "ch15", | |
| 55 | dma1: shdma@fe018020 { | 69 | "ch16", "ch17", "ch18", "ch19"; |
| 56 | ... | ||
| 57 | }; | ||
| 58 | |||
| 59 | dma2: shdma@fe028020 { | ||
| 60 | ... | ||
| 61 | }; | 70 | }; |
| 62 | }; | 71 | }; |
| 63 | 72 | ||