diff options
| author | Matt Porter <mporter@ti.com> | 2013-03-06 20:15:31 +0400 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2013-06-18 09:22:03 +0400 |
| commit | 3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c (patch) | |
| tree | 1b2684a334fadc060b3acc1dc4963b935031d1b9 /sound | |
| parent | b464e3cb294518c8705425335338957bc291d019 (diff) | |
| download | linux-3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c.tar.xz | |
ARM: davinci: move private EDMA API to arm/common
Move mach-davinci/dma.c to common/edma.c so it can be used
by OMAP (specifically AM33xx) as well.
Signed-off-by: Matt Porter <mporter@ti.com>
Acked-by: Chris Ball <cjb@laptop.org> # davinci_mmc.c
Acked-by: Mark Brown <broonie@linaro.org>
Acked-by: Olof Johansson <olof@lixom.net>
[nsekhar@ti.com: dropped davinci sffsdr changes]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/davinci/davinci-evm.c | 1 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 1 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-pcm.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 484b22c5df5d..fd7c45b9ed5a 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -14,6 +14,7 @@ #include <linux/timer.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/platform_data/edma.h> #include <linux/i2c.h> #include <sound/core.h> #include <sound/pcm.h> diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index b2f27c2e5fdc..8460edce1c3b 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -17,6 +17,7 @@ #include <linux/dma-mapping.h> #include <linux/kernel.h> #include <linux/genalloc.h> +#include <linux/platform_data/edma.h> #include <sound/core.h> #include <sound/pcm.h> diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h index b6ef7039dd09..fbb710c76c08 100644 --- a/sound/soc/davinci/davinci-pcm.h +++ b/sound/soc/davinci/davinci-pcm.h @@ -14,7 +14,7 @@ #include <linux/genalloc.h> #include <linux/platform_data/davinci_asp.h> -#include <mach/edma.h> +#include <linux/platform_data/edma.h> struct davinci_pcm_dma_params { int channel; /* sync dma channel ID */ |