Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index a9faf37110648dfc096e6a20b1dfb4486cad8528..7f516b6ee15040b4c6f91e4661892482b5b3b35f 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -47,6 +47,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_BT_SCO
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
+       select SND_SOC_CS35L33 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
@@ -58,6 +59,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CS4349 if I2C
        select SND_SOC_CS47L24 if MFD_CS47L24
+       select SND_SOC_CS53L30 if I2C
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
        select SND_SOC_DA7213 if I2C
@@ -85,6 +87,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
        select SND_SOC_MAX9850 if I2C
+       select SND_SOC_MAX9860 if I2C
        select SND_SOC_MAX9768 if I2C
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
@@ -380,7 +383,7 @@ config SND_SOC_ALC5632
        tristate
 
 config SND_SOC_BT_SCO
-       tristate
+       tristate "Dummy BT SCO codec driver"
 
 config SND_SOC_CQ0093VC
        tristate
@@ -389,6 +392,10 @@ config SND_SOC_CS35L32
        tristate "Cirrus Logic CS35L32 CODEC"
        depends on I2C
 
+config SND_SOC_CS35L33
+       tristate "Cirrus Logic CS35L33 CODEC"
+       depends on I2C
+
 config SND_SOC_CS42L51
        tristate
 
@@ -459,6 +466,11 @@ config SND_SOC_CS4349
 config SND_SOC_CS47L24
        tristate
 
+# Cirrus Logic Quad-Channel ADC
+config SND_SOC_CS53L30
+       tristate "Cirrus Logic CS53L30 CODEC"
+       depends on I2C
+
 config SND_SOC_CX20442
        tristate
        depends on TTY
@@ -557,6 +569,11 @@ config SND_SOC_MAX98926
 config SND_SOC_MAX9850
        tristate
 
+config SND_SOC_MAX9860
+       tristate "Maxim MAX9860 Mono Audio Voice Codec"
+       depends on I2C
+       select REGMAP_I2C
+
 config SND_SOC_PCM1681
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C