diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 10:14:50 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 10:14:50 +0530 |
| commit | 112db20e8106a28b1c0b6997d614f43483c90ded (patch) | |
| tree | 3b7e080f309f724d97251ca8e192730cb11ab3ef /Documentation/devicetree/bindings/dma | |
| parent | ee5644ce4b391e3e46064756da0d68b07fecc12d (diff) | |
| parent | c39290a1f3caad4a82bbf1bed0e3db7bcc06b54c (diff) | |
| download | op-kernel-dev-112db20e8106a28b1c0b6997d614f43483c90ded.zip op-kernel-dev-112db20e8106a28b1c0b6997d614f43483c90ded.tar.gz | |
Merge branch 'topic/mv_xor' into for-linus
Diffstat (limited to 'Documentation/devicetree/bindings/dma')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/mv-xor.txt | 5 |
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 276ef81..c075f59 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. |
