Unverified Commit 324f065c authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: always set dpcm_capture for amplifiers 

The amplifier may provide hardware support for I/V feedback, or
alternatively the firmware may generate an echo reference attached to
the SSP and dailink used for the amplifier.

To avoid any issues with invalid/NULL substreams in the latter case,
always unconditionally set dpcm_capture.

Link: https://github.com/thesofproject/linux/issues/4083


Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20230119163459.2235843-2-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c1619ea2

sound/soc/intel/boards/sof_rt5682.c

+3 −2
Original line number Diff line number Diff line
@@ -761,8 +761,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
			links[id].num_codecs = ARRAY_SIZE(max_98373_components);

			links[id].init = max_98373_spk_codec_init;

			links[id].ops = &max_98373_ops;

			/* feedback stream */

			links[id].dpcm_capture = 1;

		} else if (sof_rt5682_quirk &

				SOF_MAX98360A_SPEAKER_AMP_PRESENT) {

			max_98360a_dai_link(&links[id]);
@@ -789,6 +787,9 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
		links[id].platforms = platform_component;

		links[id].num_platforms = ARRAY_SIZE(platform_component);

		links[id].dpcm_playback = 1;

		/* feedback stream or firmware-generated echo reference */

		links[id].dpcm_capture = 1;



		links[id].no_pcm = 1;

		links[id].cpus = &cpus[id];

		links[id].num_cpus = 1;