Skip to content

Commit f25e203

Browse files
crojewsk-intelbroonie
authored andcommitted
ASoC: Intel: bdw-rt5650: Revert SSP0 link to use dummy components
Recent series of patches targeting broadwell boards, while enabling SOF, changed behavior for non-SOF solutions. In essence replacing platform 'dummy' with actual 'platform' causes redundant stream initialization to occur during audio start. hw_params for haswell-pcm destroys initial stream right after its creation - only to recreate it again from proceed from there. While harmless so far, this flow isn't right and should be corrected. The actual need for dummy components for SSP0 link is questionable but that issue is subject for another series. Fixes: a40acc6 ("ASoC: Intel: bdw-rt5650: change cpu_dai and platform components for SOF") Signed-off-by: Cezary Rojewski <[email protected]> Acked-by: Pierre-Louis Bossart <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent c031d3d commit f25e203

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

sound/soc/intel/boards/bdw-rt5650.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,6 @@ SND_SOC_DAILINK_DEF(be,
226226
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
227227
SND_SOC_DAILINK_DEF(ssp0_port,
228228
DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
229-
#else
230-
SND_SOC_DAILINK_DEF(ssp0_port,
231-
DAILINK_COMP_ARRAY(COMP_DUMMY()));
232229
#endif
233230

234231
static struct snd_soc_dai_link bdw_rt5650_dais[] = {
@@ -264,7 +261,11 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
264261
.dpcm_playback = 1,
265262
.dpcm_capture = 1,
266263
.init = bdw_rt5650_init,
264+
#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
265+
SND_SOC_DAILINK_REG(dummy, be, dummy),
266+
#else
267267
SND_SOC_DAILINK_REG(ssp0_port, be, platform),
268+
#endif
268269
},
269270
};
270271

0 commit comments

Comments
 (0)