diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 05:16:01 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 05:16:01 +0100 |
commit | 013daec9c19b73ef1e8e427dd7c8acca5766c17e (patch) | |
tree | c14c687f40ec22c5f48e23a08e8ae00c2ddfc2f9 /Documentation | |
parent | serial: sh-sci: Add missing call to uart_remove_one_port() in failure path (diff) | |
parent | Linux 3.14-rc5 (diff) | |
download | linux-013daec9c19b73ef1e8e427dd7c8acca5766c17e.tar.xz 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.txt | 16 |
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>. |