From: Jean-Francois Moine <moinejf@free.fr>
To: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
linux-kernel@vger.kernel.org, Xiubo Li <Li.Xiubo@freescale.com>
Subject: [PATCH v2 4/4] ASoC: simple-card: Add DT documentation for multi-DAI links
Date: Tue, 11 Mar 2014 10:58:33 +0100 [thread overview]
Message-ID: <bc0e25f6c042c8b99c8e83c6876ce0c8f7c3ab36.1394533640.git.moinejf@free.fr> (raw)
In-Reply-To: <cover.1394533640.git.moinejf@free.fr>
There may be many couples of CPU/CODEC DAI links.
The example 2 is extracted from the Cubox DT.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
---
.../devicetree/bindings/sound/simple-card.txt | 34 +++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index b30c222..a872e7b 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -26,6 +26,9 @@ Required subnodes:
- simple-audio-card,cpu : CPU sub-node
- simple-audio-card,codec : CODEC sub-node
+ There may be one or many couples (simple-audio-card,cpu, simple-audio-card,codec)
+ (see example 2).
+
Required CPU/CODEC subnodes properties:
- sound-dai : phandle and port of CPU/CODEC
@@ -43,7 +46,7 @@ Optional CPU/CODEC subnodes properties:
clock node (= common clock), or "system-clock-frequency"
(if system doens't support common clock)
-Example:
+Example 1:
sound {
compatible = "simple-audio-card";
@@ -88,3 +91,32 @@ sh_fsi2: sh_fsi2@ec230000 {
interrupt-parent = <&gic>;
interrupts = <0 146 0x4>;
};
+
+Example 2:
+
+sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "Cubox Audio";
+
+ simple-audio-card,cpu@0 { /* I2S - HDMI */
+ sound-dai = <&audio1 0>;
+ format = "i2s";
+ };
+ simple-audio-card,codec@0 {
+ sound-dai = <&tda998x 0>;
+ };
+
+ simple-audio-card,cpu@1 { /* S/PDIF - HDMI */
+ sound-dai = <&audio1 1>;
+ };
+ simple-audio-card,codec@1 {
+ sound-dai = <&tda998x 1>;
+ };
+
+ simple-audio-card,cpu@2 { /* S/PDIF - S/PDIF */
+ sound-dai = <&audio1 1>;
+ };
+ simple-audio-card,codec@2 {
+ sound-dai = <&spdif_codec>;
+ };
+};
--
1.9.0
prev parent reply other threads:[~2014-03-11 9:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 10:27 [PATCH v2 0/4] ASoC: simple-card: DT fix and multi DAI links extension Jean-Francois Moine
2014-03-11 9:03 ` [PATCH v2 1/4] ASoC: simple-card: Fix the reference count of device nodes Jean-Francois Moine
2014-03-14 19:57 ` Mark Brown
2014-03-11 9:21 ` [PATCH v2 2/4] ASoC: simple-card: dynamically allocate the DAI link array Jean-Francois Moine
2014-03-11 9:36 ` [PATCH v2 3/4] ASoC: simple-card: accept many DAI links Jean-Francois Moine
2014-03-12 5:20 ` Li.Xiubo
2014-03-14 18:58 ` [alsa-devel] " Jean-Francois Moine
2014-03-14 11:16 ` Jyri Sarha
2014-03-14 18:40 ` Jean-Francois Moine
2014-03-15 9:14 ` Jyri Sarha
2014-03-17 16:19 ` Mark Brown
2014-03-11 9:58 ` Jean-Francois Moine [this message]
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=bc0e25f6c042c8b99c8e83c6876ce0c8f7c3ab36.1394533640.git.moinejf@free.fr \
--to=moinejf@free.fr \
--cc=Li.Xiubo@freescale.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.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).