diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-27 17:29:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-27 17:29:18 +0000 |
| commit | 8e3bb8ec11ed60963dbb70e69cf1a6806489dce3 (patch) | |
| tree | 311171da6c49fd0aaa7812ca7962e257fd016383 /sound/soc/intel/boards/bdw-rt5677.c | |
| parent | 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e (diff) | |
| parent | f25e203070e5b12e4db366ee99b86f33a968f1ae (diff) | |
Merge branch 'asoc-5.6' into asoc-linus
Diffstat (limited to 'sound/soc/intel/boards/bdw-rt5677.c')
| -rw-r--r-- | sound/soc/intel/boards/bdw-rt5677.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index bb643c99069d..63108e1a0e4d 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -298,9 +298,6 @@ SND_SOC_DAILINK_DEF(be, #if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) SND_SOC_DAILINK_DEF(ssp0_port, DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port"))); -#else -SND_SOC_DAILINK_DEF(ssp0_port, - DAILINK_COMP_ARRAY(COMP_DUMMY())); #endif /* Wake on voice interface */ @@ -350,7 +347,11 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .dpcm_playback = 1, .dpcm_capture = 1, .init = bdw_rt5677_init, +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) + SND_SOC_DAILINK_REG(dummy, be, dummy), +#else SND_SOC_DAILINK_REG(ssp0_port, be, platform), +#endif }, }; |