Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 685168df04e671359335c4dff9f7a603d672af49..66f4b6ec12cf4731c1d5b223778ea2537f3db11a 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -23,6 +23,10 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AD1980 if SND_SOC_AC97_BUS
        select SND_SOC_AD73311
        select SND_SOC_ADAU1373 if I2C
+       select SND_SOC_ADAU1761_I2C if I2C
+       select SND_SOC_ADAU1761_SPI if SPI
+       select SND_SOC_ADAU1781_I2C if I2C
+       select SND_SOC_ADAU1781_SPI if SPI
        select SND_SOC_ADAV801 if SPI_MASTER
        select SND_SOC_ADAV803 if I2C
        select SND_SOC_ADAU1977_SPI if SPI_MASTER
@@ -72,6 +76,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_RT5631 if I2C
        select SND_SOC_RT5640 if I2C
+       select SND_SOC_RT5645 if I2C
+       select SND_SOC_RT5651 if I2C
        select SND_SOC_SGTL5000 if I2C
        select SND_SOC_SI476X if MFD_SI476X_CORE
        select SND_SOC_SIRF_AUDIO_CODEC
@@ -212,13 +218,45 @@ config SND_SOC_AD1980
 config SND_SOC_AD73311
        tristate
 
+config SND_SOC_ADAU1373
+       tristate
+
 config SND_SOC_ADAU1701
        tristate "Analog Devices ADAU1701 CODEC"
        depends on I2C
        select SND_SOC_SIGMADSP
 
-config SND_SOC_ADAU1373
+config SND_SOC_ADAU17X1
+       tristate
+       select SND_SOC_SIGMADSP
+
+config SND_SOC_ADAU1761
        tristate
+       select SND_SOC_ADAU17X1
+
+config SND_SOC_ADAU1761_I2C
+       tristate
+       select SND_SOC_ADAU1761
+       select REGMAP_I2C
+
+config SND_SOC_ADAU1761_SPI
+       tristate
+       select SND_SOC_ADAU1761
+       select REGMAP_SPI
+
+config SND_SOC_ADAU1781
+       select SND_SOC_ADAU17X1
+       tristate
+
+config SND_SOC_ADAU1781_I2C
+       tristate
+       select SND_SOC_ADAU1781
+       select REGMAP_I2C
+
+config SND_SOC_ADAU1781_SPI
+       tristate
+       select SND_SOC_ADAU1781
+       select REGMAP_SPI
 
 config SND_SOC_ADAU1977
        tristate
@@ -406,6 +444,12 @@ config SND_SOC_RT5631
 config SND_SOC_RT5640
        tristate
 
+config SND_SOC_RT5645
+        tristate
+
+config SND_SOC_RT5651
+       tristate
+
 #Freescale sgtl5000 codec
 config SND_SOC_SGTL5000
        tristate "Freescale SGTL5000 CODEC"