Commit b5dd60fd authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 001eaa25

sound/soc/s6000/Kconfig

+8 −2
Original line number Original line Diff line number Diff line 
config SND_S6000_SOC

config SND_S6000_SOC

	tristate "SoC Audio for the Stretch s6000 family"

	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

	help

	  Say Y or M if you want to add support for codecs attached to

	  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

	  s6000 family chips. You will also need to select the platform

	  to support below.

	  to support below.





config SND_S6000_SOC_PCM

	tristate



config SND_S6000_SOC_I2S

config SND_S6000_SOC_I2S

	tristate

	tristate





config SND_S6000_SOC_S6IPCAM

config SND_S6000_SOC_S6IPCAM

	tristate "SoC Audio support for Stretch 6105 IP Camera"

	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_S6000_SOC_I2S

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TLV320AIC3X

	help

	help

sound/soc/s6000/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
snd-soc-s6000-objs := s6000-pcm.o

snd-soc-s6000-objs := s6000-pcm.o

snd-soc-s6000-i2s-objs := s6000-i2s.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

obj-$(CONFIG_SND_S6000_SOC_I2S) += snd-soc-s6000-i2s.o





# s6105 Machine Support

# s6105 Machine Support

sound/soc/s6000/s6105-ipcam.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <sound/pcm.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/soc.h>





#include <variant/dmac.h>



#include "s6000-pcm.h"

#include "s6000-pcm.h"

#include "s6000-i2s.h"

#include "s6000-i2s.h"