openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: simple-scu-card: tidyup "prefix" parsing 

simple-scu-card.c is supporting "prefix" which is used to avoid
DAI naming conflict when CPU/Codec matching.
But, sound card might have multi sub-devices, and each codec might need
each prefix.

Now, ASoC is supporting snd_soc_of_parse_node_prefix(), let's support
it on audio-graph-scu-card, too. It is keeping existing DT style.

It can't support each codec's prefix if sound card had multi sub-devices
without this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-11-22 00:55:40 +00:00 committed by Mark Brown
parent f94b0f7f92
commit ca8d95c709
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/generic/simple-scu-card.c
View File

@ -157,10 +157,17 @@ static int asoc_simple_card_dai_link_of(struct device_node *np,
if (ret < 0) if (ret < 0)
return ret; return ret;
/* check "prefix" from top node */
snd_soc_of_parse_audio_prefix(card, snd_soc_of_parse_audio_prefix(card,
&priv->codec_conf, &priv->codec_conf,
dai_link->codecs->of_node, dai_link->codecs->of_node,
PREFIX "prefix"); PREFIX "prefix");
/* check "prefix" from each node if top doesn't have */
if (!priv->codec_conf.of_node)
snd_soc_of_parse_node_prefix(np,
&priv->codec_conf,
dai_link->codecs->of_node,
"prefix");
} }
ret = asoc_simple_card_of_parse_tdm(np, &dai_props->dai); ret = asoc_simple_card_of_parse_tdm(np, &dai_props->dai);