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>

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index c0c2f57a0d6f332b6143c3eaa6850921c1dde485..94ce1c44ff83a7f6eeaeb178e06d7d4bb6bf403f 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -6,6 +6,9 @@ config SND_PCM
        tristate
        select SND_TIMER
 
+config SND_DMAENGINE_PCM
+       bool
+
 config SND_HWDEP
        tristate
 

diff --git a/sound/core/Makefile b/sound/core/Makefile
index 43d4117428ac9d551391f0f89d1edfd3b2665c6b..5e890cfed42363e1aa1b1ebfbfba76d0d16f0326 100644 (file)
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -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/

diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/core/pcm_dmaengine.c
similarity index 100%
rename from sound/soc/soc-dmaengine-pcm.c
rename to sound/core/pcm_dmaengine.c

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 45eeaa9f7fec49f035cf8faa54fdfdb5a8ea9df5..5138b8493051fd54c674fe26ea87d9d5fd1411c6 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -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"

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index bc0261476d7afc78767856683398ec1bd7bc463e..61a64d281905e4b8997bc2ae3eb42ce387de9e7c 100644 (file)
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -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

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 9f5d55e6b17a53d7e50f2a3c392f565b0fb2e014..accd0ff0fbfcbc294326384d68ac5b0d48b79d2f 100644 (file)
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -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

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index b3580946754702b87a883220d547aeee26b04388..4db74a083db1ef792f90dde317ee9e7556eb4e1d 100644 (file)
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -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

diff --git a/sound/soc/spear/Kconfig b/sound/soc/spear/Kconfig
index 3567d73b218ed9273a7b617ae3f91c5411f83cf3..0a53053495f3d39cf6363b2255bfa4ad629c6be0 100644 (file)
--- a/sound/soc/spear/Kconfig
+++ b/sound/soc/spear/Kconfig
@@ -1,6 +1,6 @@
 config SND_SPEAR_SOC
        tristate
-       select SND_SOC_DMAENGINE_PCM
+       select SND_DMAENGINE_PCM
 
 config SND_SPEAR_SPDIF_OUT
        tristate