Merge tag 'v3.11-rc2' into patchwork

[deliverable/linux.git] / Documentation / devicetree / bindings / sound / mxs-saif.txt

diff --git a/Documentation/devicetree/bindings/sound/mxs-saif.txt b/Documentation/devicetree/bindings/sound/mxs-saif.txt
index c37ba6143d9b338cc9b80b66f1253f1939af9d2b..7ba07a118e370deb7ac43e72fb18b307aa4a33c5 100644 (file)
--- a/Documentation/devicetree/bindings/sound/mxs-saif.txt
+++ b/Documentation/devicetree/bindings/sound/mxs-saif.txt
@@ -3,8 +3,11 @@
 Required properties:
 - compatible: Should be "fsl,<chip>-saif"
 - reg: Should contain registers location and length
-- interrupts: Should contain ERROR and DMA interrupts
-- fsl,saif-dma-channel: APBX DMA channel for the SAIF
+- interrupts: Should contain ERROR interrupt number
+- dmas: DMA specifier, consisting of a phandle to DMA controller node
+  and SAIF DMA channel ID.
+  Refer to dma.txt and fsl-mxs-dma.txt for details.
+- dma-names: Must be "rx-tx".
 
 Optional properties:
 - fsl,saif-master: phandle to the master SAIF.  It's only required for
@@ -23,14 +26,16 @@ aliases {
 saif0: saif@80042000 {
        compatible = "fsl,imx28-saif";
        reg = <0x80042000 2000>;
-       interrupts = <59 80>;
-       fsl,saif-dma-channel = <4>;
+       interrupts = <59>;
+       dmas = <&dma_apbx 4>;
+       dma-names = "rx-tx";
 };
 
 saif1: saif@80046000 {
        compatible = "fsl,imx28-saif";
        reg = <0x80046000 2000>;
-       interrupts = <58 81>;
-       fsl,saif-dma-channel = <5>;
+       interrupts = <58>;
+       dmas = <&dma_apbx 5>;
+       dma-names = "rx-tx";
        fsl,saif-master = <&saif0>;
 };