diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-02-24 10:27:02 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-24 23:44:44 -0500 |
| commit | 20df8d03a7a6d71cc8c1fe54cf2c69b2d416423f (patch) | |
| tree | 3725abbddd5077a4be62f9a6ad6ea8e0307a0d24 | |
| parent | e0298612147f668b55644e230340237b7c1a991d (diff) | |
ASoC: Intel: Add build support for Baytrail SST
Enable build support for Baytrail SST DSP platform and byt-rt5640 machine
drivers.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/intel/Kconfig | 14 | ||||
| -rw-r--r-- | sound/soc/intel/Makefile | 5 |
2 files changed, 18 insertions, 1 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index ce5a6928e601..274af1639781 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig | |||
| @@ -27,6 +27,9 @@ config SND_SOC_INTEL_SST_ACPI | |||
| 27 | config SND_SOC_INTEL_HASWELL | 27 | config SND_SOC_INTEL_HASWELL |
| 28 | tristate | 28 | tristate |
| 29 | 29 | ||
| 30 | config SND_SOC_INTEL_BAYTRAIL | ||
| 31 | tristate | ||
| 32 | |||
| 30 | config SND_SOC_INTEL_HASWELL_MACH | 33 | config SND_SOC_INTEL_HASWELL_MACH |
| 31 | tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" | 34 | tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" |
| 32 | depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS | 35 | depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS |
| @@ -36,4 +39,13 @@ config SND_SOC_INTEL_HASWELL_MACH | |||
| 36 | This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell | 39 | This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell |
| 37 | Ultrabook platforms. | 40 | Ultrabook platforms. |
| 38 | Say Y if you have such a device | 41 | Say Y if you have such a device |
| 39 | If unsure select "N". \ No newline at end of file | 42 | If unsure select "N". |
| 43 | |||
| 44 | config SND_SOC_INTEL_BYT_RT5640_MACH | ||
| 45 | tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" | ||
| 46 | depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS | ||
| 47 | select SND_SOC_INTEL_BAYTRAIL | ||
| 48 | select SND_SOC_RT5640 | ||
| 49 | help | ||
| 50 | This adds audio driver for Intel Baytrail platform based boards | ||
| 51 | with the RT5640 audio codec. | ||
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index 1c188150accb..edeb79ae3dff 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile | |||
| @@ -14,10 +14,15 @@ obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o | |||
| 14 | # Platform Support | 14 | # Platform Support |
| 15 | snd-soc-sst-haswell-pcm-objs := \ | 15 | snd-soc-sst-haswell-pcm-objs := \ |
| 16 | sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o | 16 | sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o |
| 17 | snd-soc-sst-baytrail-pcm-objs := \ | ||
| 18 | sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o | ||
| 17 | 19 | ||
| 18 | obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += snd-soc-sst-haswell-pcm.o | 20 | obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += snd-soc-sst-haswell-pcm.o |
| 21 | obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o | ||
| 19 | 22 | ||
| 20 | # Machine support | 23 | # Machine support |
| 21 | snd-soc-sst-haswell-objs := haswell.o | 24 | snd-soc-sst-haswell-objs := haswell.o |
| 25 | snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o | ||
| 22 | 26 | ||
| 23 | obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o | 27 | obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o |
| 28 | obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o | ||
