diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-06-30 10:01:38 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-04 18:57:58 +0100 |
| commit | b5dd60fd263147f723aeebc424dab7cd6613d3be (patch) | |
| tree | 9e37aa2574a32103f2afa492a97f025eaba63d10 | |
| parent | 001eaa25ca8cf4bfdb76fa8f2287b8d34287b9b6 (diff) | |
| download | linux-b5dd60fd263147f723aeebc424dab7cd6613d3be.tar.gz linux-b5dd60fd263147f723aeebc424dab7cd6613d3be.tar.bz2 linux-b5dd60fd263147f723aeebc424dab7cd6613d3be.zip | |
ASoC: s6000: Allow to build when COMPILE_TEST is enabled
Most of the ASoC s6000 code is architecture independent. This patch makes it
possible to select the platform when COMPILE_TEST is enabled.
The only architecture dependent code is the PCM driver which will still only be
selected if XTENSA_VARIANT_S6000 is enabled.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/s6000/Kconfig | 10 | ||||
| -rw-r--r-- | sound/soc/s6000/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sound/soc/s6000/Kconfig b/sound/soc/s6000/Kconfig index c74eb3d4a47c..4823e1e4daef 100644 --- a/sound/soc/s6000/Kconfig +++ b/sound/soc/s6000/Kconfig @@ -1,17 +1,23 @@ config SND_S6000_SOC tristate "SoC Audio for the Stretch s6000 family" - depends on XTENSA_VARIANT_S6000 + depends on XTENSA_VARIANT_S6000 || COMPILE_TEST + depends on HAS_IOMEM + select SND_S6000_SOC_PCM if XTENSA_VARIANT_S6000 help Say Y or M if you want to add support for codecs attached to s6000 family chips. You will also need to select the platform to support below. +config SND_S6000_SOC_PCM + tristate + config SND_S6000_SOC_I2S tristate config SND_S6000_SOC_S6IPCAM tristate "SoC Audio support for Stretch 6105 IP Camera" - depends on SND_S6000_SOC && XTENSA_PLATFORM_S6105 + depends on SND_S6000_SOC + depends on XTENSA_PLATFORM_S6105 || COMPILE_TEST select SND_S6000_SOC_I2S select SND_SOC_TLV320AIC3X help diff --git a/sound/soc/s6000/Makefile b/sound/soc/s6000/Makefile index 7a613612e010..0f0ae2a012aa 100644 --- a/sound/soc/s6000/Makefile +++ b/sound/soc/s6000/Makefile @@ -2,7 +2,7 @@ snd-soc-s6000-objs := s6000-pcm.o snd-soc-s6000-i2s-objs := s6000-i2s.o -obj-$(CONFIG_SND_S6000_SOC) += snd-soc-s6000.o +obj-$(CONFIG_SND_S6000_SOC_PCM) += snd-soc-s6000.o obj-$(CONFIG_SND_S6000_SOC_I2S) += snd-soc-s6000-i2s.o # s6105 Machine Support diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 0b21d1dc80c1..50875e66a0a3 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c @@ -19,8 +19,6 @@ #include <sound/pcm.h> #include <sound/soc.h> -#include <variant/dmac.h> - #include "s6000-pcm.h" #include "s6000-i2s.h" |