diff options
author | Mark Brown | 2012-12-02 05:34:58 +0100 |
---|---|---|
committer | Mark Brown | 2012-12-02 05:34:58 +0100 |
commit | 3bc324922663bda59af5cdc409e8df3ed217d296 (patch) | |
tree | 1c9c7d527c4fd3383350d54acd7d15b9c5c4f639 /sound/soc/atmel/Kconfig | |
parent | Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next (diff) | |
parent | ASoC: atmel-pcm: dma support based on pcm dmaengine (diff) | |
download | kernel-qcow2-linux-3bc324922663bda59af5cdc409e8df3ed217d296.tar.gz kernel-qcow2-linux-3bc324922663bda59af5cdc409e8df3ed217d296.tar.xz kernel-qcow2-linux-3bc324922663bda59af5cdc409e8df3ed217d296.zip |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'sound/soc/atmel/Kconfig')
-rw-r--r-- | sound/soc/atmel/Kconfig | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 72b09cfd3dc3..d1b691bf8e2d 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -6,6 +6,14 @@ config SND_ATMEL_SOC the ATMEL SSC interface. You will also need to select the audio interfaces to support below. +config SND_ATMEL_SOC_PDC + tristate + depends on SND_ATMEL_SOC + +config SND_ATMEL_SOC_DMA + tristate + depends on SND_ATMEL_SOC + config SND_ATMEL_SOC_SSC tristate depends on SND_ATMEL_SOC @@ -16,8 +24,8 @@ config SND_ATMEL_SOC_SSC config SND_AT91_SOC_SAM9G20_WM8731 tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" - depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \ - AT91_PROGRAMMABLE_CLOCKS + depends on ATMEL_SSC && SND_ATMEL_SOC && AT91_PROGRAMMABLE_CLOCKS + select SND_ATMEL_SOC_PDC select SND_ATMEL_SOC_SSC select SND_SOC_WM8731 help @@ -27,6 +35,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 config SND_AT91_SOC_AFEB9260 tristate "SoC Audio support for AFEB9260 board" depends on ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC + select SND_ATMEL_SOC_PDC select SND_ATMEL_SOC_SSC select SND_SOC_TLV320AIC23 help |