Merge series "ASoC: meson: fix codec-to-codec link setup" from Jerome Brunet... (036889b2) · Commits · 戴 / test

Merge series "ASoC: meson: fix codec-to-codec link setup" from Jerome Brunet <jbrunet@baylibre.com>: This patchset fixes the problem reported by Marc in this thread [0] The problem was due to an error in the meson card drivers which had the "no_pcm" dai_link property set on codec-to-codec links [0]: https://lore.kernel.org/r/20200417122732.GC5315@sirena.org.uk Jerome Brunet (2): ASoC: meson: axg-card: fix codec-to-codec link setup ASoC: meson: gx-card: fix codec-to-codec link setup sound/soc/meson/axg-card.c | 4 +++- sound/soc/meson/gx-card.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) -- 2.25.2

sound/soc/meson/axg-card.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -338,8 +338,10 @@ static int axg_card_add_link(struct snd_soc_card card, struct device_node np,

		if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))
		ret = axg_card_parse_tdm(card, np, index);
		else if (axg_card_cpu_is_codec(dai_link->cpus->of_node))
		else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) {
		dai_link->params = &codec_params;
		dai_link->no_pcm = 0; /* link is not a DPCM BE */
		}

		return ret;
		}

sound/soc/meson/gx-card.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -108,8 +108,10 @@ static int gx_card_add_link(struct snd_soc_card card, struct device_node np,
		ret = gx_card_parse_i2s(card, np, index);

		/* Or apply codec to codec params if necessary */
		else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL"))
		else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) {
		dai_link->params = &codec_params;
		dai_link->no_pcm = 0; /* link is not a DPCM BE */
		}

		return ret;
		}

Admin message