summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-11 10:11:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-11 10:11:29 -0700
commit1497e84a49dcfa36e478dbab8ad2212ebee9ba59 (patch)
tree97e67c4a2cb8df5b7219c70976ef266586345970 /Documentation
parent8b02c5ef75814b690ad8eb271cca2559ce7d19b8 (diff)
parentf498e064e0b97df910163533e78e2704ba0a9570 (diff)
downloadlinux-1497e84a49dcfa36e478dbab8ad2212ebee9ba59.tar.gz
linux-1497e84a49dcfa36e478dbab8ad2212ebee9ba59.tar.bz2
linux-1497e84a49dcfa36e478dbab8ad2212ebee9ba59.zip
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: "Two minor fixes. First one from Kuninori clarifying dmas bindings and second from Lars for fixing dma descriptor completion in non cyclic case" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: jz4740: Fix non-cyclic descriptor completion dt/bindings: rcar-audmapp: tidyup dmas explanation
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/dma/rcar-audmapp.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
index 9f1d750d76de..61bca509d7b9 100644
--- a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
+++ b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
@@ -16,9 +16,9 @@ Example:
* DMA client
Required properties:
-- dmas: a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
- where SRS/DRS values are fixed handles, specified in the SoC
- manual as the value that would be written into the PDMACHCR.
+- dmas: a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.
+ where SRS/DRS are specified in the SoC manual.
+ It will be written into PDMACHCR as high 16-bit parts.
- dma-names: a list of DMA channel names, one per "dmas" entry
Example: