Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index e49e9da7f1f6e41028a0ca832e76e7dce0bc1c01..1957521eabcd906a05db817fcbae69568f845dca 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -49,6 +49,7 @@ config SND_SOC_ALL_CODECS
        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
@@ -89,6 +92,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_MAX9867 if I2C
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
+       select SND_SOC_MAX98927 if I2C
        select SND_SOC_MAX9850 if I2C
        select SND_SOC_MAX9860 if I2C
        select SND_SOC_MAX9768 if I2C
@@ -303,12 +307,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
 
@@ -408,6 +414,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
@@ -516,6 +526,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
 
@@ -525,6 +539,9 @@ 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
 
@@ -588,6 +605,10 @@ config SND_SOC_MAX98925
 config SND_SOC_MAX98926
        tristate
 
+config SND_SOC_MAX98927
+       tristate "Maxim Integrated MAX98927 Speaker Amplifier"
+       depends on I2C
+
 config SND_SOC_MAX9850
        tristate