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 cf7d33537468b4fe617bf4d0974bd1f719ef8318..4e984e15358f4866534e4026e29eed7a439097ab 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -102,6 +102,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TAS2552 if I2C
        select SND_SOC_TAS5086 if I2C
+       select SND_SOC_TFA9879 if I2C
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC26 if SPI_MASTER
@@ -596,15 +597,21 @@ config SND_SOC_TAS5086
        tristate "Texas Instruments TAS5086 speaker amplifier"
        depends on I2C
 
+config SND_SOC_TFA9879
+       tristate "NXP Semiconductors TFA9879 amplifier"
+       depends on I2C
+
 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