Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rcar...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 0c9733ecd17f29a040ec3f2a4c7dfab8c59007e7..784468e1cbad196eb8c21c5ca958f5f933539624 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -36,6 +36,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4535 if I2C
        select SND_SOC_AK4554
+       select SND_SOC_AK4613 if I2C
        select SND_SOC_AK4641 if I2C
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
@@ -54,9 +55,12 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_CS4271_SPI if SPI_MASTER
        select SND_SOC_CS42XX8_I2C if I2C
        select SND_SOC_CS4349 if I2C
+       select SND_SOC_CS47L24 if MFD_CS47L24
        select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
        select SND_SOC_DA7213 if I2C
+       select SND_SOC_DA7218 if I2C
+       select SND_SOC_DA7219 if I2C
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DMIC
@@ -64,7 +68,9 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_GTM601
+       select SND_SOC_HDAC_HDMI
        select SND_SOC_ICS43432
+       select SND_SOC_INNO_RK3036
        select SND_SOC_ISABELLE if I2C
        select SND_SOC_JZ4740_CODEC
        select SND_SOC_LM4857 if I2C
@@ -79,10 +85,12 @@ 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_HDMI_CODEC
+       select SND_SOC_NAU8825 if I2C
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM1792A if SPI_MASTER
        select SND_SOC_PCM3008
+       select SND_SOC_PCM3168A_I2C if I2C
+       select SND_SOC_PCM3168A_SPI if SPI_MASTER
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
        select SND_SOC_RT286 if I2C
@@ -171,6 +179,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8996 if I2C
        select SND_SOC_WM8997 if MFD_WM8997
+       select SND_SOC_WM8998 if MFD_WM8998
        select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9090 if I2C
        select SND_SOC_WM9705 if SND_SOC_AC97_BUS
@@ -192,12 +201,16 @@ config SND_SOC_88PM860X
 
 config SND_SOC_ARIZONA
        tristate
+       default y if SND_SOC_CS47L24=y
        default y if SND_SOC_WM5102=y
        default y if SND_SOC_WM5110=y
        default y if SND_SOC_WM8997=y
+       default y if SND_SOC_WM8998=y
+       default m if SND_SOC_CS47L24=m
        default m if SND_SOC_WM5102=m
        default m if SND_SOC_WM5110=m
        default m if SND_SOC_WM8997=m
+       default m if SND_SOC_WM8998=m
 
 config SND_SOC_WM_HUBS
        tristate
@@ -206,9 +219,12 @@ config SND_SOC_WM_HUBS
 
 config SND_SOC_WM_ADSP
        tristate
+       select SND_SOC_COMPRESS
+       default y if SND_SOC_CS47L24=y
        default y if SND_SOC_WM5102=y
        default y if SND_SOC_WM5110=y
        default y if SND_SOC_WM2200=y
+       default m if SND_SOC_CS47L24=m
        default m if SND_SOC_WM5102=m
        default m if SND_SOC_WM5110=m
        default m if SND_SOC_WM2200=m
@@ -319,6 +335,10 @@ config SND_SOC_AK4535
 config SND_SOC_AK4554
        tristate "AKM AK4554 CODEC"
 
+config SND_SOC_AK4613
+       tristate "AKM AK4613 CODEC"
+       depends on I2C
+
 config SND_SOC_AK4641
        tristate
 
@@ -413,6 +433,9 @@ config SND_SOC_CS4349
        tristate "Cirrus Logic CS4349 CODEC"
        depends on I2C
 
+config SND_SOC_CS47L24
+       tristate
+
 config SND_SOC_CX20442
        tristate
        depends on TTY
@@ -430,6 +453,12 @@ config SND_SOC_DA7210
 config SND_SOC_DA7213
         tristate
 
+config SND_SOC_DA7218
+       tristate
+
+config SND_SOC_DA7219
+        tristate
+
 config SND_SOC_DA732X
         tristate
 
@@ -442,9 +471,6 @@ config SND_SOC_BT_SCO
 config SND_SOC_DMIC
        tristate
 
-config SND_SOC_HDMI_CODEC
-       tristate "HDMI stub CODEC"
-
 config SND_SOC_ES8328
        tristate "Everest Semi ES8328 CODEC"
 
@@ -459,9 +485,17 @@ config SND_SOC_ES8328_SPI
 config SND_SOC_GTM601
        tristate 'GTM601 UMTS modem audio codec'
 
+config SND_SOC_HDAC_HDMI
+       tristate
+       select SND_HDA_EXT_CORE
+       select HDMI
+
 config SND_SOC_ICS43432
        tristate
 
+config SND_SOC_INNO_RK3036
+       tristate "Inno codec driver for RK3036 SoC"
+
 config SND_SOC_ISABELLE
         tristate
 
@@ -497,6 +531,21 @@ config SND_SOC_PCM1792A
 config SND_SOC_PCM3008
        tristate
 
+config SND_SOC_PCM3168A
+       tristate
+
+config SND_SOC_PCM3168A_I2C
+       tristate "Texas Instruments PCM3168A CODEC - I2C"
+       depends on I2C
+       select SND_SOC_PCM3168A
+       select REGMAP_I2C
+
+config SND_SOC_PCM3168A_SPI
+       tristate "Texas Instruments PCM3168A CODEC - SPI"
+       depends on SPI_MASTER
+       select SND_SOC_PCM3168A
+       select REGMAP_SPI
+
 config SND_SOC_PCM512x
        tristate
 
@@ -865,6 +914,9 @@ config SND_SOC_WM8996
 config SND_SOC_WM8997
        tristate
 
+config SND_SOC_WM8998
+       tristate
+
 config SND_SOC_WM9081
        tristate
 
@@ -896,6 +948,9 @@ config SND_SOC_MC13783
 config SND_SOC_ML26124
        tristate
 
+config SND_SOC_NAU8825
+       tristate
+
 config SND_SOC_TPA6130A2
        tristate "Texas Instruments TPA6130A2 headphone amplifier"
        depends on I2C