summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-02 20:16:01 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-02 20:16:01 -0800
commit013daec9c19b73ef1e8e427dd7c8acca5766c17e (patch)
treec14c687f40ec22c5f48e23a08e8ae00c2ddfc2f9 /Documentation
parentbf13c9a894162a91c8bb7d9555933e9fc3ff7d0e (diff)
parent0414855fdc4a40da05221fc6062cccbc0c30f169 (diff)
downloadblackbird-op-linux-013daec9c19b73ef1e8e427dd7c8acca5766c17e.tar.gz
blackbird-op-linux-013daec9c19b73ef1e8e427dd7c8acca5766c17e.zip
Merge 3.14-rc5 into tty-next
We want these fixes in here
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt16
1 files changed, 10 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
index 68b83ecc3850..ee9be9961524 100644
--- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
@@ -1,12 +1,16 @@
* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
Required properties:
-- compatible : Should be "fsl,imx31-sdma", "fsl,imx31-to1-sdma",
- "fsl,imx31-to2-sdma", "fsl,imx35-sdma", "fsl,imx35-to1-sdma",
- "fsl,imx35-to2-sdma", "fsl,imx51-sdma", "fsl,imx53-sdma" or
- "fsl,imx6q-sdma". The -to variants should be preferred since they
- allow to determnine the correct ROM script addresses needed for
- the driver to work without additional firmware.
+- compatible : Should be one of
+ "fsl,imx25-sdma"
+ "fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma"
+ "fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma"
+ "fsl,imx51-sdma"
+ "fsl,imx53-sdma"
+ "fsl,imx6q-sdma"
+ The -to variants should be preferred since they allow to determnine the
+ correct ROM script addresses needed for the driver to work without additional
+ firmware.
- reg : Should contain SDMA registers location and length
- interrupts : Should contain SDMA interrupt
- #dma-cells : Must be <3>.
OpenPOWER on IntegriCloud