diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-08-17 17:59:01 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-08-17 17:59:01 +0530 |
| commit | 4d44248239510de89d48f22a4f52bd6f2883ad2f (patch) | |
| tree | 6c5f40b30a1720a297a7e80b5f42cc0464572991 /Documentation | |
| parent | de764fdc9b42756dfde5db23e917587d6f7ebd9f (diff) | |
| parent | 0894aa28aece680a81e28906e2f328084a3d55c3 (diff) | |
Merge branch 'topic/xilinx' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt index a2b8bfaec43c..174af2c45e77 100644 --- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt +++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt @@ -66,6 +66,8 @@ Optional child node properties: Optional child node properties for VDMA: - xlnx,genlock-mode: Tells Genlock synchronization is enabled/disabled in hardware. +- xlnx,enable-vert-flip: Tells vertical flip is + enabled/disabled in hardware(S2MM path). Optional child node properties for AXI DMA: -dma-channels: Number of dma channels in child node. |