diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-07-04 06:35:22 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-07-04 06:35:22 +0200 |
| commit | 3edc85023a1e1daf22d8e372c5c4f87dc4a04a71 (patch) | |
| tree | 07e08db60bbddc02a00ff805d61cc0c709323ca2 /Documentation/devicetree | |
| parent | Merge branch 'topic/pl330' into for-linus (diff) | |
| parent | dmaengine: use proper name for the R-Car SoC (diff) | |
| download | linux-3edc85023a1e1daf22d8e372c5c4f87dc4a04a71.tar.xz linux-3edc85023a1e1daf22d8e372c5c4f87dc4a04a71.zip | |
Merge branch 'topic/rcar' into for-linus
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 5 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/dma/shdma.txt | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt index 3316a9c2e638..79a204d50234 100644 --- a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt +++ b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt @@ -30,8 +30,9 @@ Required Properties: - interrupts: interrupt specifiers for the DMAC, one for each entry in interrupt-names. -- interrupt-names: one entry per channel, named "ch%u", where %u is the - channel number ranging from zero to the number of channels minus one. +- interrupt-names: one entry for the error interrupt, named "error", plus one + entry per channel, named "ch%u", where %u is the channel number ranging from + zero to the number of channels minus one. - clock-names: "fck" for the functional clock - clocks: a list of phandle + clock-specifier pairs, one for each entry diff --git a/Documentation/devicetree/bindings/dma/shdma.txt b/Documentation/devicetree/bindings/dma/shdma.txt index 2a3f3b8946b9..a91920a49433 100644 --- a/Documentation/devicetree/bindings/dma/shdma.txt +++ b/Documentation/devicetree/bindings/dma/shdma.txt @@ -1,6 +1,6 @@ * SHDMA Device Tree bindings -Sh-/r-mobile and r-car systems often have multiple identical DMA controller +Sh-/r-mobile and R-Car systems often have multiple identical DMA controller instances, capable of serving any of a common set of DMA slave devices, using the same configuration. To describe this topology we require all compatible SHDMA DT nodes to be placed under a DMA multiplexer node. All such compatible |