From: Jyri Sarha <jsarha@ti.com>
To: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-omap@vger.kernel.org
Cc: peter.ujfalusi@ti.com, broonie@kernel.org,
liam.r.girdwood@linux.intel.com, bcousson@baylibre.com,
detheridge@ti.com, Jyri Sarha <jsarha@ti.com>
Subject: [PATCH RFC v2 2/2] ASoC: simple-card: Take snd_soc_of_parse_daifmt() change in to account
Date: Mon, 10 Mar 2014 13:41:16 +0200 [thread overview]
Message-ID: <0929a0018fa3e909cb0894c5b01873b5eae0f6eb.1394451329.git.jsarha@ti.com> (raw)
In-Reply-To: <cover.1394451329.git.jsarha@ti.com>
snd_soc_of_parse_daifmt() needs to know if it is parsing a cpu-dai node.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
---
sound/soc/generic/simple-card.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 7cabcc5..7cbbf44 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -87,7 +87,8 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
unsigned int daifmt,
struct asoc_simple_dai *dai,
const struct device_node **p_node,
- const char **name)
+ const char **name,
+ bool is_cpu_dai_node)
{
struct device_node *node;
struct clk *clk;
@@ -117,7 +118,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
* bitclock-master, frame-master
* and specific "format" if it has
*/
- dai->fmt = snd_soc_of_parse_daifmt(np, NULL);
+ dai->fmt = snd_soc_of_parse_daifmt(np, NULL, is_cpu_dai_node);
dai->fmt |= daifmt;
/*
@@ -165,7 +166,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
/* get CPU/CODEC common format via simple-audio-card,format */
- priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
+ priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,", 0) &
(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
/* off-codec widgets */
@@ -191,7 +192,8 @@ static int asoc_simple_card_parse_of(struct device_node *node,
ret = asoc_simple_card_sub_parse_of(np, priv->daifmt,
&priv->cpu_dai,
&dai_link->cpu_of_node,
- &dai_link->cpu_dai_name);
+ &dai_link->cpu_dai_name,
+ true);
if (ret < 0)
return ret;
@@ -202,7 +204,8 @@ static int asoc_simple_card_parse_of(struct device_node *node,
ret = asoc_simple_card_sub_parse_of(np, priv->daifmt,
&priv->codec_dai,
&dai_link->codec_of_node,
- &dai_link->codec_dai_name);
+ &dai_link->codec_dai_name,
+ false);
if (ret < 0)
return ret;
--
1.7.9.5
next prev parent reply other threads:[~2014-03-10 11:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 11:41 [PATCH RFC v2 0/2] Fix simple-card *-master DT parameter handling Jyri Sarha
2014-03-10 11:41 ` [PATCH RFC v2 1/2] ASoC: core: Add is_cpu_dai_node-parameter to snd_soc_of_parse_daifmt() Jyri Sarha
2014-03-10 11:41 ` Jyri Sarha [this message]
2014-03-11 10:50 ` [PATCH RFC v2 0/2] Fix simple-card *-master DT parameter handling Mark Brown
2014-03-12 1:13 ` [alsa-devel] " Kuninori Morimoto
2014-03-12 4:07 ` Kuninori Morimoto
2014-03-12 5:00 ` Richard Lee
2014-03-12 6:11 ` Kuninori Morimoto
2014-03-12 9:27 ` Jyri Sarha
2014-04-14 5:07 ` Kuninori Morimoto
2014-04-14 9:53 ` Jyri Sarha
2014-04-15 0:23 ` Kuninori Morimoto
2014-03-12 12:30 ` Mark Brown
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=0929a0018fa3e909cb0894c5b01873b5eae0f6eb.1394451329.git.jsarha@ti.com \
--to=jsarha@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=bcousson@baylibre.com \
--cc=broonie@kernel.org \
--cc=detheridge@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-omap@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
/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).