diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/atmel/Kconfig | |
parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
parent | e011143454606de70eba1db5d99454eec0017fdb (diff) | |
download | op-kernel-dev-29dc5dd229dc3130b51df0932e59946fc09d3bd4.zip op-kernel-dev-29dc5dd229dc3130b51df0932e59946fc09d3bd4.tar.gz |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/atmel/Kconfig')
-rw-r--r-- | sound/soc/atmel/Kconfig | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 3fdd87f..e48d38a 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -13,6 +13,7 @@ config SND_ATMEL_SOC_PDC config SND_ATMEL_SOC_DMA tristate depends on SND_ATMEL_SOC + select SND_SOC_GENERIC_DMAENGINE_PCM config SND_ATMEL_SOC_SSC tristate @@ -32,6 +33,26 @@ config SND_AT91_SOC_SAM9G20_WM8731 Say Y if you want to add support for SoC audio on WM8731-based AT91sam9g20 evaluation board. +config SND_ATMEL_SOC_WM8904 + tristate "Atmel ASoC driver for boards using WM8904 codec" + depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC + select SND_ATMEL_SOC_SSC + select SND_ATMEL_SOC_DMA + select SND_SOC_WM8904 + help + Say Y if you want to add support for Atmel ASoC driver for boards using + WM8904 codec. + +config SND_AT91_SOC_SAM9X5_WM8731 + tristate "SoC Audio support for WM8731-based at91sam9x5 board" + depends on ATMEL_SSC && SND_ATMEL_SOC && SOC_AT91SAM9X5 + 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. + config SND_AT91_SOC_AFEB9260 tristate "SoC Audio support for AFEB9260 board" depends on ARCH_AT91 && ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC |