Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tegra', 'asoc/topic...

[karo-tx-linux.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 99b34a97499fe5b8ae5be34156d9dbcef5460c07..4e984e15358f4866534e4026e29eed7a439097ab 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -50,7 +50,8 @@ config SND_SOC_ALL_CODECS
        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_CS4271_I2C if I2C
+       select SND_SOC_CS4271_SPI if SPI_MASTER
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if I2C
@@ -85,7 +86,7 @@ config SND_SOC_ALL_CODECS
        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_RT5677 if I2C && SPI_MASTER
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
        select SND_SOC_SIRF_AUDIO_CODEC
@@ -224,6 +225,7 @@ config SND_SOC_AD193X_I2C
        select SND_SOC_AD193X
 
 config SND_SOC_AD1980
+       select REGMAP_AC97
        tristate
 
 config SND_SOC_AD73311
@@ -337,7 +339,8 @@ config SND_SOC_CS42L51
        tristate
 
 config SND_SOC_CS42L51_I2C
-       tristate
+       tristate "Cirrus Logic CS42L51 CODEC (I2C)"
+       depends on I2C
        select SND_SOC_CS42L51
 
 config SND_SOC_CS42L52
@@ -371,8 +374,19 @@ config SND_SOC_CS4270_VD33_ERRATA
        depends on SND_SOC_CS4270
 
 config SND_SOC_CS4271
-       tristate "Cirrus Logic CS4271 CODEC"
-       depends on SND_SOC_I2C_AND_SPI
+       tristate
+
+config SND_SOC_CS4271_I2C
+       tristate "Cirrus Logic CS4271 CODEC (I2C)"
+       depends on I2C
+       select SND_SOC_CS4271
+       select REGMAP_I2C
+
+config SND_SOC_CS4271_SPI
+       tristate "Cirrus Logic CS4271 CODEC (SPI)"
+       depends on SPI_MASTER
+       select SND_SOC_CS4271
+       select REGMAP_SPI
 
 config SND_SOC_CS42XX8
        tristate
@@ -488,7 +502,8 @@ config SND_SOC_RT286
        depends on I2C
 
 config SND_SOC_RT5631
-       tristate
+       tristate "Realtek ALC5631/RT5631 CODEC"
+       depends on I2C
 
 config SND_SOC_RT5640
        tristate
@@ -505,6 +520,10 @@ config SND_SOC_RT5670
 config SND_SOC_RT5677
        tristate
 
+config SND_SOC_RT5677_SPI
+       tristate
+       default SND_SOC_RT5677
+
 #Freescale sgtl5000 codec
 config SND_SOC_SGTL5000
        tristate "Freescale SGTL5000 CODEC"
@@ -586,11 +605,13 @@ config SND_SOC_TLV320AIC23
        tristate
 
 config SND_SOC_TLV320AIC23_I2C
-       tristate
+       tristate "Texas Instruments TLV320AIC23 audio CODEC - I2C"
+       depends on I2C
        select SND_SOC_TLV320AIC23
 
 config SND_SOC_TLV320AIC23_SPI
-       tristate
+       tristate "Texas Instruments TLV320AIC23 audio CODEC - SPI"
+       depends on SPI_MASTER
        select SND_SOC_TLV320AIC23
 
 config SND_SOC_TLV320AIC26