Merge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/rt5660', 'asoc/topic...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index b3fd110..c67667b 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -113,6 +113,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_RT5645 if I2C
        select SND_SOC_RT5651 if I2C
        select SND_SOC_RT5659 if I2C
+       select SND_SOC_RT5660 if I2C
+       select SND_SOC_RT5663 if I2C
        select SND_SOC_RT5670 if I2C
        select SND_SOC_RT5677 if I2C && SPI_MASTER
        select SND_SOC_SGTL5000 if I2C
@@ -646,6 +648,8 @@ config SND_SOC_RL6231
        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_RT5660=y
+       default y if SND_SOC_RT5663=y
        default y if SND_SOC_RT5670=y
        default y if SND_SOC_RT5677=y
        default m if SND_SOC_RT5514=m
@@ -654,6 +658,8 @@ config SND_SOC_RL6231
        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_RT5660=m
+       default m if SND_SOC_RT5663=m
        default m if SND_SOC_RT5670=m
        default m if SND_SOC_RT5677=m
 
@@ -666,6 +672,7 @@ config SND_SOC_RL6347A
 
 config SND_SOC_RT286
        tristate
+       select SND_SOC_RT5663
        depends on I2C
 
 config SND_SOC_RT298
@@ -698,6 +705,12 @@ config SND_SOC_RT5651
 config SND_SOC_RT5659
        tristate
 
+config SND_SOC_RT5660
+       tristate
+
+config SND_SOC_RT5663
+       tristate
+
 config SND_SOC_RT5670
        tristate