aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/intel/Kconfig3
-rw-r--r--sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c9
2 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b301bfff1c09..b3c7f554ec30 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -255,11 +255,12 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
255 255
256config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH 256config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
257 tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" 257 tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
258 depends on X86_INTEL_LPSS && I2C 258 depends on X86_INTEL_LPSS && I2C && SPI
259 select SND_SOC_INTEL_SST 259 select SND_SOC_INTEL_SST
260 select SND_SOC_INTEL_SKYLAKE 260 select SND_SOC_INTEL_SKYLAKE
261 select SND_SOC_RT5663 261 select SND_SOC_RT5663
262 select SND_SOC_RT5514 262 select SND_SOC_RT5514
263 select SND_SOC_RT5514_SPI
263 select SND_SOC_MAX98927 264 select SND_SOC_MAX98927
264 select SND_SOC_HDAC_HDMI 265 select SND_SOC_HDAC_HDMI
265 help 266 help
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 5ec942885b69..b51dff6fe25b 100644
--- 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 {
65 KBL_DPCM_AUDIO_HS_PB, 65 KBL_DPCM_AUDIO_HS_PB,
66 KBL_DPCM_AUDIO_ECHO_REF_CP, 66 KBL_DPCM_AUDIO_ECHO_REF_CP,
67 KBL_DPCM_AUDIO_DMIC_CP, 67 KBL_DPCM_AUDIO_DMIC_CP,
68 KBL_DPCM_AUDIO_RT5514_DSP,
68 KBL_DPCM_AUDIO_HDMI1_PB, 69 KBL_DPCM_AUDIO_HDMI1_PB,
69 KBL_DPCM_AUDIO_HDMI2_PB, 70 KBL_DPCM_AUDIO_HDMI2_PB,
70}; 71};
@@ -480,6 +481,14 @@ static struct snd_soc_dai_link kabylake_dais[] = {
480 .capture_only = 1, 481 .capture_only = 1,
481 .nonatomic = 1, 482 .nonatomic = 1,
482 }, 483 },
484 [KBL_DPCM_AUDIO_RT5514_DSP] = {
485 .name = "rt5514 dsp",
486 .stream_name = "Wake on Voice",
487 .cpu_dai_name = "spi-PRP0001:00",
488 .platform_name = "spi-PRP0001:00",
489 .codec_name = "snd-soc-dummy",
490 .codec_dai_name = "snd-soc-dummy-dai",
491 },
483 [KBL_DPCM_AUDIO_DMIC_CP] = { 492 [KBL_DPCM_AUDIO_DMIC_CP] = {
484 .name = "Kbl Audio DMIC cap", 493 .name = "Kbl Audio DMIC cap",
485 .stream_name = "dmiccap", 494 .stream_name = "dmiccap",