| Message ID | 1502923031-335-1-git-send-email-harshapriya.n@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Aug 16, 2017 at 03:37:11PM -0700, Harsha Priya wrote: > This patch adds a dai to rt5514-spi driver for wake on voice functionality. Acked-By: Vinod Koul <vinod.koul@intel.com> > Signed-off-by: Hsin-yu Chao <hychao@google.com> > Signed-off-by: Harsha Priya <harshapriya.n@intel.com> > > --- > > v2 patch adds the dependency on SPI in Kconfig > v3 patch changes the commit message to move the version specific info > > sound/soc/intel/Kconfig | 3 ++- > sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 9 +++++++++ > 2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig > index b301bff..b3c7f55 100644 > --- 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 5ec9428..b51dff6 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 { > 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 int kabylake_dmic_startup(struct snd_pcm_substream *substream) > .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", > -- > 1.9.1 >
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index b301bff..b3c7f55 100644 --- 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 5ec9428..b51dff6 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 { 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 int kabylake_dmic_startup(struct snd_pcm_substream *substream) .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",