summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2019-03-12 07:35:47 +0100
committerVinod Koul <vkoul@kernel.org>2019-03-12 07:35:47 +0100
commitfeb59d77a46d5df93864471ca926b6701479091b (patch)
treedb58124e49685323e9ccd52d50019cdaf06061b8 /Documentation/devicetree
parentMerge branch 'topic/tegra' into for-linus (diff)
parentdmaengine: xilinx_dma: remove set but not used variable 'tail_segment' (diff)
downloadlinux-feb59d77a46d5df93864471ca926b6701479091b.tar.xz
linux-feb59d77a46d5df93864471ca926b6701479091b.zip
Merge branch 'topic/xilinx' into for-linus
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r--Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
index 174af2c45e77..93b6d961dd4f 100644
--- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
+++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
@@ -37,10 +37,11 @@ Required properties:
Required properties for VDMA:
- xlnx,num-fstores: Should be the number of framebuffers as configured in h/w.
-Optional properties:
-- xlnx,include-sg: Tells configured for Scatter-mode in
- the hardware.
Optional properties for AXI DMA:
+- xlnx,sg-length-width: Should be set to the width in bits of the length
+ register as configured in h/w. Takes values {8...26}. If the property
+ is missing or invalid then the default value 23 is used. This is the
+ maximum value that is supported by all IP versions.
- xlnx,mcdma: Tells whether configured for multi-channel mode in the hardware.
Optional properties for VDMA:
- xlnx,flush-fsync: Tells which channel to Flush on Frame sync.