aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto2018-12-11 03:25:18 +0000
committerMark Brown2018-12-11 12:18:42 +0000
commit09ee833679761f4995daaa6fd6200c77b8fcdaef (patch)
tree82a530bfde0ed0dcdd4e24ae09cb64c481c3b5db /sound
parentb8d8f9a58fd971ec215fb8bfec5a4fb6e539a3ab (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/generic/simple-scu-card.c7
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 1c6382fa54a0..3c4e28995872 100644
--- 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;