Merge remote-tracking branches 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 6c78b0b49b8145c24740d93c4174c059d91ddae9..c367d11079bc90feec2ad0fa748d7ffc3035faba 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -60,6 +60,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS4271_I2C if I2C
        select SND_SOC_CS4271_SPI if SPI_MASTER
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CS4271_I2C if I2C
        select SND_SOC_CS4271_SPI if SPI_MASTER
        select SND_SOC_CS42XX8_I2C if I2C

+       select SND_SOC_CS43130 if I2C

        select SND_SOC_CS4349 if I2C
        select SND_SOC_CS47L24 if MFD_CS47L24
        select SND_SOC_CS53L30 if I2C
        select SND_SOC_CS4349 if I2C
        select SND_SOC_CS47L24 if MFD_CS47L24
        select SND_SOC_CS53L30 if I2C


@@ -71,7 +72,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DIO2125
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DIO2125

-       select SND_SOC_DMIC
+       select SND_SOC_DMIC if GPIOLIB

        select SND_SOC_ES8316 if I2C
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_ES8316 if I2C
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C


@@ -114,6 +115,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_PCM5102A
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_PCM5102A
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER

+       select SND_SOC_RT274 if I2C

        select SND_SOC_RT286 if I2C
        select SND_SOC_RT298 if I2C
        select SND_SOC_RT5514 if I2C
        select SND_SOC_RT286 if I2C
        select SND_SOC_RT298 if I2C
        select SND_SOC_RT5514 if I2C


@@ -173,6 +175,7 @@ config SND_SOC_ALL_CODECS
        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_WM8400 if MFD_WM8400
        select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8523 if I2C

+       select SND_SOC_WM8524 if GPIOLIB

        select SND_SOC_WM8580 if I2C
        select SND_SOC_WM8711 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8727
        select SND_SOC_WM8580 if I2C
        select SND_SOC_WM8711 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8727


@@ -486,6 +489,11 @@ config SND_SOC_CS42XX8_I2C
        select SND_SOC_CS42XX8
        select REGMAP_I2C
 
        select SND_SOC_CS42XX8
        select REGMAP_I2C
 

+# Cirrus Logic CS43130 HiFi DAC
+config SND_SOC_CS43130
+        tristate "Cirrus Logic CS43130 CODEC"
+        depends on I2C
+

 # Cirrus Logic CS4349 HiFi DAC
 config SND_SOC_CS4349
        tristate "Cirrus Logic CS4349 CODEC"
 # Cirrus Logic CS4349 HiFi DAC
 config SND_SOC_CS4349
        tristate "Cirrus Logic CS4349 CODEC"


@@ -716,11 +724,17 @@ config SND_SOC_RL6231
 
 config SND_SOC_RL6347A
        tristate
 
 config SND_SOC_RL6347A
        tristate

+       default y if SND_SOC_RT274=y

        default y if SND_SOC_RT286=y
        default y if SND_SOC_RT298=y
        default y if SND_SOC_RT286=y
        default y if SND_SOC_RT298=y

+       default m if SND_SOC_RT274=m

        default m if SND_SOC_RT286=m
        default m if SND_SOC_RT298=m
 
        default m if SND_SOC_RT286=m
        default m if SND_SOC_RT298=m
 

+config SND_SOC_RT274
+       tristate
+       depends on I2C
+

 config SND_SOC_RT286
        tristate
        depends on I2C
 config SND_SOC_RT286
        tristate
        depends on I2C


@@ -967,6 +981,10 @@ config SND_SOC_WM8523
        tristate "Wolfson Microelectronics WM8523 DAC"
        depends on I2C
 
        tristate "Wolfson Microelectronics WM8523 DAC"
        depends on I2C
 

+config SND_SOC_WM8524
+       tristate "Wolfson Microelectronics WM8524 DAC"
+       depends on GPIOLIB
+

 config SND_SOC_WM8580
        tristate "Wolfson Microelectronics WM8580 and WM8581 CODECs"
        depends on I2C
 config SND_SOC_WM8580
        tristate "Wolfson Microelectronics WM8580 and WM8581 CODECs"
        depends on I2C