Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index cf6d401..1cd6ab3 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -32,6 +32,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ADAU1977_SPI if SPI_MASTER
        select SND_SOC_ADAU1977_I2C if I2C
        select SND_SOC_ADAU1701 if I2C
+       select SND_SOC_ADAU7002
        select SND_SOC_ADS117X
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4535 if I2C
@@ -43,8 +44,10 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AK5386
        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_CS35L32 if I2C
+       select SND_SOC_CS35L33 if I2C
        select SND_SOC_CS42L51_I2C if I2C
        select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L56 if I2C && INPUT
@@ -56,6 +59,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CS4349 if I2C
        select SND_SOC_CS47L24 if MFD_CS47L24
+       select SND_SOC_CS53L30 if I2C
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
        select SND_SOC_DA7213 if I2C
@@ -64,7 +68,6 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DMIC
-       select SND_SOC_BT_SCO
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_GTM601
@@ -79,10 +82,12 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_MAX98090 if I2C
        select SND_SOC_MAX98095 if I2C
        select SND_SOC_MAX98357A if GPIOLIB
+       select SND_SOC_MAX98371 if I2C
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
        select SND_SOC_MAX9850 if I2C
+       select SND_SOC_MAX9860 if I2C
        select SND_SOC_MAX9768 if I2C
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
@@ -126,12 +131,14 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_TAS2552 if I2C
        select SND_SOC_TAS5086 if I2C
        select SND_SOC_TAS571X if I2C
+       select SND_SOC_TAS5720 if I2C
        select SND_SOC_TFA9879 if I2C
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC26 if SPI_MASTER
        select SND_SOC_TLV320AIC31XX if I2C
-       select SND_SOC_TLV320AIC32X4 if I2C
+       select SND_SOC_TLV320AIC32X4_I2C if I2C
+       select SND_SOC_TLV320AIC32X4_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
@@ -266,8 +273,12 @@ config SND_SOC_AD1980
 config SND_SOC_AD73311
        tristate
 
+config SND_SOC_ADAU_UTILS
+       tristate
+
 config SND_SOC_ADAU1373
        tristate
+       select SND_SOC_ADAU_UTILS
 
 config SND_SOC_ADAU1701
        tristate "Analog Devices ADAU1701 CODEC"
@@ -277,6 +288,7 @@ config SND_SOC_ADAU1701
 config SND_SOC_ADAU17X1
        tristate
        select SND_SOC_SIGMADSP_REGMAP
+       select SND_SOC_ADAU_UTILS
 
 config SND_SOC_ADAU1761
        tristate
@@ -319,6 +331,9 @@ config SND_SOC_ADAU1977_I2C
        select SND_SOC_ADAU1977
        select REGMAP_I2C
 
+config SND_SOC_ADAU7002
+       tristate "Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter"
+
 config SND_SOC_ADAV80X
        tristate
 
@@ -367,6 +382,9 @@ config SND_SOC_ALC5623
 config SND_SOC_ALC5632
        tristate
 
+config SND_SOC_BT_SCO
+       tristate "Dummy BT SCO codec driver"
+
 config SND_SOC_CQ0093VC
        tristate
 
@@ -374,6 +392,10 @@ config SND_SOC_CS35L32
        tristate "Cirrus Logic CS35L32 CODEC"
        depends on I2C
 
+config SND_SOC_CS35L33
+       tristate "Cirrus Logic CS35L33 CODEC"
+       depends on I2C
+
 config SND_SOC_CS42L51
        tristate
 
@@ -444,6 +466,11 @@ config SND_SOC_CS4349
 config SND_SOC_CS47L24
        tristate
 
+# Cirrus Logic Quad-Channel ADC
+config SND_SOC_CS53L30
+       tristate "Cirrus Logic CS53L30 CODEC"
+       depends on I2C
+
 config SND_SOC_CX20442
        tristate
        depends on TTY
@@ -473,16 +500,14 @@ config SND_SOC_DA732X
 config SND_SOC_DA9055
        tristate
 
-config SND_SOC_BT_SCO
-       tristate
-
 config SND_SOC_DMIC
        tristate
 
 config SND_SOC_HDMI_CODEC
-       tristate
-       select SND_PCM_ELD
-       select SND_PCM_IEC958
+       tristate
+       select SND_PCM_ELD
+       select SND_PCM_IEC958
+       select HDMI
 
 config SND_SOC_ES8328
        tristate "Everest Semi ES8328 CODEC"
@@ -529,6 +554,13 @@ config SND_SOC_MAX98095
 config SND_SOC_MAX98357A
        tristate
 
+config SND_SOC_MAX98371
+       tristate
+
+config SND_SOC_MAX98504
+       tristate "Maxim MAX98504 speaker amplifier"
+       depends on I2C
+
 config SND_SOC_MAX9867
        tristate
 
@@ -541,6 +573,11 @@ config SND_SOC_MAX98926
 config SND_SOC_MAX9850
        tristate
 
+config SND_SOC_MAX9860
+       tristate "Maxim MAX9860 Mono Audio Voice Codec"
+       depends on I2C
+       select REGMAP_I2C
+
 config SND_SOC_PCM1681
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C
@@ -637,6 +674,9 @@ config SND_SOC_RT298
 config SND_SOC_RT5514
        tristate
 
+config SND_SOC_RT5514_SPI
+       tristate
+
 config SND_SOC_RT5616
        tristate "Realtek RT5616 CODEC"
        depends on I2C
@@ -748,9 +788,16 @@ config SND_SOC_TAS5086
        depends on I2C
 
 config SND_SOC_TAS571X
-       tristate "Texas Instruments TAS5711/TAS5717/TAS5719 power amplifiers"
+       tristate "Texas Instruments TAS5711/TAS5717/TAS5719/TAS5721 power amplifiers"
        depends on I2C
 
+config SND_SOC_TAS5720
+       tristate "Texas Instruments TAS5720 Mono Audio amplifier"
+       depends on I2C
+       help
+         Enable support for Texas Instruments TAS5720L/M high-efficiency mono
+         Class-D audio power amplifiers.
+
 config SND_SOC_TFA9879
        tristate "NXP Semiconductors TFA9879 amplifier"
        depends on I2C
@@ -780,6 +827,16 @@ config SND_SOC_TLV320AIC31XX
 config SND_SOC_TLV320AIC32X4
        tristate
 
+config SND_SOC_TLV320AIC32X4_I2C
+       tristate
+       depends on I2C
+       select SND_SOC_TLV320AIC32X4
+
+config SND_SOC_TLV320AIC32X4_SPI
+       tristate
+       depends on SPI_MASTER
+       select SND_SOC_TLV320AIC32X4
+
 config SND_SOC_TLV320AIC3X
        tristate "Texas Instruments TLV320AIC3x CODECs"
        depends on I2C
@@ -920,7 +977,8 @@ config SND_SOC_WM8955
        tristate
 
 config SND_SOC_WM8960
-       tristate
+       tristate "Wolfson Microelectronics WM8960 CODEC"
+       depends on I2C
 
 config SND_SOC_WM8961
        tristate