Merge remote-tracking branches 'asoc/topic/rl6231', 'asoc/topic/rl6347a', 'asoc/topic...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c67667b..69a2f35 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -48,6 +48,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS35L33 if I2C
+       select SND_SOC_CS35L34 if I2C
+       select SND_SOC_CS42L42 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
@@ -83,6 +85,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_MAX98095 if I2C
        select SND_SOC_MAX98357A if GPIOLIB
        select SND_SOC_MAX98371 if I2C
+       select SND_SOC_MAX98504 if I2C
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
@@ -399,6 +402,14 @@ config SND_SOC_CS35L33
        tristate "Cirrus Logic CS35L33 CODEC"
        depends on I2C
 
+config SND_SOC_CS35L34
+       tristate "Cirrus Logic CS35L34 CODEC"
+       depends on I2C
+
+config SND_SOC_CS42L42
+       tristate "Cirrus Logic CS42L42 CODEC"
+       depends on I2C
+
 config SND_SOC_CS42L51
        tristate
 
@@ -581,6 +592,13 @@ config SND_SOC_MAX9860
        depends on I2C
        select REGMAP_I2C
 
+config SND_SOC_MSM8916_WCD_ANALOG
+       tristate "Qualcomm MSM8916 WCD Analog Codec"
+       depends on SPMI || COMPILE_TEST
+
+config SND_SOC_MSM8916_WCD_DIGITAL
+       tristate "Qualcomm MSM8916 WCD DIGITAL Codec"
+
 config SND_SOC_PCM1681
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C
@@ -672,7 +690,6 @@ config SND_SOC_RL6347A
 
 config SND_SOC_RT286
        tristate
-       select SND_SOC_RT5663
        depends on I2C
 
 config SND_SOC_RT298