Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[deliverable/linux.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index cf7f169adb124439172fbf91109f7bf597907f63..f0e8401378873721f0e69e7fe338fe00afe29fb5 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -44,6 +44,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
+       select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if I2C
        select SND_SOC_DA7213 if I2C
@@ -72,10 +73,12 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_RT5640 if I2C
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
+       select SND_SOC_SIRF_AUDIO_CODEC
        select SND_SOC_SN95031 if INTEL_SCU_IPC
        select SND_SOC_SPDIF
        select SND_SOC_SSM2518 if I2C
-       select SND_SOC_SSM2602 if SND_SOC_I2C_AND_SPI
+       select SND_SOC_SSM2602_SPI if SPI_MASTER
+       select SND_SOC_SSM2602_I2C if I2C
        select SND_SOC_STA32X if I2C
        select SND_SOC_STA529 if I2C
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
@@ -83,6 +86,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC26 if SPI_MASTER
+       select SND_SOC_TLV320AIC31XX if I2C
        select SND_SOC_TLV320AIC32X4 if I2C
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
@@ -301,6 +305,15 @@ config SND_SOC_CS4271
        tristate "Cirrus Logic CS4271 CODEC"
        depends on SND_SOC_I2C_AND_SPI
 
+config SND_SOC_CS42XX8
+       tristate
+
+config SND_SOC_CS42XX8_I2C
+       tristate "Cirrus Logic CS42448/CS42888 CODEC (I2C)"
+       depends on I2C
+       select SND_SOC_CS42XX8
+       select REGMAP_I2C
+
 config SND_SOC_CX20442
        tristate
        depends on TTY
@@ -395,6 +408,10 @@ config SND_SOC_SIGMADSP
        tristate
        select CRC32
 
+config SND_SOC_SIRF_AUDIO_CODEC
+       tristate "SiRF SoC internal audio codec"
+       select REGMAP_MMIO
+
 config SND_SOC_SN95031
        tristate
 
@@ -407,6 +424,14 @@ config SND_SOC_SSM2518
 config SND_SOC_SSM2602
        tristate
 
+config SND_SOC_SSM2602_SPI
+       select SND_SOC_SSM2602
+       tristate
+
+config SND_SOC_SSM2602_I2C
+       select SND_SOC_SSM2602
+       tristate
+
 config SND_SOC_STA32X
        tristate
 
@@ -435,6 +460,9 @@ config SND_SOC_TLV320AIC26
        tristate
        depends on SPI
 
+config SND_SOC_TLV320AIC31XX
+        tristate
+
 config SND_SOC_TLV320AIC32X4
        tristate