Merge remote-tracking branches 'asoc/topic/tlv', 'asoc/topic/tlv320aic23', 'asoc...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 0b9571c..8838838 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -47,6 +47,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
        select SND_SOC_CS42L73 if I2C
+       select SND_SOC_CS4265 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
@@ -74,10 +75,12 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_PCM3008
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
+       select SND_SOC_RT286 if I2C
        select SND_SOC_RT5631 if I2C
        select SND_SOC_RT5640 if I2C
        select SND_SOC_RT5645 if I2C
        select SND_SOC_RT5651 if I2C
+       select SND_SOC_RT5670 if I2C
        select SND_SOC_RT5677 if I2C
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
@@ -91,6 +94,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_STA350 if I2C
        select SND_SOC_STA529 if I2C
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
+       select SND_SOC_TAS2552 if I2C
        select SND_SOC_TAS5086 if I2C
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
@@ -338,6 +342,11 @@ config SND_SOC_CS42L73
        tristate "Cirrus Logic CS42L73 CODEC"
        depends on I2C
 
+config SND_SOC_CS4265
+       tristate "Cirrus Logic CS4265 CODEC"
+       depends on I2C
+       select REGMAP_I2C
+
 # Cirrus Logic CS4270 Codec
 config SND_SOC_CS4270
        tristate "Cirrus Logic CS4270 CODEC"
@@ -445,9 +454,16 @@ config SND_SOC_RL6231
        default y if SND_SOC_RT5640=y
        default y if SND_SOC_RT5645=y
        default y if SND_SOC_RT5651=y
+       default y if SND_SOC_RT5670=y
+       default y if SND_SOC_RT5677=y
        default m if SND_SOC_RT5640=m
        default m if SND_SOC_RT5645=m
        default m if SND_SOC_RT5651=m
+       default m if SND_SOC_RT5670=m
+       default m if SND_SOC_RT5677=m
+
+config SND_SOC_RT286
+       tristate
 
 config SND_SOC_RT5631
        tristate
@@ -461,6 +477,9 @@ config SND_SOC_RT5645
 config SND_SOC_RT5651
        tristate
 
+config SND_SOC_RT5670
+       tristate
+
 config SND_SOC_RT5677
        tristate
 
@@ -521,6 +540,10 @@ config SND_SOC_STA529
 config SND_SOC_STAC9766
        tristate
 
+config SND_SOC_TAS2552
+       tristate "Texas Instruments TAS2552 Mono Audio amplifier"
+       depends on I2C
+
 config SND_SOC_TAS5086
        tristate "Texas Instruments TAS5086 speaker amplifier"
        depends on I2C
@@ -541,7 +564,9 @@ config SND_SOC_TLV320AIC26
        depends on SPI
 
 config SND_SOC_TLV320AIC31XX
-        tristate
+       tristate "Texas Instruments TLV320AIC31xx CODECs"
+       depends on I2C
+       select REGMAP_I2C
 
 config SND_SOC_TLV320AIC32X4
        tristate