Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/adav80x', 'asoc...

[firefly-linux-kernel-4.4.55.git] / sound / soc / atmel / Kconfig

diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index e7d08806f3e92d9c98a7c5bfc4fe84d5aead3f5f..c3152072d682d6550224b56b7a058a58d9cdd70e 100644 (file)
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -6,27 +6,22 @@ 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
+       bool
 
 config SND_ATMEL_SOC_DMA
-       tristate
-       depends on SND_ATMEL_SOC
+       bool
        select SND_SOC_GENERIC_DMAENGINE_PCM
 
 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.
 
 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
+       depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
        select SND_ATMEL_SOC_PDC
        select SND_ATMEL_SOC_SSC
        select SND_SOC_WM8731
@@ -37,7 +32,7 @@ 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
+       depends on ATMEL_SSC && I2C
        select SND_ATMEL_SOC_SSC
        select SND_ATMEL_SOC_DMA
        select SND_SOC_WM8904
@@ -48,10 +43,11 @@ 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
+       depends on ATMEL_SSC && SND_SOC_I2C_AND_SPI
        select SND_ATMEL_SOC_SSC
        select SND_ATMEL_SOC_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.
+endif