ASoC: Intel: kbl_rt5663_rt5514_max98927: Add rt5514 spi dailink

This patch adds a dai to rt5514-spi driver for wake on voice functionality.

Signed-off-by: Hsin-yu Chao <hychao@google.com>
Signed-off-by: Harsha Priya <harshapriya.n@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b301bfff1c09ca06a10692c47352366aa096493b..b3c7f554ec30efb4b66603e17b714777ededc215 100644 (file)
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -255,11 +255,12 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
 
 config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
         tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
-        depends on X86_INTEL_LPSS && I2C
+        depends on X86_INTEL_LPSS && I2C && SPI
         select SND_SOC_INTEL_SST
         select SND_SOC_INTEL_SKYLAKE
         select SND_SOC_RT5663
         select SND_SOC_RT5514
+        select SND_SOC_RT5514_SPI
         select SND_SOC_MAX98927
         select SND_SOC_HDAC_HDMI
         help

diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 5ec942885b692acc12809d23c6f2cbadc2cc0155..b51dff6fe25b9941aaf2bb2635dc9a4c5e666326 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -65,6 +65,7 @@ enum {
        KBL_DPCM_AUDIO_HS_PB,
        KBL_DPCM_AUDIO_ECHO_REF_CP,
        KBL_DPCM_AUDIO_DMIC_CP,
+       KBL_DPCM_AUDIO_RT5514_DSP,
        KBL_DPCM_AUDIO_HDMI1_PB,
        KBL_DPCM_AUDIO_HDMI2_PB,
 };
@@ -480,6 +481,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
                .capture_only = 1,
                .nonatomic = 1,
        },
+       [KBL_DPCM_AUDIO_RT5514_DSP] = {
+               .name = "rt5514 dsp",
+               .stream_name = "Wake on Voice",
+               .cpu_dai_name = "spi-PRP0001:00",
+               .platform_name = "spi-PRP0001:00",
+               .codec_name = "snd-soc-dummy",
+               .codec_dai_name = "snd-soc-dummy-dai",
+       },
        [KBL_DPCM_AUDIO_DMIC_CP] = {
                .name = "Kbl Audio DMIC cap",
                .stream_name = "dmiccap",