diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2018-11-22 00:55:40 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-23 14:01:49 +0000 |
| commit | ca8d95c709378d0792c9dbacdab176a75e521ffb (patch) | |
| tree | 48a1c510f63e49395fac775b3da59530e3dcbc42 | |
| parent | f94b0f7f9246013ac158ae3adf194c1bfa1d1847 (diff) | |
| download | linux-stable-ca8d95c709378d0792c9dbacdab176a75e521ffb.tar.gz linux-stable-ca8d95c709378d0792c9dbacdab176a75e521ffb.tar.bz2 linux-stable-ca8d95c709378d0792c9dbacdab176a75e521ffb.zip | |
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>
| -rw-r--r-- | sound/soc/generic/simple-scu-card.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index e650143eb532..7ae1901b2f85 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -157,10 +157,17 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, if (ret < 0) return ret; + /* check "prefix" from top node */ snd_soc_of_parse_audio_prefix(card, &priv->codec_conf, dai_link->codecs->of_node, 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); |