ASoC: simple-scu-card: tidyup "convert-rate/channels" parsing

simple-scu-card.c is supporting "convert-rate/channels" which is
used for DPCM.
But, sound card might have multi codecs, and each codec might need
each convert-rate/channels.

This patch supports each codec's convert-rate/channles support.
top node convert-rate/channels will overwrite settings if exist.

It can't support each codec's convert-rate/channels if sound card had
multi codecs without this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index 1c6382fa54a02a0bcd244db8976fd9dbea6828fd..3c4e289958721aa7d64ffcb41dcfb0df8f2f32b6 100644 (file)
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -26,6 +26,7 @@ struct simple_card_data {
                struct asoc_simple_dai dai;
                struct snd_soc_dai_link_component codecs;
                struct snd_soc_dai_link_component platform;
+               struct asoc_simple_card_data adata;
        } *dai_props;
        struct snd_soc_dai_link *dai_link;
        struct asoc_simple_card_data adata;
@@ -86,7 +87,11 @@ static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                        struct snd_pcm_hw_params *params)
 {
        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
+       struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
 
+       asoc_simple_card_convert_fixup(&dai_props->adata, params);
+
+       /* overwrite by top level adata if exist */
        asoc_simple_card_convert_fixup(&priv->adata, params);
 
        return 0;
@@ -177,6 +182,8 @@ static int asoc_simple_card_dai_link_of(struct device_node *link,
                                                     "prefix");
        }
 
+       asoc_simple_card_parse_convert(dev, link, prefix, &dai_props->adata);
+
        ret = asoc_simple_card_of_parse_tdm(np, &dai_props->dai);
        if (ret)
                return ret;