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

Commit c564a5b1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: audio-graph-scu-card: use asoc_simple_card_convert_fixup() 



Current simple/audio scu card drivers are supporting same
convert-rate/convert-channels on DT, but, doesn't use same function
for it.
Encapsulation is one of simple card util's purpose.
Let's use asoc_simple_card_parse_convert/asoc_simple_card_convert_fixup

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cd8957f5

sound/soc/generic/audio-graph-scu-card.c

+3 −21
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ struct graph_card_data { 
	struct snd_soc_codec_conf codec_conf;

	struct asoc_simple_dai *dai_props;

	struct snd_soc_dai_link *dai_link;

	u32 convert_rate;

	u32 convert_channels;

	struct asoc_simple_card_data adata;

};



#define graph_priv_to_card(priv) (&(priv)->snd_card)
@@ -83,18 +82,8 @@ static int asoc_graph_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
					       struct snd_pcm_hw_params *params)

{

	struct graph_card_data *priv = snd_soc_card_get_drvdata(rtd->card);

	struct snd_interval *rate = hw_param_interval(params,

						      SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

							  SNDRV_PCM_HW_PARAM_CHANNELS);



	if (priv->convert_rate)

		rate->min =

		rate->max = priv->convert_rate;



	if (priv->convert_channels)

		channels->min =

		channels->max = priv->convert_channels;

	asoc_simple_card_convert_fixup(&priv->adata, params);



	return 0;

}
@@ -210,11 +199,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	if (ret)

		return ret;



	/* sampling rate convert */

	of_property_read_u32(node, "convert-rate", &priv->convert_rate);



	/* channels transfer */

	of_property_read_u32(node, "convert-channels", &priv->convert_channels);

	asoc_simple_card_parse_convert(dev, NULL, &priv->adata);



	/*

	 * it supports multi CPU, single CODEC only here
@@ -286,9 +271,6 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	if (ret)

		goto parse_of_err;



	dev_dbg(dev, "convert_rate     %d\n", priv->convert_rate);

	dev_dbg(dev, "convert_channels %d\n", priv->convert_channels);



	ret = 0;



parse_of_err: