Unverified Commit 433f4a16 authored Apr 02, 2023 by Kuninori Morimoto Committed by Mark Brown Apr 05, 2023

ASoC: meson: switch to use c2c_params instead of params



ASoC is now using c2c_params instead of params. This patch replace it.
num_c2c_params (was num_params) was not mandatory before,
but let's set it by this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87lej9c2ky.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent a1cd7e80

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);

sound/soc/meson/meson-codec-glue.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -105,13 +105,14 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,
		if (!in_data)
		return -ENODEV;

		if (WARN_ON(!rtd->dai_link->params)) {
		if (WARN_ON(!rtd->dai_link->c2c_params)) {
		dev_warn(dai->dev, "codec2codec link expected\n");
		return -EINVAL;
		}

		/* Replace link params with the input params */
		rtd->dai_link->params = &in_data->params;
		rtd->dai_link->c2c_params = &in_data->params;
		rtd->dai_link->num_c2c_params = 1;

		return snd_soc_runtime_set_dai_fmt(rtd, in_data->fmt);
		}