From: Pierre-Louis Bossart Date: Fri, 10 Jan 2020 23:57:47 +0000 (-0600) Subject: ASoC: Intel: bdw-rt5650: change cpu_dai and platform components for SOF X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a40acc6bfcebb59fdf6a71c4740c46880ed5c0b4;p=linux.git ASoC: Intel: bdw-rt5650: change cpu_dai and platform components for SOF The legacy driver uses dummy cpu_dai and platform, SOF requires actual values to bind. Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200110235751.3404-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c index ba3fc1ef900ab..1a302436d4503 100644 --- a/sound/soc/intel/boards/bdw-rt5650.c +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -223,6 +223,14 @@ SND_SOC_DAILINK_DEF(platform, SND_SOC_DAILINK_DEF(be, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1"))); +#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 + static struct snd_soc_dai_link bdw_rt5650_dais[] = { /* Front End DAI links */ { @@ -256,7 +264,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .dpcm_playback = 1, .dpcm_capture = 1, .init = bdw_rt5650_init, - SND_SOC_DAILINK_REG(dummy, be, dummy), + SND_SOC_DAILINK_REG(ssp0_port, be, platform), }, };