Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/adsp', 'asoc/topic...

[linux-beck.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index cfdafc4c11ea9a64c465eef6d9ac4ed3520c159a..efdd0f8e2e9ca7c5ed147e770c700d2edde133f8 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -55,6 +55,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS4271_SPI if SPI_MASTER
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CS4349 if I2C
+       select SND_SOC_CS47L24 if MFD_CS47L24
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
        select SND_SOC_DA7213 if I2C
@@ -85,6 +86,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM1792A if SPI_MASTER
        select SND_SOC_PCM3008
+       select SND_SOC_PCM3168A_I2C if I2C
+       select SND_SOC_PCM3168A_SPI if SPI_MASTER
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_RT286 if I2C
@@ -195,10 +198,12 @@ config SND_SOC_88PM860X
 
 config SND_SOC_ARIZONA
        tristate
+       default y if SND_SOC_CS47L24=y
        default y if SND_SOC_WM5102=y
        default y if SND_SOC_WM5110=y
        default y if SND_SOC_WM8997=y
        default y if SND_SOC_WM8998=y
+       default m if SND_SOC_CS47L24=m
        default m if SND_SOC_WM5102=m
        default m if SND_SOC_WM5110=m
        default m if SND_SOC_WM8997=m
@@ -211,9 +216,12 @@ config SND_SOC_WM_HUBS
 
 config SND_SOC_WM_ADSP
        tristate
+       select SND_SOC_COMPRESS
+       default y if SND_SOC_CS47L24=y
        default y if SND_SOC_WM5102=y
        default y if SND_SOC_WM5110=y
        default y if SND_SOC_WM2200=y
+       default m if SND_SOC_CS47L24=m
        default m if SND_SOC_WM5102=m
        default m if SND_SOC_WM5110=m
        default m if SND_SOC_WM2200=m
@@ -422,6 +430,9 @@ config SND_SOC_CS4349
        tristate "Cirrus Logic CS4349 CODEC"
        depends on I2C
 
+config SND_SOC_CS47L24
+       tristate
+
 config SND_SOC_CX20442
        tristate
        depends on TTY
@@ -506,6 +517,21 @@ config SND_SOC_PCM1792A
 config SND_SOC_PCM3008
        tristate
 
+config SND_SOC_PCM3168A
+       tristate
+
+config SND_SOC_PCM3168A_I2C
+       tristate "Texas Instruments PCM3168A CODEC - I2C"
+       depends on I2C
+       select SND_SOC_PCM3168A
+       select REGMAP_I2C
+
+config SND_SOC_PCM3168A_SPI
+       tristate "Texas Instruments PCM3168A CODEC - SPI"
+       depends on SPI_MASTER
+       select SND_SOC_PCM3168A
+       select REGMAP_SPI
+
 config SND_SOC_PCM512x
        tristate