summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2019-03-12 12:03:47 +0530
committerVinod Koul <vkoul@kernel.org>2019-03-12 12:03:47 +0530
commit278489c2e19c21a476f80cb9b183afaa773b378f (patch)
tree69ea88e99b6adf354cfec71ee67245de5b319555 /Documentation
parent5c196f5efa48dbde12f9e47f30dbecfada450f45 (diff)
parentbdcb2c5d5ed0f100ae21decd30f0b2556b738b72 (diff)
downloadlinux-278489c2e19c21a476f80cb9b183afaa773b378f.tar.bz2
Merge branch 'topic/dw' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/dma/snps-dma.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt
index db757df7057d..0bedceed1963 100644
--- a/Documentation/devicetree/bindings/dma/snps-dma.txt
+++ b/Documentation/devicetree/bindings/dma/snps-dma.txt
@@ -23,8 +23,6 @@ Deprecated properties:
Optional properties:
-- is_private: The device channels should be marked as private and not for by the
- general purpose DMA channel allocator. False if not passed.
- multi-block: Multi block transfers supported by hardware. Array property with
one cell per channel. 0: not supported, 1 (default): supported.
- snps,dma-protection-control: AHB HPROT[3:1] protection setting.