Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 09ee8336 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b8d8f9a5

sound/soc/generic/simple-scu-card.c

+7 −0
Original line number Diff line number Diff line
@@ -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;