linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 11/11] ASoC: fsl: Update fsl-ssi binding doc
Date: Sun,  7 Apr 2013 21:25:21 +0200	[thread overview]
Message-ID: <1365362721-3731-12-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1365362721-3731-1-git-send-email-mpa@pengutronix.de>

Update the fsl-ssi bindings. DMA is no required property anymore and
uses the generic DMA bindings. imx-fiq is a new alternative to DMA

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 Documentation/devicetree/bindings/sound/fsl,ssi.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/fsl,ssi.txt b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
index 5ff76c9..46282ec 100644
--- a/Documentation/devicetree/bindings/sound/fsl,ssi.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
@@ -24,12 +24,6 @@ Required properties:
                     "rj-master" - r.j., SSI is clock master
                     "ac97-slave" - AC97 mode, SSI is clock slave
                     "ac97-master" - AC97 mode, SSI is clock master
-- fsl,playback-dma: Phandle to a node for the DMA channel to use for
-                    playback of audio.  This is typically dictated by SOC
-                    design.  See the notes below.
-- fsl,capture-dma:  Phandle to a node for the DMA channel to use for
-                    capture (recording) of audio.  This is typically dictated
-                    by SOC design.  See the notes below.
 - fsl,fifo-depth:   The number of elements in the transmit and receive FIFOs.
                     This number is the maximum allowed value for SFCSR[TFWM0].
 - fsl,ssi-asynchronous:
@@ -43,10 +37,17 @@ Required properties:
                     together.  This would still allow different sample sizes,
                     but not different sample rates.
 
+Note that either dmas, dma-names or fsl,imx-fiq are required.
+
 Optional properties:
 - codec-handle:     Phandle to a 'codec' node that defines an audio
                     codec connected to this SSI.  This node is typically
                     a child of an I2C or other control node.
+- dmas:		    Generic dma devicetree binding as described in
+		    Documentation/devicetree/bindings/dma/dma.txt.
+- dma-names:	    Two dmas have to be defined, "tx" and "rx", if fsl,imx-fiq
+		    is not defined.
+- fsl,imx-fiq:	    Bool property. Use imx-pcm-fiq instead of imx-pcm-dma.
 
 Child 'codec' node required properties:
 - compatible:       Compatible list, contains the name of the codec
-- 
1.8.1.5

  parent reply	other threads:[~2013-04-07 19:25 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-07 19:25 [PATCH v2 00/11] ASoC: fsl-ssi: ac97-slave support Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 01/11] ASoC: phycore-ac97: Add DT support Markus Pargmann
2013-04-08  2:52   ` Timur Tabi
2013-04-10 11:03     ` Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 02/11] ASoC: imx-pcm-dma: Add support for DMA init by device node Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 03/11] ASoC: imx-pcm-fiq: Introduce pcm-fiq-params Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 04/11] ASoC: fsl-ssi: Add SACNT definitions Markus Pargmann
2013-04-08  0:13   ` Timur Tabi
2013-04-07 19:25 ` [PATCH v2 05/11] ASoC: fsl-ssi: Add support for imx-pcm-fiq Markus Pargmann
2013-04-08  0:18   ` Timur Tabi
2013-04-14 10:38     ` Markus Pargmann
2013-04-14 13:37       ` Timur Tabi
2013-04-14 14:10         ` Markus Pargmann
2013-04-14 14:53           ` Timur Tabi
2013-04-14 15:20             ` Markus Pargmann
2013-04-14 15:25               ` Timur Tabi
2013-04-14 15:44                 ` Markus Pargmann
2013-04-15 16:15                 ` Mark Brown
2013-04-07 19:25 ` [PATCH v2 06/11] ASoC: fsl-ssi: Setup generic imx dma params Markus Pargmann
2013-04-08  2:50   ` Timur Tabi
2013-04-13 13:52     ` Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 07/11] ARM: imx: Export ac97 reset functions Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 08/11] ASoC: fsl-ssi: imx ac97 support Markus Pargmann
2013-04-08  2:49   ` Timur Tabi
2013-04-10 11:33     ` Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 09/11] ASoC: fsl: Kconfig: Use fsl-ssi for phycore-ac97 Markus Pargmann
2013-04-07 19:25 ` [PATCH v2 10/11] ASoC: fsl: Move fsl-ssi binding doc to sound/ Markus Pargmann
2013-04-08  0:20   ` Timur Tabi
2013-04-07 19:25 ` Markus Pargmann [this message]
2013-04-07 19:39 ` [alsa-devel] [PATCH v2 00/11] ASoC: fsl-ssi: ac97-slave support Lars-Peter Clausen
2013-04-07 20:08   ` Markus Pargmann
2013-04-07 20:35     ` Lars-Peter Clausen
2013-04-13 13:32       ` Markus Pargmann
2013-04-13 13:40         ` Lars-Peter Clausen
2013-04-13 13:55           ` Markus Pargmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365362721-3731-12-git-send-email-mpa@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).