Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[cascardo/linux.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index e0b375e..efaafce 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -104,6 +104,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_TAS2552 if I2C
        select SND_SOC_TAS5086 if I2C
+       select SND_SOC_TAS571X if I2C
        select SND_SOC_TFA9879 if I2C
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
@@ -508,6 +509,11 @@ config SND_SOC_RL6231
        default m if SND_SOC_RT5670=m
        default m if SND_SOC_RT5677=m
 
+config SND_SOC_RL6347A
+       tristate
+       default y if SND_SOC_RT286=y
+       default m if SND_SOC_RT286=m
+
 config SND_SOC_RT286
        tristate
        depends on I2C
@@ -612,6 +618,10 @@ config SND_SOC_TAS5086
        tristate "Texas Instruments TAS5086 speaker amplifier"
        depends on I2C
 
+config SND_SOC_TAS571X
+       tristate "Texas Instruments TAS5711/TAS5717/TAS5719 power amplifiers"
+       depends on I2C
+
 config SND_SOC_TFA9879
        tristate "NXP Semiconductors TFA9879 amplifier"
        depends on I2C