ALSA: move dmaengine implementation from ASoC to ALSA core
For the PXA DMA rework, we need the generic dmaengine implementation that currently lives in sound/soc for standalone (non-ASoC) AC'97 support. Move it to sound/core, and rename the Kconfig symbol. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
d4e4ab86bc
commit
b7ae6f31d8
|
@ -6,6 +6,9 @@ config SND_PCM
|
|||
tristate
|
||||
select SND_TIMER
|
||||
|
||||
config SND_DMAENGINE_PCM
|
||||
bool
|
||||
|
||||
config SND_HWDEP
|
||||
tristate
|
||||
|
||||
|
|
|
@ -13,6 +13,8 @@ snd-$(CONFIG_SND_JACK) += jack.o
|
|||
snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
|
||||
pcm_memory.o
|
||||
|
||||
snd-pcm-dmaengine-objs := pcm_dmaengine.o
|
||||
|
||||
snd-page-alloc-y := memalloc.o
|
||||
snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
|
||||
|
||||
|
@ -30,6 +32,7 @@ obj-$(CONFIG_SND_TIMER) += snd-timer.o
|
|||
obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o
|
||||
obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
|
||||
obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o
|
||||
obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o
|
||||
obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o
|
||||
|
||||
obj-$(CONFIG_SND_OSSEMUL) += oss/
|
||||
|
|
|
@ -26,12 +26,9 @@ if SND_SOC
|
|||
config SND_SOC_AC97_BUS
|
||||
bool
|
||||
|
||||
config SND_SOC_DMAENGINE_PCM
|
||||
bool
|
||||
|
||||
config SND_SOC_GENERIC_DMAENGINE_PCM
|
||||
bool
|
||||
select SND_SOC_DMAENGINE_PCM
|
||||
select SND_DMAENGINE_PCM
|
||||
|
||||
# All the supported SoCs
|
||||
source "sound/soc/atmel/Kconfig"
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
|
||||
snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o
|
||||
|
||||
ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)
|
||||
snd-soc-core-objs += soc-dmaengine-pcm.o
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)
|
||||
snd-soc-core-objs += soc-generic-dmaengine-pcm.o
|
||||
endif
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
config SND_OMAP_SOC
|
||||
tristate "SoC Audio for the Texas Instruments OMAP chips"
|
||||
depends on ARCH_OMAP && DMA_OMAP
|
||||
select SND_SOC_DMAENGINE_PCM
|
||||
select SND_DMAENGINE_PCM
|
||||
|
||||
config SND_OMAP_SOC_DMIC
|
||||
tristate
|
||||
|
|
|
@ -11,7 +11,7 @@ config SND_PXA2XX_SOC
|
|||
config SND_MMP_SOC
|
||||
bool "Soc Audio for Marvell MMP chips"
|
||||
depends on ARCH_MMP
|
||||
select SND_SOC_DMAENGINE_PCM
|
||||
select SND_DMAENGINE_PCM
|
||||
select SND_ARM
|
||||
help
|
||||
Say Y if you want to add support for codecs attached to
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
config SND_SPEAR_SOC
|
||||
tristate
|
||||
select SND_SOC_DMAENGINE_PCM
|
||||
select SND_DMAENGINE_PCM
|
||||
|
||||
config SND_SPEAR_SPDIF_OUT
|
||||
tristate
|
||||
|
|
Loading…
Reference in a new issue