Merge remote-tracking branches 'asoc/topic/max9867', 'asoc/topic/mtk', 'asoc/topic...

[mirror_ubuntu-bionic-kernel.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb..b456d31f7fc1bf2adf82028a68ed6bad0c585fe9 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -45,7 +45,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
        select SND_SOC_BT_SCO
-       select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
+       select SND_SOC_CQ0093VC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS35L33 if I2C
        select SND_SOC_CS35L34 if I2C
@@ -95,6 +95,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
+       select SND_SOC_NAU8540 if I2C
        select SND_SOC_NAU8810 if I2C
        select SND_SOC_NAU8825 if I2C
        select SND_SOC_HDMI_CODEC
@@ -525,14 +526,16 @@ config SND_SOC_HDMI_CODEC
        select HDMI
 
 config SND_SOC_ES8328
-       tristate "Everest Semi ES8328 CODEC"
+       tristate
 
 config SND_SOC_ES8328_I2C
-       tristate
+       tristate "Everest Semi ES8328 CODEC (I2C)"
+       depends on I2C
        select SND_SOC_ES8328
 
 config SND_SOC_ES8328_SPI
-       tristate
+       tristate "Everest Semi ES8328 CODEC (SPI)"
+       depends on SPI_MASTER
        select SND_SOC_ES8328
 
 config SND_SOC_GTM601
@@ -1105,6 +1108,10 @@ config SND_SOC_MC13783
 config SND_SOC_ML26124
        tristate
 
+config SND_SOC_NAU8540
+       tristate "Nuvoton Technology Corporation NAU85L40 CODEC"
+       depends on I2C
+
 config SND_SOC_NAU8810
        tristate "Nuvoton Technology Corporation NAU88C10 CODEC"
        depends on I2C