Merge tag 'asoc-v5.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 229cc89..4abf37b 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -34,6 +34,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ADAU1977_I2C if I2C
        select SND_SOC_ADAU1701 if I2C
        select SND_SOC_ADAU7002
+       select SND_SOC_ADAU7118_I2C if I2C
+       select SND_SOC_ADAU7118_HW
        select SND_SOC_ADS117X
        select SND_SOC_AK4104 if SPI_MASTER
        select SND_SOC_AK4118 if I2C
@@ -179,6 +181,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
        select SND_SOC_STI_SAS
        select SND_SOC_TAS2552 if I2C
+       select SND_SOC_TAS2562 if I2C
+       select SND_SOC_TAS2770 if I2C
        select SND_SOC_TAS5086 if I2C
        select SND_SOC_TAS571X if I2C
        select SND_SOC_TAS5720 if I2C
@@ -257,16 +261,16 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM9705 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW)
        select SND_SOC_WM9712 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW)
        select SND_SOC_WM9713 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW)
-        help
-          Normally ASoC codec drivers are only built if a machine driver which
-          uses them is also built since they are only usable with a machine
-          driver.  Selecting this option will allow these drivers to be built
-          without an explicit machine driver for test and development purposes.
+       help
+         Normally ASoC codec drivers are only built if a machine driver which
+         uses them is also built since they are only usable with a machine
+         driver.  Selecting this option will allow these drivers to be built
+         without an explicit machine driver for test and development purposes.
 
          Support for the bus types used to access the codecs to be built must
          be selected separately.
 
-          If unsure select "N".
+         If unsure select "N".
 
 config SND_SOC_88PM860X
        tristate
@@ -395,6 +399,33 @@ config SND_SOC_ADAU1977_I2C
 config SND_SOC_ADAU7002
        tristate "Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter"
 
+config SND_SOC_ADAU7118
+       tristate
+
+config SND_SOC_ADAU7118_HW
+       tristate "Analog Devices ADAU7118 8 Channel PDM-to-I2S/TDM Converter - HW Mode"
+       select SND_SOC_ADAU7118
+       help
+         Enable support for the Analog Devices ADAU7118 8 Channel PDM-to-I2S/TDM
+         Converter. In this mode, the device works in standalone mode which
+         means that there is no bus to comunicate with it. Stereo mode is not
+         supported in this mode.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-soc-adau7118-hw.
+
+config SND_SOC_ADAU7118_I2C
+       tristate "Analog Devices ADAU7118 8 Channel PDM-to-I2S/TDM Converter - I2C"
+       depends on I2C
+       select SND_SOC_ADAU7118
+       select REGMAP_I2C
+       help
+         Enable support for the Analog Devices ADAU7118 8 Channel PDM-to-I2S/TDM
+         Converter over I2C. This gives full support over the device.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-soc-adau7118-i2c.
+
 config SND_SOC_ADAV80X
        tristate
 
@@ -478,6 +509,8 @@ config SND_SOC_CQ0093VC
 config SND_SOC_CROS_EC_CODEC
        tristate "codec driver for ChromeOS EC"
        depends on CROS_EC
+       select CRYPTO
+       select CRYPTO_SHA256
        help
          If you say yes here you will get support for the
          ChromeOS Embedded Controller's Audio Codec.
@@ -570,8 +603,8 @@ config SND_SOC_CS42XX8_I2C
 
 # Cirrus Logic CS43130 HiFi DAC
 config SND_SOC_CS43130
-        tristate "Cirrus Logic CS43130 CODEC"
-        depends on I2C
+       tristate "Cirrus Logic CS43130 CODEC"
+       depends on I2C
 
 config SND_SOC_CS4341
        tristate "Cirrus Logic CS4341 CODEC"
@@ -643,19 +676,20 @@ config SND_SOC_L3
        tristate
 
 config SND_SOC_DA7210
-        tristate
+       tristate
 
 config SND_SOC_DA7213
-        tristate
+       tristate "Dialog DA7213 CODEC"
+       depends on I2C
 
 config SND_SOC_DA7218
        tristate
 
 config SND_SOC_DA7219
-        tristate
+       tristate
 
 config SND_SOC_DA732X
-        tristate
+       tristate
 
 config SND_SOC_DA9055
        tristate
@@ -717,7 +751,7 @@ config SND_SOC_INNO_RK3036
        select REGMAP_MMIO
 
 config SND_SOC_ISABELLE
-        tristate
+       tristate
 
 config SND_SOC_LM49453
        tristate
@@ -988,7 +1022,7 @@ config SND_SOC_RT5640
        tristate
 
 config SND_SOC_RT5645
-        tristate
+       tristate
 
 config SND_SOC_RT5651
        tristate
@@ -1104,6 +1138,14 @@ config SND_SOC_TAS2552
        tristate "Texas Instruments TAS2552 Mono Audio amplifier"
        depends on I2C
 
+config SND_SOC_TAS2562
+       tristate "Texas Instruments TAS2562 Mono Audio amplifier"
+       depends on I2C
+
+config SND_SOC_TAS2770
+       tristate "Texas Instruments TAS2770 speaker amplifier"
+       depends on I2C
+
 config SND_SOC_TAS5086
        tristate "Texas Instruments TAS5086 speaker amplifier"
        depends on I2C
@@ -1220,7 +1262,7 @@ config SND_SOC_UDA134X
        tristate
 
 config SND_SOC_UDA1380
-        tristate
+       tristate
        depends on I2C
 
 config SND_SOC_WCD9335
@@ -1348,7 +1390,7 @@ config SND_SOC_WM8904
        depends on I2C
 
 config SND_SOC_WM8940
-        tristate
+       tristate
 
 config SND_SOC_WM8955
        tristate