Merge branch 'wm8974-upstream' into for-2.6.32

[~andy/linux] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 91daffd30e8bb723df8716641e4d6bc045bf219c..167a5ce06cdf26d4393cd0225afcc9b2ef515c7e 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -12,13 +12,18 @@ config SND_SOC_ALL_CODECS
        tristate "Build all ASoC CODEC drivers"
        select SND_SOC_L3
        select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
+       select SND_SOC_AD1836 if SPI_MASTER
+       select SND_SOC_AD1938 if SPI_MASTER
        select SND_SOC_AD1980 if SND_SOC_AC97_BUS
        select SND_SOC_AD73311 if I2C
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4535 if I2C
        select SND_SOC_CS4270 if I2C
+       select SND_SOC_MAX9877 if I2C
        select SND_SOC_PCM3008
+       select SND_SOC_SPDIF
        select SND_SOC_SSM2602 if I2C
+       select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TLV320AIC23 if I2C
        select SND_SOC_TLV320AIC26 if SPI_MASTER
        select SND_SOC_TLV320AIC3X if I2C
@@ -28,19 +33,23 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8350 if MFD_WM8350
        select SND_SOC_WM8400 if MFD_WM8400
        select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
+       select SND_SOC_WM8523 if I2C
        select SND_SOC_WM8580 if I2C
        select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8753 if SND_SOC_I2C_AND_SPI
+       select SND_SOC_WM8776 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8900 if I2C
        select SND_SOC_WM8903 if I2C
        select SND_SOC_WM8940 if I2C
        select SND_SOC_WM8960 if I2C
+       select SND_SOC_WM8961 if I2C
        select SND_SOC_WM8971 if I2C
        select SND_SOC_WM8974 if I2C
        select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8990 if I2C
+       select SND_SOC_WM8993 if I2C
        select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9705 if SND_SOC_AC97_BUS
        select SND_SOC_WM9712 if SND_SOC_AC97_BUS
@@ -56,11 +65,21 @@ config SND_SOC_ALL_CODECS
 
           If unsure select "N".
 
+config SND_SOC_WM_HUBS
+       tristate
+       default y if SND_SOC_WM8993=y
+       default m if SND_SOC_WM8993=m
 
 config SND_SOC_AC97_CODEC
        tristate
        select SND_AC97_CODEC
 
+config SND_SOC_AD1836
+       tristate
+
+config SND_SOC_AD1938
+       tristate
+
 config SND_SOC_AD1980
        tristate
 
@@ -85,15 +104,24 @@ config SND_SOC_CS4270_VD33_ERRATA
        bool
        depends on SND_SOC_CS4270
 
+config SND_SOC_CX20442
+       tristate
+
 config SND_SOC_L3
        tristate
 
 config SND_SOC_PCM3008
        tristate
 
+config SND_SOC_SPDIF
+       tristate
+
 config SND_SOC_SSM2602
        tristate
 
+config SND_SOC_STAC9766
+       tristate
+
 config SND_SOC_TLV320AIC23
        tristate
 
@@ -122,6 +150,9 @@ config SND_SOC_WM8400
 config SND_SOC_WM8510
        tristate
 
+config SND_SOC_WM8523
+       tristate
+
 config SND_SOC_WM8580
        tristate
 
@@ -137,6 +168,9 @@ config SND_SOC_WM8750
 config SND_SOC_WM8753
        tristate
 
+config SND_SOC_WM8776
+       tristate
+
 config SND_SOC_WM8900
        tristate
 
@@ -149,6 +183,9 @@ config SND_SOC_WM8940
 config SND_SOC_WM8960
        tristate
 
+config SND_SOC_WM8961
+       tristate
+
 config SND_SOC_WM8971
        tristate
 
@@ -161,6 +198,9 @@ config SND_SOC_WM8988
 config SND_SOC_WM8990
        tristate
 
+config SND_SOC_WM8993
+       tristate
+
 config SND_SOC_WM9081
        tristate
 
@@ -172,3 +212,7 @@ config SND_SOC_WM9712
 
 config SND_SOC_WM9713
        tristate
+
+# Amp
+config SND_SOC_MAX9877
+       tristate