Skip to content

Commit 36a71a0

Browse files
plbossartbroonie
authored andcommitted
ASoC: Intel: sof_nau8825: 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 e0a5222 commit 36a71a0

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

sound/soc/intel/boards/sof_nau8825.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
487487
links[id].num_codecs = ARRAY_SIZE(max_98373_components);
488488
links[id].init = max_98373_spk_codec_init;
489489
links[id].ops = &max_98373_ops;
490-
/* feedback stream */
491-
links[id].dpcm_capture = 1;
492490
} else if (sof_nau8825_quirk &
493491
SOF_MAX98360A_SPEAKER_AMP_PRESENT) {
494492
max_98360a_dai_link(&links[id]);
@@ -506,6 +504,9 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
506504
links[id].platforms = platform_component;
507505
links[id].num_platforms = ARRAY_SIZE(platform_component);
508506
links[id].dpcm_playback = 1;
507+
/* feedback stream or firmware-generated echo reference */
508+
links[id].dpcm_capture = 1;
509+
509510
links[id].no_pcm = 1;
510511
links[id].cpus = &cpus[id];
511512
links[id].num_cpus = 1;

0 commit comments

Comments
 (0)