Skip to content

Commit 324f065

Browse files
plbossartbroonie
authored andcommitted
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: thesofproject#4083 Signed-off-by: Pierre-Louis Bossart <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Reviewed-by: Péter Ujfalusi <[email protected]> Reviewed-by: Bard Liao <[email protected]> Signed-off-by: Kai Vehmanen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent c1619ea commit 324f065

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

sound/soc/intel/boards/sof_rt5682.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,8 +761,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
761761
links[id].num_codecs = ARRAY_SIZE(max_98373_components);
762762
links[id].init = max_98373_spk_codec_init;
763763
links[id].ops = &max_98373_ops;
764-
/* feedback stream */
765-
links[id].dpcm_capture = 1;
766764
} else if (sof_rt5682_quirk &
767765
SOF_MAX98360A_SPEAKER_AMP_PRESENT) {
768766
max_98360a_dai_link(&links[id]);
@@ -789,6 +787,9 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
789787
links[id].platforms = platform_component;
790788
links[id].num_platforms = ARRAY_SIZE(platform_component);
791789
links[id].dpcm_playback = 1;
790+
/* feedback stream or firmware-generated echo reference */
791+
links[id].dpcm_capture = 1;
792+
792793
links[id].no_pcm = 1;
793794
links[id].cpus = &cpus[id];
794795
links[id].num_cpus = 1;

0 commit comments

Comments
 (0)