Merge series "soundwire/ASoC: add mockup codec support" from Bard Liao <yung-chuan...

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 7ebae3f..abeee93 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -187,6 +187,7 @@ config SND_SOC_ALL_CODECS
        imply SND_SOC_RT715_SDCA_SDW
        imply SND_SOC_RT1308_SDW
        imply SND_SOC_RT1316_SDW
+       imply SND_SOC_SDW_MOCKUP
        imply SND_SOC_SGTL5000
        imply SND_SOC_SI476X
        imply SND_SOC_SIMPLE_AMPLIFIER
@@ -1287,6 +1288,23 @@ config SND_SOC_RT715_SDCA_SDW
        select REGMAP_SOUNDWIRE
        select REGMAP_SOUNDWIRE_MBQ
 
+config SND_SOC_SDW_MOCKUP
+       tristate "SoundWire mockup codec"
+       depends on EXPERT
+       depends on SOUNDWIRE
+       help
+         This option enables a SoundWire mockup codec that does not drive the
+         bus, take part in the command/command protocol or generate data on a
+         Source port.
+         This option is only intended to be used for tests on a device
+         with a connector, in combination with a bus analyzer, or to test new
+         topologies that differ from the actual hardware layout.
+         This mockup device could be totally virtual but could also be a
+         real physical one with one key restriction: it is not allowed by the
+         SoundWire specification to be configured via a sideband mechanism and
+         generate audio data for capture. However, nothing prevents such a
+         peripheral device from snooping the bus.
+
 #Freescale sgtl5000 codec
 config SND_SOC_SGTL5000
        tristate "Freescale SGTL5000 CODEC"
@@ -1325,7 +1343,7 @@ config SND_SOC_SSM2305
          high-efficiency mono Class-D audio power amplifiers.
 
 config SND_SOC_SSM2518
-       tristate
+       tristate "Analog Devices SSM2518 Class-D Amplifier"
        depends on I2C
 
 config SND_SOC_SSM2602
@@ -1813,11 +1831,6 @@ config SND_SOC_ZL38060
          which consists of a Digital Signal Processor (DSP), several Digital
          Audio Interfaces (DAIs), analog outputs, and a block of 14 GPIOs.
 
-config SND_SOC_ZX_AUD96P22
-       tristate "ZTE ZX AUD96P22 CODEC"
-       depends on I2C
-       select REGMAP_I2C
-
 # Amp
 config SND_SOC_LM4857
        tristate