Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c67667bb970f1729db65b027dd8e963b9ee95b7b..9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb 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
@@ -114,6 +117,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_RT5651 if I2C
        select SND_SOC_RT5659 if I2C
        select SND_SOC_RT5660 if I2C
+       select SND_SOC_RT5665 if I2C
        select SND_SOC_RT5663 if I2C
        select SND_SOC_RT5670 if I2C
        select SND_SOC_RT5677 if I2C && SPI_MASTER
@@ -399,6 +403,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 +593,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
@@ -649,6 +668,7 @@ config SND_SOC_RL6231
        default y if SND_SOC_RT5651=y
        default y if SND_SOC_RT5659=y
        default y if SND_SOC_RT5660=y
+       default y if SND_SOC_RT5665=y
        default y if SND_SOC_RT5663=y
        default y if SND_SOC_RT5670=y
        default y if SND_SOC_RT5677=y
@@ -659,6 +679,7 @@ config SND_SOC_RL6231
        default m if SND_SOC_RT5651=m
        default m if SND_SOC_RT5659=m
        default m if SND_SOC_RT5660=m
+       default m if SND_SOC_RT5665=m
        default m if SND_SOC_RT5663=m
        default m if SND_SOC_RT5670=m
        default m if SND_SOC_RT5677=m
@@ -672,7 +693,6 @@ config SND_SOC_RL6347A
 
 config SND_SOC_RT286
        tristate
-       select SND_SOC_RT5663
        depends on I2C
 
 config SND_SOC_RT298
@@ -708,6 +728,9 @@ config SND_SOC_RT5659
 config SND_SOC_RT5660
        tristate
 
+config SND_SOC_RT5665
+       tristate
+
 config SND_SOC_RT5663
        tristate
 
@@ -874,6 +897,7 @@ config SND_SOC_UDA134X
 
 config SND_SOC_UDA1380
         tristate
+       depends on I2C
 
 config SND_SOC_WL1273
        tristate
@@ -914,7 +938,7 @@ config SND_SOC_WM8523
        depends on I2C
 
 config SND_SOC_WM8580
-       tristate "Wolfson Microelectronics WM8523 CODEC"
+       tristate "Wolfson Microelectronics WM8580 and WM8581 CODECs"
        depends on I2C
 
 config SND_SOC_WM8711
@@ -1048,15 +1072,18 @@ config SND_SOC_WM8998
 
 config SND_SOC_WM9081
        tristate
+       depends on I2C
 
 config SND_SOC_WM9090
        tristate
 
 config SND_SOC_WM9705
        tristate
+       select REGMAP_AC97
 
 config SND_SOC_WM9712
        tristate
+       select REGMAP_AC97
 
 config SND_SOC_WM9713
        tristate