Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7ae6f31 authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

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: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d4e4ab86

sound/core/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ config SND_PCM 
	tristate

	select SND_TIMER



config SND_DMAENGINE_PCM

	bool



config SND_HWDEP

	tristate

sound/core/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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/

sound/soc/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -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"

sound/soc/Makefile

+0 −4
Original line number Diff line number Diff line 
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