Unverified Commit 99fddc16 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: clarify Codec2Codec params 

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

ASoC is supporting Codec2Codec, but its parameter name is
"params" and "num_params" which are very unclear naming.

This patch-set clarifies it by replacing to c2c_params / num_c2c_params.
parents 72456c24 1ea63f29

include/sound/soc.h

+6 −3
Original line number Diff line number Diff line
@@ -684,8 +684,11 @@ struct snd_soc_dai_link { 


	int id;	/* optional ID for machine driver link identification */



	const struct snd_soc_pcm_stream *params;

	unsigned int num_params;

	/*

	 * for Codec2Codec

	 */

	const struct snd_soc_pcm_stream *c2c_params;

	unsigned int num_c2c_params;



	unsigned int dai_fmt;           /* format to set on init */
@@ -1065,7 +1068,7 @@ struct snd_soc_pcm_runtime { 
	struct snd_soc_dai_link *dai_link;

	struct snd_pcm_ops ops;



	unsigned int params_select; /* currently selected param for dai link */

	unsigned int c2c_params_select; /* currently selected c2c_param for dai link */



	/* Dynamic PCM BE runtime data */

	struct snd_soc_dpcm_runtime dpcm[SNDRV_PCM_STREAM_LAST + 1];

sound/soc/generic/audio-graph-card2.c

+2 −2
Original line number Diff line number Diff line
@@ -920,8 +920,8 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, 
		c2c_conf->channels_min	=

		c2c_conf->channels_max	= 2; /* update ME */



		dai_link->params	= c2c_conf;

		dai_link->num_params	= 1;

		dai_link->c2c_params		= c2c_conf;

		dai_link->num_c2c_params	= 1;

	}



	ep0 = port_to_endpoint(port0);

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

+12 −12
Original line number Diff line number Diff line
@@ -562,12 +562,12 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, 
{

	struct snd_soc_dai_link *dai_link = rtd->dai_link;

	struct snd_soc_component *component;

	struct snd_soc_pcm_stream *params;

	struct snd_soc_pcm_stream *c2c_params;

	struct snd_pcm_hardware hw;

	int i, ret, stream;



	/* Do nothing if it already has Codec2Codec settings */

	if (dai_link->params)

	if (dai_link->c2c_params)

		return 0;



	/* Do nothing if it was DPCM :: BE */
@@ -592,19 +592,19 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, 
		return ret;

	}



	params = devm_kzalloc(rtd->dev, sizeof(*params), GFP_KERNEL);

	if (!params)

	c2c_params = devm_kzalloc(rtd->dev, sizeof(*c2c_params), GFP_KERNEL);

	if (!c2c_params)

		return -ENOMEM;



	params->formats = hw.formats;

	params->rates = hw.rates;

	params->rate_min = hw.rate_min;

	params->rate_max = hw.rate_max;

	params->channels_min = hw.channels_min;

	params->channels_max = hw.channels_max;

	c2c_params->formats		= hw.formats;

	c2c_params->rates		= hw.rates;

	c2c_params->rate_min		= hw.rate_min;

	c2c_params->rate_max		= hw.rate_max;

	c2c_params->channels_min	= hw.channels_min;

	c2c_params->channels_max	= hw.channels_max;



	dai_link->params = params;

	dai_link->num_params = 1;

	dai_link->c2c_params		= c2c_params;

	dai_link->num_c2c_params	= 1;



	return 0;

}

sound/soc/meson/axg-card.c

+2 −1
Original line number Diff line number Diff line
@@ -337,7 +337,8 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, 
		return ret;



	if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) {

		dai_link->params = &codec_params;

		dai_link->c2c_params = &codec_params;

		dai_link->num_c2c_params = 1;

	} else {

		dai_link->no_pcm = 1;

		snd_soc_dai_link_set_capabilities(dai_link);

sound/soc/meson/gx-card.c

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, 


	/* Or apply codec to codec params if necessary */

	if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) {

		dai_link->params = &codec_params;

		dai_link->c2c_params = &codec_params;

		dai_link->num_c2c_params = 1;

	} else {

		dai_link->no_pcm = 1;

		snd_soc_dai_link_set_capabilities(dai_link);