diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:23 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 16:20:23 (GMT) |
| commit | c76a507bfeaeaa82f2e306266a0722b1a2d37fde (patch) | |
| tree | e76a7bf1a6ca3cc1a58ab52235f122a31246cc71 /Documentation | |
| parent | ff868b229657d5a2e449df7b1e2cc465ec86991d (diff) | |
| parent | 62477adf5f4ede918a97e648a5173b00bbbb17cc (diff) | |
| download | linux-fsl-qoriq-c76a507bfeaeaa82f2e306266a0722b1a2d37fde.tar.xz | |
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/mxs-saif.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/sound/mxs-saif.txt b/Documentation/devicetree/bindings/sound/mxs-saif.txt index c37ba61..7ba07a1 100644 --- 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>; }; |