Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 08433a8..50693c8 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -70,6 +70,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_GTM601
        select SND_SOC_HDAC_HDMI
        select SND_SOC_ICS43432
+       select SND_SOC_INNO_RK3036
        select SND_SOC_ISABELLE if I2C
        select SND_SOC_JZ4740_CODEC
        select SND_SOC_LM4857 if I2C
@@ -86,7 +87,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ML26124 if I2C
        select SND_SOC_NAU8825 if I2C
        select SND_SOC_PCM1681 if I2C
-       select SND_SOC_PCM1792A if SPI_MASTER
+       select SND_SOC_PCM179X if SPI_MASTER
        select SND_SOC_PCM3008
        select SND_SOC_PCM3168A_I2C if I2C
        select SND_SOC_PCM3168A_SPI if SPI_MASTER
@@ -94,10 +95,12 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_RT286 if I2C
        select SND_SOC_RT298 if I2C
+       select SND_SOC_RT5616 if I2C
        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_RT5659 if I2C
        select SND_SOC_RT5670 if I2C
        select SND_SOC_RT5677 if I2C && SPI_MASTER
        select SND_SOC_SGTL5000 if I2C
@@ -492,6 +495,9 @@ config SND_SOC_HDAC_HDMI
 config SND_SOC_ICS43432
        tristate
 
+config SND_SOC_INNO_RK3036
+       tristate "Inno codec driver for RK3036 SoC"
+
 config SND_SOC_ISABELLE
         tristate
 
@@ -520,8 +526,8 @@ config SND_SOC_PCM1681
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C
 
-config SND_SOC_PCM1792A
-       tristate "Texas Instruments PCM1792A CODEC"
+config SND_SOC_PCM179X
+       tristate "Texas Instruments PCM179X CODEC"
        depends on SPI_MASTER
 
 config SND_SOC_PCM3008
@@ -559,14 +565,18 @@ config SND_SOC_PCM512x_SPI
 
 config SND_SOC_RL6231
        tristate
+       default y if SND_SOC_RT5616=y
        default y if SND_SOC_RT5640=y
        default y if SND_SOC_RT5645=y
        default y if SND_SOC_RT5651=y
+       default y if SND_SOC_RT5659=y
        default y if SND_SOC_RT5670=y
        default y if SND_SOC_RT5677=y
+       default m if SND_SOC_RT5616=m
        default m if SND_SOC_RT5640=m
        default m if SND_SOC_RT5645=m
        default m if SND_SOC_RT5651=m
+       default m if SND_SOC_RT5659=m
        default m if SND_SOC_RT5670=m
        default m if SND_SOC_RT5677=m
 
@@ -585,6 +595,9 @@ config SND_SOC_RT298
        tristate
        depends on I2C
 
+config SND_SOC_RT5616
+       tristate
+
 config SND_SOC_RT5631
        tristate "Realtek ALC5631/RT5631 CODEC"
        depends on I2C
@@ -598,6 +611,9 @@ config SND_SOC_RT5645
 config SND_SOC_RT5651
        tristate
 
+config SND_SOC_RT5659
+       tristate
+
 config SND_SOC_RT5670
        tristate
 
@@ -874,7 +890,8 @@ config SND_SOC_WM8971
        tristate
 
 config SND_SOC_WM8974
-       tristate
+       tristate "Wolfson Microelectronics WM8974 codec"
+       depends on I2C
 
 config SND_SOC_WM8978
        tristate "Wolfson Microelectronics WM8978 codec"
@@ -927,6 +944,7 @@ config SND_SOC_WM9712
 
 config SND_SOC_WM9713
        tristate
+       select REGMAP_AC97
 
 # Amp
 config SND_SOC_LM4857