summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorVinod Koul2016-05-17 06:44:50 +0200
committerVinod Koul2016-05-17 06:44:50 +0200
commit112db20e8106a28b1c0b6997d614f43483c90ded (patch)
tree3b7e080f309f724d97251ca8e192730cb11ab3ef /Documentation/devicetree/bindings
parentMerge branch 'topic/mpc512x' into for-linus (diff)
parentdmaengine: mv_xor: Allow selecting mv_xor for mvebu only compatible SoC (diff)
downloadkernel-qcow2-linux-112db20e8106a28b1c0b6997d614f43483c90ded.tar.gz
kernel-qcow2-linux-112db20e8106a28b1c0b6997d614f43483c90ded.tar.xz
kernel-qcow2-linux-112db20e8106a28b1c0b6997d614f43483c90ded.zip
Merge branch 'topic/mv_xor' into for-linus
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/dma/mv-xor.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/mv-xor.txt b/Documentation/devicetree/bindings/dma/mv-xor.txt
index 276ef815ef32..c075f5988135 100644
--- a/Documentation/devicetree/bindings/dma/mv-xor.txt
+++ b/Documentation/devicetree/bindings/dma/mv-xor.txt
@@ -1,7 +1,10 @@
* Marvell XOR engines
Required properties:
-- compatible: Should be "marvell,orion-xor" or "marvell,armada-380-xor"
+- compatible: Should be one of the following:
+ - "marvell,orion-xor"
+ - "marvell,armada-380-xor"
+ - "marvell,armada-3700-xor".
- reg: Should contain registers location and length (two sets)
the first set is the low registers, the second set the high
registers for the XOR engine.