| Message ID | 1392318930-8771-5-git-send-email-liam.r.girdwood@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Mark Brown |
| Headers | show |
At Thu, 13 Feb 2014 19:15:30 +0000, Liam Girdwood wrote: > > This adds kernel build support for Intel SST core audio. > > Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> > --- > sound/soc/intel/Kconfig | 14 ++++++++++++++ > sound/soc/intel/Makefile | 7 +++++++ > 2 files changed, 21 insertions(+) > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig > index 4d9d0a5..0b51451 100644 > --- a/sound/soc/intel/Kconfig > +++ b/sound/soc/intel/Kconfig > @@ -11,3 +11,17 @@ config SND_MFLD_MACHINE > > config SND_SST_MFLD_PLATFORM > tristate > + > +config SND_SOC_INTEL_SST > + tristate "ASoC support for Intel(R) Smart Sound Technology" > + select SND_SOC_INTEL_SST_ACPI if ACPI > + help > + This adds support for Intel(R) Smart Sound Technology (SST). > + Say Y if you have such a device > + If unsure select "N". > + > +config SND_SOC_INTEL_SST_ACPI > + tristate > + > +config SND_SOC_INTEL_HASWELL > + tristate I guess the last one is superfluous? It's used nowhere else. Takashi > diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile > index eb899fc..cf47100 100644 > --- a/sound/soc/intel/Makefile > +++ b/sound/soc/intel/Makefile > @@ -1,5 +1,12 @@ > +# Core support > +snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o > +snd-soc-sst-acpi-objs := sst-acpi.o > + > snd-soc-sst-mfld-platform-objs := sst-mfld-platform.o > snd-soc-mfld-machine-objs := mfld_machine.o > > obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o > obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o > + > +obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o > +obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o > -- > 1.8.3.2 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >
On Fri, 2014-02-14 at 09:56 +0100, Takashi Iwai wrote: > At Thu, 13 Feb 2014 19:15:30 +0000, > Liam Girdwood wrote: > > > > This adds kernel build support for Intel SST core audio. > > > > Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> > > --- > > sound/soc/intel/Kconfig | 14 ++++++++++++++ > > sound/soc/intel/Makefile | 7 +++++++ > > 2 files changed, 21 insertions(+) > > > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig > > index 4d9d0a5..0b51451 100644 > > --- a/sound/soc/intel/Kconfig > > +++ b/sound/soc/intel/Kconfig > > @@ -11,3 +11,17 @@ config SND_MFLD_MACHINE > > > > config SND_SST_MFLD_PLATFORM > > tristate > > + > > +config SND_SOC_INTEL_SST > > + tristate "ASoC support for Intel(R) Smart Sound Technology" > > + select SND_SOC_INTEL_SST_ACPI if ACPI > > + help > > + This adds support for Intel(R) Smart Sound Technology (SST). > > + Say Y if you have such a device > > + If unsure select "N". > > + > > +config SND_SOC_INTEL_SST_ACPI > > + tristate > > + > > +config SND_SOC_INTEL_HASWELL > > + tristate > > I guess the last one is superfluous? It's used nowhere else. > > Yeap, for this series. It's actually part of the Haswell support (next patch series). I had just chopped things down into a smaller patch series for easier review. Liam
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 4d9d0a5..0b51451 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -11,3 +11,17 @@ config SND_MFLD_MACHINE config SND_SST_MFLD_PLATFORM tristate + +config SND_SOC_INTEL_SST + tristate "ASoC support for Intel(R) Smart Sound Technology" + select SND_SOC_INTEL_SST_ACPI if ACPI + help + This adds support for Intel(R) Smart Sound Technology (SST). + Say Y if you have such a device + If unsure select "N". + +config SND_SOC_INTEL_SST_ACPI + tristate + +config SND_SOC_INTEL_HASWELL + tristate diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index eb899fc..cf47100 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -1,5 +1,12 @@ +# Core support +snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o +snd-soc-sst-acpi-objs := sst-acpi.o + snd-soc-sst-mfld-platform-objs := sst-mfld-platform.o snd-soc-mfld-machine-objs := mfld_machine.o obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o + +obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o +obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o
This adds kernel build support for Intel SST core audio. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> --- sound/soc/intel/Kconfig | 14 ++++++++++++++ sound/soc/intel/Makefile | 7 +++++++ 2 files changed, 21 insertions(+)