Merge remote-tracking branches 'asoc/topic/tscs42xx', 'asoc/topic/twl4030', 'asoc...

[linux-2.6-block.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index ce3f56bc2ef89898e59ec8c42cadce1e14942498..2b331f7266abed6c73ed27dfa1f3f7dbd058c961 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -161,6 +161,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
+       select SND_SOC_TSCS42XX if I2C
        select SND_SOC_TS3A227E if I2C
        select SND_SOC_TWL4030 if TWL4030_CORE
        select SND_SOC_TWL6040 if TWL6040_CORE
@@ -959,6 +960,13 @@ config SND_SOC_TS3A227E
        tristate "TI Headset/Mic detect and keypress chip"
        depends on I2C
 
+config SND_SOC_TSCS42XX
+       tristate "Tempo Semiconductor TSCS42xx CODEC"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         Add support for Tempo Semiconductor's TSCS42xx audio CODEC.
+
 config SND_SOC_TWL4030
        select MFD_TWL4030_AUDIO
        tristate