summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-11-06 15:11:05 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-11-06 15:11:05 +1100
commit37d9a39803fe0ba75b23eb5b3361eacf5bbb5df9 (patch)
treec982e9355ab395728735fc8012c66cc22eeb901f /Documentation
parent6be75c36c19892c3458cd6fa7d91776e56d6f898 (diff)
parent6b327a028f09a054ac09ef854a90b6e49027f39a (diff)
Merge remote-tracking branch 'slave-dma/next'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/dma/atmel-dma.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/atmel-dma.txt b/Documentation/devicetree/bindings/dma/atmel-dma.txt
index e1f343c7a34b..f69bcf5a6343 100644
--- a/Documentation/devicetree/bindings/dma/atmel-dma.txt
+++ b/Documentation/devicetree/bindings/dma/atmel-dma.txt
@@ -28,7 +28,7 @@ The three cells in order are:
dependent:
- bit 7-0: peripheral identifier for the hardware handshaking interface. The
identifier can be different for tx and rx.
- - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP.
+ - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 2 for ASAP.
Example: