Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 86b35245e5595673681a7fb66be99ee9ecfac10a..2f45f00e31b024bf758a25087f4f0f8f82708030 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -26,6 +26,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AK4641 if I2C
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
+       select SND_SOC_AK5386
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
@@ -204,6 +205,9 @@ config SND_SOC_AK4642
 config SND_SOC_AK4671
        tristate
 
+config SND_SOC_AK5386
+       tristate
+
 config SND_SOC_ALC5623
        tristate
 config SND_SOC_ALC5632
@@ -328,7 +332,7 @@ config SND_SOC_TLV320AIC23
        tristate
 
 config SND_SOC_TLV320AIC26
-       tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
+       tristate
        depends on SPI
 
 config SND_SOC_TLV320AIC32X4