Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f0e8401..685168d 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -39,8 +39,9 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
-       select SND_SOC_CS42L51 if I2C
-       select SND_SOC_CS42L52 if I2C
+       select SND_SOC_CS42L51_I2C if I2C
+       select SND_SOC_CS42L52 if I2C && INPUT
+       select SND_SOC_CS42L56 if I2C && INPUT
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
@@ -80,6 +81,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_SSM2602_SPI if SPI_MASTER
        select SND_SOC_SSM2602_I2C if I2C
        select SND_SOC_STA32X if I2C
+       select SND_SOC_STA350 if I2C
        select SND_SOC_STA529 if I2C
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TAS5086 if I2C
@@ -127,7 +129,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8955 if I2C
        select SND_SOC_WM8960 if I2C
        select SND_SOC_WM8961 if I2C
-       select SND_SOC_WM8962 if I2C
+       select SND_SOC_WM8962 if I2C && INPUT
        select SND_SOC_WM8971 if I2C
        select SND_SOC_WM8974 if I2C
        select SND_SOC_WM8978 if I2C
@@ -269,7 +271,7 @@ config SND_SOC_AK5386
        tristate "AKM AK5638 CODEC"
 
 config SND_SOC_ALC5623
-       tristate
+       tristate "Realtek ALC5623 CODEC"
 
 config SND_SOC_ALC5632
        tristate
@@ -280,9 +282,17 @@ config SND_SOC_CQ0093VC
 config SND_SOC_CS42L51
        tristate
 
+config SND_SOC_CS42L51_I2C
+       tristate
+       select SND_SOC_CS42L51
+
 config SND_SOC_CS42L52
        tristate "Cirrus Logic CS42L52 CODEC"
-       depends on I2C
+       depends on I2C && INPUT
+
+config SND_SOC_CS42L56
+       tristate "Cirrus Logic CS42L56 CODEC"
+       depends on I2C && INPUT
 
 config SND_SOC_CS42L73
        tristate "Cirrus Logic CS42L73 CODEC"
@@ -435,6 +445,10 @@ config SND_SOC_SSM2602_I2C
 config SND_SOC_STA32X
        tristate
 
+config SND_SOC_STA350
+       tristate "STA350 speaker amplifier"
+       depends on I2C
+
 config SND_SOC_STA529
        tristate
 
@@ -598,7 +612,7 @@ config SND_SOC_WM8961
 
 config SND_SOC_WM8962
        tristate "Wolfson Microelectronics WM8962 CODEC"
-       depends on I2C
+       depends on I2C && INPUT
 
 config SND_SOC_WM8971
        tristate