Merge remote-tracking branches 'asoc/topic/ak5386', 'asoc/topic/ak5558', 'asoc/topic...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 2b331f7266abed6c73ed27dfa1f3f7dbd058c961..7f637521dd421c8a12df8cdea8eda444fceb6052 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -35,6 +35,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ADAU7002
        select SND_SOC_ADS117X
        select SND_SOC_AK4104 if SPI_MASTER
+       select SND_SOC_AK4458 if I2C
        select SND_SOC_AK4535 if I2C
        select SND_SOC_AK4554
        select SND_SOC_AK4613 if I2C
@@ -42,6 +43,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
        select SND_SOC_AK5386
+       select SND_SOC_AK5558 if I2C
        select SND_SOC_ALC5623 if I2C
        select SND_SOC_ALC5632 if I2C
        select SND_SOC_BT_SCO
@@ -108,6 +110,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_NAU8825 if I2C
        select SND_SOC_HDMI_CODEC
        select SND_SOC_PCM1681 if I2C
+       select SND_SOC_PCM1789_I2C if I2C
        select SND_SOC_PCM179X_I2C if I2C
        select SND_SOC_PCM179X_SPI if SPI_MASTER
        select SND_SOC_PCM186X_I2C if I2C
@@ -375,6 +378,11 @@ config SND_SOC_AK4104
        tristate "AKM AK4104 CODEC"
        depends on SPI_MASTER
 
+config SND_SOC_AK4458
+       tristate "AKM AK4458 CODEC"
+       depends on I2C
+       select REGMAP_I2C
+
 config SND_SOC_AK4535
        tristate
 
@@ -398,6 +406,11 @@ config SND_SOC_AK4671
 config SND_SOC_AK5386
        tristate "AKM AK5638 CODEC"
 
+config SND_SOC_AK5558
+       tristate "AKM AK5558 CODEC"
+       depends on I2C
+       select REGMAP_I2C
+
 config SND_SOC_ALC5623
        tristate "Realtek ALC5623 CODEC"
        depends on I2C
@@ -650,6 +663,17 @@ config SND_SOC_PCM1681
        tristate "Texas Instruments PCM1681 CODEC"
        depends on I2C
 
+config SND_SOC_PCM1789
+       tristate
+
+config SND_SOC_PCM1789_I2C
+       tristate "Texas Instruments PCM1789 CODEC (I2C)"
+       depends on I2C
+       select SND_SOC_PCM1789
+       help
+         Enable support for Texas Instruments PCM1789 CODEC.
+         Select this if your PCM1789 is connected via an I2C bus.
+
 config SND_SOC_PCM179X
        tristate