Merge remote-tracking branches 'asoc/topic/tfa9879', 'asoc/topic/ts3a277e', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c367d11079bc90feec2ad0fa748d7ffc3035faba..a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -214,9 +214,9 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8998 if MFD_WM8998
        select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9090 if I2C
-       select SND_SOC_WM9705 if SND_SOC_AC97_BUS
-       select SND_SOC_WM9712 if SND_SOC_AC97_BUS
-       select SND_SOC_WM9713 if SND_SOC_AC97_BUS
+       select SND_SOC_WM9705 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW)
+       select SND_SOC_WM9712 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW)
+       select SND_SOC_WM9713 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW)
         help
           Normally ASoC codec drivers are only built if a machine driver which
           uses them is also built since they are only usable with a machine
@@ -749,6 +749,10 @@ config SND_SOC_RT5514
 config SND_SOC_RT5514_SPI
        tristate
 
+config SND_SOC_RT5514_SPI_BUILTIN
+       bool # force RT5514_SPI to be built-in to avoid link errors
+       default SND_SOC_RT5514=y && SND_SOC_RT5514_SPI=m
+
 config SND_SOC_RT5616
        tristate "Realtek RT5616 CODEC"
        depends on I2C
@@ -1128,14 +1132,17 @@ config SND_SOC_WM9090
 config SND_SOC_WM9705
        tristate
        select REGMAP_AC97
+       select AC97_BUS_COMPAT if AC97_BUS_NEW
 
 config SND_SOC_WM9712
        tristate
        select REGMAP_AC97
+       select AC97_BUS_COMPAT if AC97_BUS_NEW
 
 config SND_SOC_WM9713
        tristate
        select REGMAP_AC97
+       select AC97_BUS_COMPAT if AC97_BUS_NEW
 
 config SND_SOC_ZX_AUD96P22
        tristate "ZTE ZX AUD96P22 CODEC"