[v2] ASoC: simple-card: cpu_dai_name creates confusion when DT case

Commit Message

Kuninori Morimoto Feb. 28, 2014, 2:25 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

Basically, soc_bind_dai_link() checks
cpu_dai->dev->of_node and dai_link->cpu_of_node in DT case.
But after that it will check
cpu_dai->name and dai_link->cpu_dai_name too.

On the other hand, snd_soc_dai :: name is created by
fmt_single_name() or fmt_multiple_name().

There is no confusion if dai name is created by fmt_multiple_name(),
since cpu_dai->name is same as dai_link->cpu_dai_name.
but, if dai name is created by fmt_single_name(), CPU DAI never match.

Thus, simple-card not set dai_link->cpu_dai_name if DT case
to skip naming match on soc_bind_dai_link()

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
v1 -> v2

 - for latest mark/topic/simple branch

 sound/soc/generic/simple-card.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Mark Brown Feb. 28, 2014, 3:53 a.m. UTC | #1

On Thu, Feb 27, 2014 at 06:25:24PM -0800, Kuninori Morimoto wrote:

> +	 * see
> +	 *	fmt_single_name()
> +	 *	fmt_multiple_name()
> +	 */
> +	dai_link->cpu_dai_name = NULL;
> +

Why do this by overwriting rather than at the point where the variable
gets assigned?

Kuninori Morimoto Feb. 28, 2014, 4:31 a.m. UTC | #2

Hi Mark

> > +	 * see
> > +	 *	fmt_single_name()
> > +	 *	fmt_multiple_name()
> > +	 */
> > +	dai_link->cpu_dai_name = NULL;
> > +
> 
> Why do this by overwriting rather than at the point where the variable
> gets assigned?

Do you mean why I did it end of asoc_simple_card_parse_of() ?
Because this cpu_dai_name itself is used for
dai_link->name, dai_link->stream_name;
This patch set NULL after that.

Mark Brown Feb. 28, 2014, 5:25 a.m. UTC | #3

On Thu, Feb 27, 2014 at 08:31:45PM -0800, Kuninori Morimoto wrote:

> Do you mean why I did it end of asoc_simple_card_parse_of() ?
> Because this cpu_dai_name itself is used for
> dai_link->name, dai_link->stream_name;
> This patch set NULL after that.

OK, makes sense.  Applied, thanks.

Patch

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index bdd176d..034a2b7 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -234,6 +234,17 @@  static int asoc_simple_card_parse_of(struct device_node *node,
 		priv->codec_dai.fmt,
 		priv->codec_dai.sysclk);
 
+	/*
+	 * soc_bind_dai_link() will check cpu name
+	 * after of_node matching if dai_link has cpu_dai_name.
+	 * but, it will never match if name was created by fmt_single_name()
+	 * remove cpu_dai_name to escape name matching.
+	 * see
+	 *	fmt_single_name()
+	 *	fmt_multiple_name()
+	 */
+	dai_link->cpu_dai_name = NULL;
+
 	return 0;
 }