Merge commit 'origin/master' into next

[deliverable/linux.git] / Documentation / powerpc / dts-bindings / fsl / dma.txt

diff --git a/Documentation/powerpc/dts-bindings/fsl/dma.txt b/Documentation/powerpc/dts-bindings/fsl/dma.txt
index 86826df00e64ea66085c387d7fd68db46211963c..0732cdd05ba1e43b9ff05f336036938de588ad0b 100644 (file)
--- a/Documentation/powerpc/dts-bindings/fsl/dma.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/dma.txt
@@ -20,7 +20,7 @@ Required properties:
         - compatible        : compatible list, contains 2 entries, first is
                         "fsl,CHIP-dma-channel", where CHIP is the processor
                         (mpc8349, mpc8350, etc.) and the second is
-                        "fsl,elo-dma-channel"
+                        "fsl,elo-dma-channel". However, see note below.
         - reg               : <registers mapping for channel>
         - cell-index        : dma channel index starts at 0.
 
@@ -35,30 +35,30 @@ Example:
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
-               reg = <82a8 4>;
-               ranges = <0 8100 1a4>;
+               reg = <0x82a8 4>;
+               ranges = <0 0x8100 0x1a4>;
                interrupt-parent = <&ipic>;
-               interrupts = <47 8>;
+               interrupts = <71 8>;
                cell-index = <0>;
                dma-channel@0 {
                        compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                        cell-index = <0>;
-                       reg = <0 80>;
+                       reg = <0 0x80>;
                };
                dma-channel@80 {
                        compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                        cell-index = <1>;
-                       reg = <80 80>;
+                       reg = <0x80 0x80>;
                };
                dma-channel@100 {
                        compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                        cell-index = <2>;
-                       reg = <100 80>;
+                       reg = <0x100 0x80>;
                };
                dma-channel@180 {
                        compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                        cell-index = <3>;
-                       reg = <180 80>;
+                       reg = <0x180 0x80>;
                };
        };
 
@@ -82,7 +82,7 @@ Required properties:
         - compatible        : compatible list, contains 2 entries, first is
                         "fsl,CHIP-dma-channel", where CHIP is the processor
                         (mpc8540, mpc8560, etc.) and the second is
-                        "fsl,eloplus-dma-channel"
+                        "fsl,eloplus-dma-channel". However, see note below.
         - cell-index        : dma channel index starts at 0.
         - reg               : <registers mapping for channel>
         - interrupts        : <interrupt mapping for DMA channel IRQ>
@@ -93,35 +93,44 @@ Example:
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
-               reg = <21300 4>;
-               ranges = <0 21100 200>;
+               reg = <0x21300 4>;
+               ranges = <0 0x21100 0x200>;
                cell-index = <0>;
                dma-channel@0 {
                        compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-                       reg = <0 80>;
+                       reg = <0 0x80>;
                        cell-index = <0>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <14 2>;
+                       interrupts = <20 2>;
                };
                dma-channel@80 {
                        compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-                       reg = <80 80>;
+                       reg = <0x80 0x80>;
                        cell-index = <1>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <15 2>;
+                       interrupts = <21 2>;
                };
                dma-channel@100 {
                        compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-                       reg = <100 80>;
+                       reg = <0x100 0x80>;
                        cell-index = <2>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <16 2>;
+                       interrupts = <22 2>;
                };
                dma-channel@180 {
                        compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-                       reg = <180 80>;
+                       reg = <0x180 0x80>;
                        cell-index = <3>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <17 2>;
+                       interrupts = <23 2>;
                };
        };
+
+Note on DMA channel compatible properties: The compatible property must say
+"fsl,elo-dma-channel" or "fsl,eloplus-dma-channel" to be used by the Elo DMA
+driver (fsldma).  Any DMA channel used by fsldma cannot be used by another
+DMA driver, such as the SSI sound drivers for the MPC8610.  Therefore, any DMA
+channel that should be used for another driver should not use
+"fsl,elo-dma-channel" or "fsl,eloplus-dma-channel".  For the SSI drivers, for
+example, the compatible property should be "fsl,ssi-dma-channel".  See ssi.txt
+for more information.