Merge remote-tracking branches 'asoc/topic/es7134', 'asoc/topic/es8328', '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..70decab5e9855e91b85b65ee7559a53f55d01a84 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -45,10 +45,11 @@ 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
+       select SND_SOC_CS35L35 if I2C
        select SND_SOC_CS42L42 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
@@ -69,9 +70,11 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_DA7219 if I2C
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
+       select SND_SOC_DIO2125
        select SND_SOC_DMIC
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
+       select SND_SOC_ES7134
        select SND_SOC_GTM601
        select SND_SOC_HDAC_HDMI
        select SND_SOC_ICS43432
@@ -95,6 +98,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
@@ -117,8 +121,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_RT5651 if I2C
        select SND_SOC_RT5659 if I2C
        select SND_SOC_RT5660 if I2C
-       select SND_SOC_RT5665 if I2C
        select SND_SOC_RT5663 if I2C
+       select SND_SOC_RT5665 if I2C
        select SND_SOC_RT5670 if I2C
        select SND_SOC_RT5677 if I2C && SPI_MASTER
        select SND_SOC_SGTL5000 if I2C
@@ -302,12 +306,14 @@ config SND_SOC_ADAU1761
        select SND_SOC_ADAU17X1
 
 config SND_SOC_ADAU1761_I2C
-       tristate
+       tristate "Analog Devices AU1761 CODEC - I2C"
+       depends on I2C
        select SND_SOC_ADAU1761
        select REGMAP_I2C
 
 config SND_SOC_ADAU1761_SPI
-       tristate
+       tristate "Analog Devices AU1761 CODEC - SPI"
+       depends on SPI
        select SND_SOC_ADAU1761
        select REGMAP_SPI
 
@@ -407,6 +413,10 @@ config SND_SOC_CS35L34
        tristate "Cirrus Logic CS35L34 CODEC"
        depends on I2C
 
+config SND_SOC_CS35L35
+       tristate "Cirrus Logic CS35L35 CODEC"
+       depends on I2C
+
 config SND_SOC_CS42L42
        tristate "Cirrus Logic CS42L42 CODEC"
        depends on I2C
@@ -515,6 +525,10 @@ config SND_SOC_DA732X
 config SND_SOC_DA9055
        tristate
 
+config SND_SOC_DIO2125
+       tristate "Dioo DIO2125 Amplifier"
+       select GPIOLIB
+
 config SND_SOC_DMIC
        tristate
 
@@ -524,15 +538,20 @@ config SND_SOC_HDMI_CODEC
        select SND_PCM_IEC958
        select HDMI
 
+config SND_SOC_ES7134
+       tristate "Everest Semi ES7134 CODEC"
+
 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
@@ -668,8 +687,8 @@ config SND_SOC_RL6231
        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_RT5665=y
        default y if SND_SOC_RT5663=y
+       default y if SND_SOC_RT5665=y
        default y if SND_SOC_RT5670=y
        default y if SND_SOC_RT5677=y
        default m if SND_SOC_RT5514=m
@@ -679,8 +698,8 @@ config SND_SOC_RL6231
        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_RT5665=m
        default m if SND_SOC_RT5663=m
+       default m if SND_SOC_RT5665=m
        default m if SND_SOC_RT5670=m
        default m if SND_SOC_RT5677=m
 
@@ -728,10 +747,10 @@ config SND_SOC_RT5659
 config SND_SOC_RT5660
        tristate
 
-config SND_SOC_RT5665
+config SND_SOC_RT5663
        tristate
 
-config SND_SOC_RT5663
+config SND_SOC_RT5665
        tristate
 
 config SND_SOC_RT5670
@@ -1105,6 +1124,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