These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / atmel / Kconfig

diff --git a/kernel/sound/soc/atmel/Kconfig b/kernel/sound/soc/atmel/Kconfig
index e7d0880..2d30464 100644 (file)
--- a/kernel/sound/soc/atmel/Kconfig
+++ b/kernel/sound/soc/atmel/Kconfig
@@ -6,29 +6,35 @@ config SND_ATMEL_SOC
          the ATMEL SSC interface. You will also need
          to select the audio interfaces to support below.
 
+if SND_ATMEL_SOC
+
 config SND_ATMEL_SOC_PDC
        tristate
-       depends on SND_ATMEL_SOC
+       default m if SND_ATMEL_SOC_SSC_PDC=m && SND_ATMEL_SOC_SSC=m
+       default y if SND_ATMEL_SOC_SSC_PDC=y || (SND_ATMEL_SOC_SSC_PDC=m && SND_ATMEL_SOC_SSC=y)
+
+config SND_ATMEL_SOC_SSC_PDC
+       tristate
 
 config SND_ATMEL_SOC_DMA
        tristate
-       depends on SND_ATMEL_SOC
        select SND_SOC_GENERIC_DMAENGINE_PCM
+       default m if SND_ATMEL_SOC_SSC_DMA=m && SND_ATMEL_SOC_SSC=m
+       default y if SND_ATMEL_SOC_SSC_DMA=y || (SND_ATMEL_SOC_SSC_DMA=m && SND_ATMEL_SOC_SSC=y)
+
+config SND_ATMEL_SOC_SSC_DMA
+       tristate
 
 config SND_ATMEL_SOC_SSC
        tristate
-       depends on SND_ATMEL_SOC
-       help
-         Say Y or M if you want to add support for codecs the
-         ATMEL SSC interface. You will also needs to select the individual
-         machine drivers to support below.
+       default y if SND_ATMEL_SOC_SSC_DMA=y || SND_ATMEL_SOC_SSC_PDC=y
+       default m if SND_ATMEL_SOC_SSC_DMA=m || SND_ATMEL_SOC_SSC_PDC=m
 
 config SND_AT91_SOC_SAM9G20_WM8731
        tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
        depends on ARCH_AT91 || COMPILE_TEST
-       depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI
-       select SND_ATMEL_SOC_PDC
-       select SND_ATMEL_SOC_SSC
+       depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
+       select SND_ATMEL_SOC_SSC_PDC
        select SND_SOC_WM8731
        help
          Say Y if you want to add support for SoC audio on WM8731-based
@@ -37,9 +43,8 @@ config SND_AT91_SOC_SAM9G20_WM8731
 config SND_ATMEL_SOC_WM8904
        tristate "Atmel ASoC driver for boards using WM8904 codec"
        depends on ARCH_AT91 || COMPILE_TEST
-       depends on ATMEL_SSC && SND_ATMEL_SOC && I2C
-       select SND_ATMEL_SOC_SSC
-       select SND_ATMEL_SOC_DMA
+       depends on ATMEL_SSC && I2C
+       select SND_ATMEL_SOC_SSC_DMA
        select SND_SOC_WM8904
        help
          Say Y if you want to add support for Atmel ASoC driver for boards using
@@ -48,10 +53,19 @@ config SND_ATMEL_SOC_WM8904
 config SND_AT91_SOC_SAM9X5_WM8731
        tristate "SoC Audio support for WM8731-based at91sam9x5 board"
        depends on ARCH_AT91 || COMPILE_TEST
-       depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI
-       select SND_ATMEL_SOC_SSC
-       select SND_ATMEL_SOC_DMA
+       depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
+       select SND_ATMEL_SOC_SSC_DMA
        select SND_SOC_WM8731
        help
          Say Y if you want to add support for audio SoC on an
          at91sam9x5 based board that is using WM8731 codec.
+
+config SND_ATMEL_SOC_CLASSD
+       tristate "Atmel ASoC driver for boards using CLASSD"
+       depends on ARCH_AT91 || COMPILE_TEST
+       select SND_ATMEL_SOC_DMA
+       select REGMAP_MMIO
+       help
+         Say Y if you want to add support for Atmel ASoC driver for boards using
+         CLASSD.
+endif