diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 18:28:21 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 18:28:21 +0200 |
commit | e9e3bdffe38b256f920eacc455d30deba5e97655 (patch) | |
tree | cfa546f6370c117e012c12605da22ce189542127 /sound/soc/s6000/Kconfig | |
parent | f42bb22243d2ae264d721b055f836059fe35321f (diff) | |
parent | ae34a78c430c37c06404f032fb04e51315204281 (diff) | |
download | op-kernel-dev-e9e3bdffe38b256f920eacc455d30deba5e97655.zip op-kernel-dev-e9e3bdffe38b256f920eacc455d30deba5e97655.tar.gz |
Merge tag 'asoc-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.17
This has been a pretty exciting release in terms of the framework, we've
finally got support for multiple CODECs attached to a single DAI link
which has been something there's been interest in as long as I've been
working on ASoC. A big thanks to Benoit and Misael for their work on
this.
Otherwise it's been a fairly standard release for development, including
more componentisation work from Lars-Peter and a good selection of both
CODEC and CPU drivers.
- Support for multiple CODECs attached to a single DAI, enabling
systems with for example multiple DAC/speaker drivers on a single
link, contributed by Benoit Cousson based on work from Misael Lopez
Cruz.
- Support for byte controls larger than 256 bytes based on the use of
TLVs contributed by Omair Mohammed Abdullah.
- More componentisation work from Lars-Peter Clausen.
- The remainder of the conversions of CODEC drivers to params_width()
- Drivers for Cirrus Logic CS4265, Freescale i.MX ASRC blocks, Realtek
RT286 and RT5670, Rockchip RK3xxx I2S controllers and Texas Instruments
TAS2552.
- Lots of updates and fixes, especially to the DaVinci, Intel,
Freescale, Realtek, and rcar drivers.
Diffstat (limited to 'sound/soc/s6000/Kconfig')
-rw-r--r-- | sound/soc/s6000/Kconfig | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sound/soc/s6000/Kconfig b/sound/soc/s6000/Kconfig index c74eb3d..f244a25 100644 --- a/sound/soc/s6000/Kconfig +++ b/sound/soc/s6000/Kconfig @@ -1,17 +1,24 @@ 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 + bool "SoC Audio support for Stretch 6105 IP Camera" + depends on SND_S6000_SOC=y + depends on I2C=y + depends on XTENSA_PLATFORM_S6105 || COMPILE_TEST select SND_S6000_SOC_I2S select SND_SOC_TLV320AIC3X help |