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>
author: Matt Porter <mporter@ti.com> 2013-03-06 11:15:31 -0500
committer: Sekhar Nori <nsekhar@ti.com> 2013-06-18 01:22:03 -0400
commit: 3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c (patch)
tree: 1b2684a334fadc060b3acc1dc4963b935031d1b9
parent: b464e3cb294518c8705425335338957bc291d019 (diff)
22 files changed, 29 insertions, 103 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 49d993cee512..b1c66a48a454 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -840,6 +840,7 @@ config ARCH_DAVINCI
        select GENERIC_IRQ_CHIP
        select HAVE_IDE
        select NEED_MACH_GPIO_H
+        select TI_PRIV_EDMA
        select USE_OF
        select ZONE_DMA
        help
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 9353184d730d..c3a4e9ceba34 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -17,3 +17,6 @@ config SHARP_PARAM
 config SHARP_SCOOP
        bool
+config TI_PRIV_EDMA
+        bool
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 48434cbe3e89..8c60f473e976 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -16,3 +16,4 @@ obj-$(CONFIG_ARM_TIMER_SP804)	+= timer-sp.o
 obj-$(CONFIG_MCPM)              += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
 AFLAGS_mcpm_head.o              := -march=armv7-a
 AFLAGS_vlock.o                  := -march=armv7-a
+obj-$(CONFIG_TI_PRIV_EDMA)      += edma.o
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/common/edma.c
index 45b7c71d9cc1..dcaeb8ec5d38 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/common/edma.c
@@ -25,7 +25,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
-#include <mach/edma.h>
+#include <linux/platform_data/edma.h>
 /* Offsets matching "struct edmacc_param" */
 #define PARM_OPT                0x00
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index dd1ffccc75e9..63997a1128e6 100644
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -5,7 +5,7 @@
 # Common objects
 obj-y                   := time.o clock.o serial.o psc.o \
-                           dma.o usb.o common.o sram.o aemif.o
+                           usb.o common.o sram.o aemif.o
 obj-$(CONFIG_DAVINCI_MUX)               += mux.o
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index ba798370fc96..78ea395d2aca 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -26,12 +26,12 @@
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
+#include <linux/platform_data/edma.h>
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 #include <mach/irqs.h>
-#include <mach/edma.h>
 #include <mach/mux.h>
 #include <mach/cp_intc.h>
 #include <mach/tnetv107x.h>
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index b4b7451a8434..a883043d0820 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -23,9 +23,9 @@
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/platform_data/davinci_asp.h>
+#include <linux/platform_data/edma.h>
 #include <linux/platform_data/keyscan-davinci.h>
 #include <mach/hardware.h>
-#include <mach/edma.h>
 #include <media/davinci/vpfe_capture.h>
 #include <media/davinci/vpif_types.h>
diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c
index cfb194df18ed..612a0856e9c5 100644
--- a/arch/arm/mach-davinci/devices-tnetv107x.c
+++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -18,10 +18,10 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
+#include <linux/platform_data/edma.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
-#include <mach/edma.h>
 #include <mach/tnetv107x.h>
 #include "clock.h"
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index a7068a3aa9d3..90b83d00fe2b 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -19,9 +19,10 @@
 #include <mach/irqs.h>
 #include <mach/cputype.h>
 #include <mach/mux.h>
-#include <mach/edma.h>
 #include <linux/platform_data/mmc-davinci.h>
 #include <mach/time.h>
+#include <linux/platform_data/edma.h>
 #include "davinci.h"
 #include "clock.h"
@@ -34,6 +35,9 @@
 #define DM365_MMCSD0_BASE            0x01D11000
 #define DM365_MMCSD1_BASE            0x01D00000
+#define DAVINCI_DMA_MMCRXEVT    26
+#define DAVINCI_DMA_MMCTXEVT    27
 void __iomem  *davinci_sysmod_base;
 void davinci_map_sysmod(void)
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index a11034a358f1..526cf7d06d0e 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -19,7 +19,6 @@
 #include <asm/mach/map.h>
 #include <mach/cputype.h>
-#include <mach/edma.h>
 #include <mach/psc.h>
 #include <mach/mux.h>
 #include <mach/irqs.h>
@@ -28,6 +27,7 @@
 #include <mach/common.h>
 #include <linux/platform_data/spi-davinci.h>
 #include <mach/gpio-davinci.h>
+#include <linux/platform_data/edma.h>
 #include "davinci.h"
 #include "clock.h"
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 40fa4fee9331..c4b741173c06 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -18,11 +18,11 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/spi/spi.h>
+#include <linux/platform_data/edma.h>
 #include <asm/mach/map.h>
 #include <mach/cputype.h>
-#include <mach/edma.h>
 #include <mach/psc.h>
 #include <mach/mux.h>
 #include <mach/irqs.h>
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 4d37d3e2a193..dd156d58fe64 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -12,11 +12,11 @@
 #include <linux/clk.h>
 #include <linux/serial_8250.h>
 #include <linux/platform_device.h>
+#include <linux/platform_data/edma.h>
 #include <asm/mach/map.h>
 #include <mach/cputype.h>
-#include <mach/edma.h>
 #include <mach/irqs.h>
 #include <mach/psc.h>
 #include <mach/mux.h>
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index ac7b431c4c8e..6d52a321a8cf 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -13,11 +13,11 @@
 #include <linux/clk.h>
 #include <linux/serial_8250.h>
 #include <linux/platform_device.h>
+#include <linux/platform_data/edma.h>
 #include <asm/mach/map.h>
 #include <mach/cputype.h>
-#include <mach/edma.h>
 #include <mach/irqs.h>
 #include <mach/psc.h>
 #include <mach/mux.h>
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index faec783b0dc8..3c797e2272f8 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -20,8 +20,8 @@
 #include <linux/videodev2.h>
 #include <mach/serial.h>
-#include <mach/edma.h>
 #include <mach/pm.h>
+#include <linux/platform_data/edma.h>
 #include <linux/platform_data/i2c-davinci.h>
 #include <linux/platform_data/mmc-davinci.h>
 #include <linux/platform_data/usb-davinci.h>
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index cd7e3280fadd..5f3e532436ee 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -24,7 +24,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <mach/edma.h>
+#include <linux/platform_data/edma.h>
 #include "dmaengine.h"
 #include "virt-dma.h"
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 3946a0eb3a03..5dfb70c669dc 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -37,6 +37,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/platform_data/edma.h>
 #include <linux/platform_data/mmc-davinci.h>
 /*
diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h
index 0ab61320ffa8..7dd6524d2aac 100644
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@ -26,8 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
+#include <linux/platform_data/edma.h>
-#include <mach/edma.h>
 /*
 * Register values.
diff --git a/arch/arm/mach-davinci/include/mach/edma.h b/include/linux/platform_data/edma.h
index 7e84c906ceff..2344ea2675ad 100644
--- a/arch/arm/mach-davinci/include/mach/edma.h
+++ b/include/linux/platform_data/edma.h
@@ -1,28 +1,12 @@
 /*
- *  TI DAVINCI dma definitions
+ *  TI EDMA definitions
 *
- *  Copyright (C) 2006-2009 Texas Instruments.
+ *  Copyright (C) 2006-2013 Texas Instruments.
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
 *  Free Software Foundation;  either version 2 of the  License, or (at your
 *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
 */
 /*
@@ -69,11 +53,6 @@ struct edmacc_param {
        unsigned int ccnt;
 };
-#define CCINT0_INTERRUPT     16
-#define CCERRINT_INTERRUPT   17
-#define TCERRINT0_INTERRUPT   18
-#define TCERRINT1_INTERRUPT   19
 /* fields in edmacc_param.opt */
 #define SAM             BIT(0)
 #define DAM             BIT(1)
@@ -87,70 +66,6 @@ struct edmacc_param {
 #define TCCHEN          BIT(22)
 #define ITCCHEN         BIT(23)
-#define TRWORD (0x7<<2)
-#define PAENTRY (0x1ff<<5)
-/* Drivers should avoid using these symbolic names for dm644x
- * channels, and use platform_device IORESOURCE_DMA resources
- * instead.  (Other DaVinci chips have different peripherals
- * and thus have different DMA channel mappings.)
- */
-#define DAVINCI_DMA_MCBSP_TX              2
-#define DAVINCI_DMA_MCBSP_RX              3
-#define DAVINCI_DMA_VPSS_HIST             4
-#define DAVINCI_DMA_VPSS_H3A              5
-#define DAVINCI_DMA_VPSS_PRVU             6
-#define DAVINCI_DMA_VPSS_RSZ              7
-#define DAVINCI_DMA_IMCOP_IMXINT          8
-#define DAVINCI_DMA_IMCOP_VLCDINT         9
-#define DAVINCI_DMA_IMCO_PASQINT         10
-#define DAVINCI_DMA_IMCOP_DSQINT         11
-#define DAVINCI_DMA_SPI_SPIX             16
-#define DAVINCI_DMA_SPI_SPIR             17
-#define DAVINCI_DMA_UART0_URXEVT0        18
-#define DAVINCI_DMA_UART0_UTXEVT0        19
-#define DAVINCI_DMA_UART1_URXEVT1        20
-#define DAVINCI_DMA_UART1_UTXEVT1        21
-#define DAVINCI_DMA_UART2_URXEVT2        22
-#define DAVINCI_DMA_UART2_UTXEVT2        23
-#define DAVINCI_DMA_MEMSTK_MSEVT         24
-#define DAVINCI_DMA_MMCRXEVT             26
-#define DAVINCI_DMA_MMCTXEVT             27
-#define DAVINCI_DMA_I2C_ICREVT           28
-#define DAVINCI_DMA_I2C_ICXEVT           29
-#define DAVINCI_DMA_GPIO_GPINT0          32
-#define DAVINCI_DMA_GPIO_GPINT1          33
-#define DAVINCI_DMA_GPIO_GPINT2          34
-#define DAVINCI_DMA_GPIO_GPINT3          35
-#define DAVINCI_DMA_GPIO_GPINT4          36
-#define DAVINCI_DMA_GPIO_GPINT5          37
-#define DAVINCI_DMA_GPIO_GPINT6          38
-#define DAVINCI_DMA_GPIO_GPINT7          39
-#define DAVINCI_DMA_GPIO_GPBNKINT0       40
-#define DAVINCI_DMA_GPIO_GPBNKINT1       41
-#define DAVINCI_DMA_GPIO_GPBNKINT2       42
-#define DAVINCI_DMA_GPIO_GPBNKINT3       43
-#define DAVINCI_DMA_GPIO_GPBNKINT4       44
-#define DAVINCI_DMA_TIMER0_TINT0         48
-#define DAVINCI_DMA_TIMER1_TINT1         49
-#define DAVINCI_DMA_TIMER2_TINT2         50
-#define DAVINCI_DMA_TIMER3_TINT3         51
-#define DAVINCI_DMA_PWM0                 52
-#define DAVINCI_DMA_PWM1                 53
-#define DAVINCI_DMA_PWM2                 54
-/* DA830 specific EDMA3 information */
-#define EDMA_DA830_NUM_DMACH            32
-#define EDMA_DA830_NUM_TCC              32
-#define EDMA_DA830_NUM_PARAMENTRY       128
-#define EDMA_DA830_NUM_EVQUE            2
-#define EDMA_DA830_NUM_TC               2
-#define EDMA_DA830_CHMAP_EXIST          0
-#define EDMA_DA830_NUM_REGIONS          4
-#define DA830_DMACH2EVENT_MAP0          0x000FC03Fu
-#define DA830_DMACH2EVENT_MAP1          0x00000000u
-#define DA830_EDMA_ARM_OWN              0x30FFCCFFu
 /*ch_status paramater of callback function possible values*/
 #define DMA_COMPLETE 1
 #define DMA_CC_ERROR 2
diff --git a/include/linux/platform_data/spi-davinci.h b/include/linux/platform_data/spi-davinci.h
index 7af305b37868..8dc2fa47a2aa 100644
--- a/include/linux/platform_data/spi-davinci.h
+++ b/include/linux/platform_data/spi-davinci.h
@@ -19,7 +19,7 @@
 #ifndef __ARCH_ARM_DAVINCI_SPI_H
 #define __ARCH_ARM_DAVINCI_SPI_H
-#include <mach/edma.h>
+#include <linux/platform_data/edma.h>
 #define SPI_INTERN_CS   0xFF
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 */
author	Matt Porter <mporter@ti.com>	2013-03-06 11:15:31 -0500
committer	Sekhar Nori <nsekhar@ti.com>	2013-06-18 01:22:03 -0400
commit	3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c (patch)
tree	1b2684a334fadc060b3acc1dc4963b935031d1b9
parent	b464e3cb294518c8705425335338957bc291d019 (diff)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 49d993cee512..b1c66a48a454 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -840,6 +840,7 @@ config ARCH_DAVINCI
840	select GENERIC_IRQ_CHIP	840	select GENERIC_IRQ_CHIP
841	select HAVE_IDE	841	select HAVE_IDE
842	select NEED_MACH_GPIO_H	842	select NEED_MACH_GPIO_H
		843	select TI_PRIV_EDMA
843	select USE_OF	844	select USE_OF
844	select ZONE_DMA	845	select ZONE_DMA
845	help	846	help


diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 9353184d730d..c3a4e9ceba34 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig
@@ -17,3 +17,6 @@ config SHARP_PARAM
17		17
18	config SHARP_SCOOP	18	config SHARP_SCOOP
19	bool	19	bool
		20
		21	config TI_PRIV_EDMA
		22	bool


diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 48434cbe3e89..8c60f473e976 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile
@@ -16,3 +16,4 @@ obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
16	obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o	16	obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
17	AFLAGS_mcpm_head.o := -march=armv7-a	17	AFLAGS_mcpm_head.o := -march=armv7-a
18	AFLAGS_vlock.o := -march=armv7-a	18	AFLAGS_vlock.o := -march=armv7-a
		19	obj-$(CONFIG_TI_PRIV_EDMA) += edma.o


diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/common/edma.c index 45b7c71d9cc1..dcaeb8ec5d38 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/common/edma.c
@@ -25,7 +25,7 @@
25	#include <linux/io.h>	25	#include <linux/io.h>
26	#include <linux/slab.h>	26	#include <linux/slab.h>
27		27
28	#include <mach/edma.h>	28	#include <linux/platform_data/edma.h>
29		29
30	/* Offsets matching "struct edmacc_param" */	30	/* Offsets matching "struct edmacc_param" */
31	#define PARM_OPT 0x00	31	#define PARM_OPT 0x00


diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index dd1ffccc75e9..63997a1128e6 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile
@@ -5,7 +5,7 @@
5		5
6	# Common objects	6	# Common objects
7	obj-y := time.o clock.o serial.o psc.o \	7	obj-y := time.o clock.o serial.o psc.o \
8	dma.o usb.o common.o sram.o aemif.o	8	usb.o common.o sram.o aemif.o
9		9
10	obj-$(CONFIG_DAVINCI_MUX) += mux.o	10	obj-$(CONFIG_DAVINCI_MUX) += mux.o
11		11


diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c index ba798370fc96..78ea395d2aca 100644 --- a/arch/arm/mach-davinci/board-tnetv107x-evm.c +++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -26,12 +26,12 @@
26	#include <linux/input.h>	26	#include <linux/input.h>
27	#include <linux/input/matrix_keypad.h>	27	#include <linux/input/matrix_keypad.h>
28	#include <linux/spi/spi.h>	28	#include <linux/spi/spi.h>
		29	#include <linux/platform_data/edma.h>
29		30
30	#include <asm/mach/arch.h>	31	#include <asm/mach/arch.h>
31	#include <asm/mach-types.h>	32	#include <asm/mach-types.h>
32		33
33	#include <mach/irqs.h>	34	#include <mach/irqs.h>
34	#include <mach/edma.h>
35	#include <mach/mux.h>	35	#include <mach/mux.h>
36	#include <mach/cp_intc.h>	36	#include <mach/cp_intc.h>
37	#include <mach/tnetv107x.h>	37	#include <mach/tnetv107x.h>


diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index b4b7451a8434..a883043d0820 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h
@@ -23,9 +23,9 @@
23	#include <linux/platform_device.h>	23	#include <linux/platform_device.h>
24	#include <linux/spi/spi.h>	24	#include <linux/spi/spi.h>
25	#include <linux/platform_data/davinci_asp.h>	25	#include <linux/platform_data/davinci_asp.h>
		26	#include <linux/platform_data/edma.h>
26	#include <linux/platform_data/keyscan-davinci.h>	27	#include <linux/platform_data/keyscan-davinci.h>
27	#include <mach/hardware.h>	28	#include <mach/hardware.h>
28	#include <mach/edma.h>
29		29
30	#include <media/davinci/vpfe_capture.h>	30	#include <media/davinci/vpfe_capture.h>
31	#include <media/davinci/vpif_types.h>	31	#include <media/davinci/vpif_types.h>


diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c index cfb194df18ed..612a0856e9c5 100644 --- a/arch/arm/mach-davinci/devices-tnetv107x.c +++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -18,10 +18,10 @@
18	#include <linux/dma-mapping.h>	18	#include <linux/dma-mapping.h>
19	#include <linux/clk.h>	19	#include <linux/clk.h>
20	#include <linux/slab.h>	20	#include <linux/slab.h>
		21	#include <linux/platform_data/edma.h>
21		22
22	#include <mach/common.h>	23	#include <mach/common.h>
23	#include <mach/irqs.h>	24	#include <mach/irqs.h>
24	#include <mach/edma.h>
25	#include <mach/tnetv107x.h>	25	#include <mach/tnetv107x.h>
26		26
27	#include "clock.h"	27	#include "clock.h"


diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index a7068a3aa9d3..90b83d00fe2b 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c
@@ -19,9 +19,10 @@
19	#include <mach/irqs.h>	19	#include <mach/irqs.h>
20	#include <mach/cputype.h>	20	#include <mach/cputype.h>
21	#include <mach/mux.h>	21	#include <mach/mux.h>
22	#include <mach/edma.h>
23	#include <linux/platform_data/mmc-davinci.h>	22	#include <linux/platform_data/mmc-davinci.h>
24	#include <mach/time.h>	23	#include <mach/time.h>
		24	#include <linux/platform_data/edma.h>
		25
25		26
26	#include "davinci.h"	27	#include "davinci.h"
27	#include "clock.h"	28	#include "clock.h"
@@ -34,6 +35,9 @@
34	#define DM365_MMCSD0_BASE 0x01D11000	35	#define DM365_MMCSD0_BASE 0x01D11000
35	#define DM365_MMCSD1_BASE 0x01D00000	36	#define DM365_MMCSD1_BASE 0x01D00000
36		37
		38	#define DAVINCI_DMA_MMCRXEVT 26
		39	#define DAVINCI_DMA_MMCTXEVT 27
		40
37	void __iomem *davinci_sysmod_base;	41	void __iomem *davinci_sysmod_base;
38		42
39	void davinci_map_sysmod(void)	43	void davinci_map_sysmod(void)


diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index a11034a358f1..526cf7d06d0e 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c
@@ -19,7 +19,6 @@
19	#include <asm/mach/map.h>	19	#include <asm/mach/map.h>
20		20
21	#include <mach/cputype.h>	21	#include <mach/cputype.h>
22	#include <mach/edma.h>
23	#include <mach/psc.h>	22	#include <mach/psc.h>
24	#include <mach/mux.h>	23	#include <mach/mux.h>
25	#include <mach/irqs.h>	24	#include <mach/irqs.h>
@@ -28,6 +27,7 @@
28	#include <mach/common.h>	27	#include <mach/common.h>
29	#include <linux/platform_data/spi-davinci.h>	28	#include <linux/platform_data/spi-davinci.h>
30	#include <mach/gpio-davinci.h>	29	#include <mach/gpio-davinci.h>
		30	#include <linux/platform_data/edma.h>
31		31
32	#include "davinci.h"	32	#include "davinci.h"
33	#include "clock.h"	33	#include "clock.h"


diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 40fa4fee9331..c4b741173c06 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c
@@ -18,11 +18,11 @@
18	#include <linux/platform_device.h>	18	#include <linux/platform_device.h>
19	#include <linux/dma-mapping.h>	19	#include <linux/dma-mapping.h>
20	#include <linux/spi/spi.h>	20	#include <linux/spi/spi.h>
		21	#include <linux/platform_data/edma.h>
21		22
22	#include <asm/mach/map.h>	23	#include <asm/mach/map.h>
23		24
24	#include <mach/cputype.h>	25	#include <mach/cputype.h>
25	#include <mach/edma.h>
26	#include <mach/psc.h>	26	#include <mach/psc.h>
27	#include <mach/mux.h>	27	#include <mach/mux.h>
28	#include <mach/irqs.h>	28	#include <mach/irqs.h>


diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 4d37d3e2a193..dd156d58fe64 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c
@@ -12,11 +12,11 @@
12	#include <linux/clk.h>	12	#include <linux/clk.h>
13	#include <linux/serial_8250.h>	13	#include <linux/serial_8250.h>
14	#include <linux/platform_device.h>	14	#include <linux/platform_device.h>
		15	#include <linux/platform_data/edma.h>
15		16
16	#include <asm/mach/map.h>	17	#include <asm/mach/map.h>
17		18
18	#include <mach/cputype.h>	19	#include <mach/cputype.h>
19	#include <mach/edma.h>
20	#include <mach/irqs.h>	20	#include <mach/irqs.h>
21	#include <mach/psc.h>	21	#include <mach/psc.h>
22	#include <mach/mux.h>	22	#include <mach/mux.h>


diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index ac7b431c4c8e..6d52a321a8cf 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c
@@ -13,11 +13,11 @@
13	#include <linux/clk.h>	13	#include <linux/clk.h>
14	#include <linux/serial_8250.h>	14	#include <linux/serial_8250.h>
15	#include <linux/platform_device.h>	15	#include <linux/platform_device.h>
		16	#include <linux/platform_data/edma.h>
16		17
17	#include <asm/mach/map.h>	18	#include <asm/mach/map.h>
18		19
19	#include <mach/cputype.h>	20	#include <mach/cputype.h>
20	#include <mach/edma.h>
21	#include <mach/irqs.h>	21	#include <mach/irqs.h>
22	#include <mach/psc.h>	22	#include <mach/psc.h>
23	#include <mach/mux.h>	23	#include <mach/mux.h>


diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index faec783b0dc8..3c797e2272f8 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -20,8 +20,8 @@
20	#include <linux/videodev2.h>	20	#include <linux/videodev2.h>
21		21
22	#include <mach/serial.h>	22	#include <mach/serial.h>
23	#include <mach/edma.h>
24	#include <mach/pm.h>	23	#include <mach/pm.h>
		24	#include <linux/platform_data/edma.h>
25	#include <linux/platform_data/i2c-davinci.h>	25	#include <linux/platform_data/i2c-davinci.h>
26	#include <linux/platform_data/mmc-davinci.h>	26	#include <linux/platform_data/mmc-davinci.h>
27	#include <linux/platform_data/usb-davinci.h>	27	#include <linux/platform_data/usb-davinci.h>


diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index cd7e3280fadd..5f3e532436ee 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c
@@ -24,7 +24,7 @@
24	#include <linux/slab.h>	24	#include <linux/slab.h>
25	#include <linux/spinlock.h>	25	#include <linux/spinlock.h>
26		26
27	#include <mach/edma.h>	27	#include <linux/platform_data/edma.h>
28		28
29	#include "dmaengine.h"	29	#include "dmaengine.h"
30	#include "virt-dma.h"	30	#include "virt-dma.h"


diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 3946a0eb3a03..5dfb70c669dc 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c
@@ -37,6 +37,7 @@
37	#include <linux/of.h>	37	#include <linux/of.h>
38	#include <linux/of_device.h>	38	#include <linux/of_device.h>
39		39
		40	#include <linux/platform_data/edma.h>
40	#include <linux/platform_data/mmc-davinci.h>	41	#include <linux/platform_data/mmc-davinci.h>
41		42
42	/*	43	/*


diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h index 0ab61320ffa8..7dd6524d2aac 100644 --- a/include/linux/mfd/davinci_voicecodec.h +++ b/include/linux/mfd/davinci_voicecodec.h
@@ -26,8 +26,7 @@
26	#include <linux/kernel.h>	26	#include <linux/kernel.h>
27	#include <linux/platform_device.h>	27	#include <linux/platform_device.h>
28	#include <linux/mfd/core.h>	28	#include <linux/mfd/core.h>
29		29	#include <linux/platform_data/edma.h>
30	#include <mach/edma.h>
31		30
32	/*	31	/*
33	* Register values.	32	* Register values.


diff --git a/arch/arm/mach-davinci/include/mach/edma.h b/include/linux/platform_data/edma.h index 7e84c906ceff..2344ea2675ad 100644 --- a/arch/arm/mach-davinci/include/mach/edma.h +++ b/include/linux/platform_data/edma.h
@@ -1,28 +1,12 @@
1	/*	1	/*
2	* TI DAVINCI dma definitions	2	* TI EDMA definitions
3	*	3	*
4	* Copyright (C) 2006-2009 Texas Instruments.	4	* Copyright (C) 2006-2013 Texas Instruments.
5	*	5	*
6	* This program is free software; you can redistribute it and/or modify it	6	* This program is free software; you can redistribute it and/or modify it
7	* under the terms of the GNU General Public License as published by the	7	* under the terms of the GNU General Public License as published by the
8	* Free Software Foundation; either version 2 of the License, or (at your	8	* Free Software Foundation; either version 2 of the License, or (at your
9	* option) any later version.	9	* option) any later version.
10	*
11	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
12	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
13	* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
14	* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
15	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
16	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
17	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
18	* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
19	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
20	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21	*
22	* You should have received a copy of the GNU General Public License along
23	* with this program; if not, write to the Free Software Foundation, Inc.,
24	* 675 Mass Ave, Cambridge, MA 02139, USA.
25	*
26	*/	10	*/
27		11
28	/*	12	/*
@@ -69,11 +53,6 @@ struct edmacc_param {
69	unsigned int ccnt;	53	unsigned int ccnt;
70	};	54	};
71		55
72	#define CCINT0_INTERRUPT 16
73	#define CCERRINT_INTERRUPT 17
74	#define TCERRINT0_INTERRUPT 18
75	#define TCERRINT1_INTERRUPT 19
76
77	/* fields in edmacc_param.opt */	56	/* fields in edmacc_param.opt */
78	#define SAM BIT(0)	57	#define SAM BIT(0)
79	#define DAM BIT(1)	58	#define DAM BIT(1)
@@ -87,70 +66,6 @@ struct edmacc_param {
87	#define TCCHEN BIT(22)	66	#define TCCHEN BIT(22)
88	#define ITCCHEN BIT(23)	67	#define ITCCHEN BIT(23)
89		68
90	#define TRWORD (0x7<<2)
91	#define PAENTRY (0x1ff<<5)
92
93	/* Drivers should avoid using these symbolic names for dm644x
94	* channels, and use platform_device IORESOURCE_DMA resources
95	* instead. (Other DaVinci chips have different peripherals
96	* and thus have different DMA channel mappings.)
97	*/
98	#define DAVINCI_DMA_MCBSP_TX 2
99	#define DAVINCI_DMA_MCBSP_RX 3
100	#define DAVINCI_DMA_VPSS_HIST 4
101	#define DAVINCI_DMA_VPSS_H3A 5
102	#define DAVINCI_DMA_VPSS_PRVU 6
103	#define DAVINCI_DMA_VPSS_RSZ 7
104	#define DAVINCI_DMA_IMCOP_IMXINT 8
105	#define DAVINCI_DMA_IMCOP_VLCDINT 9
106	#define DAVINCI_DMA_IMCO_PASQINT 10
107	#define DAVINCI_DMA_IMCOP_DSQINT 11
108	#define DAVINCI_DMA_SPI_SPIX 16
109	#define DAVINCI_DMA_SPI_SPIR 17
110	#define DAVINCI_DMA_UART0_URXEVT0 18
111	#define DAVINCI_DMA_UART0_UTXEVT0 19
112	#define DAVINCI_DMA_UART1_URXEVT1 20
113	#define DAVINCI_DMA_UART1_UTXEVT1 21
114	#define DAVINCI_DMA_UART2_URXEVT2 22
115	#define DAVINCI_DMA_UART2_UTXEVT2 23
116	#define DAVINCI_DMA_MEMSTK_MSEVT 24
117	#define DAVINCI_DMA_MMCRXEVT 26
118	#define DAVINCI_DMA_MMCTXEVT 27
119	#define DAVINCI_DMA_I2C_ICREVT 28
120	#define DAVINCI_DMA_I2C_ICXEVT 29
121	#define DAVINCI_DMA_GPIO_GPINT0 32
122	#define DAVINCI_DMA_GPIO_GPINT1 33
123	#define DAVINCI_DMA_GPIO_GPINT2 34
124	#define DAVINCI_DMA_GPIO_GPINT3 35
125	#define DAVINCI_DMA_GPIO_GPINT4 36
126	#define DAVINCI_DMA_GPIO_GPINT5 37
127	#define DAVINCI_DMA_GPIO_GPINT6 38
128	#define DAVINCI_DMA_GPIO_GPINT7 39
129	#define DAVINCI_DMA_GPIO_GPBNKINT0 40
130	#define DAVINCI_DMA_GPIO_GPBNKINT1 41
131	#define DAVINCI_DMA_GPIO_GPBNKINT2 42
132	#define DAVINCI_DMA_GPIO_GPBNKINT3 43
133	#define DAVINCI_DMA_GPIO_GPBNKINT4 44
134	#define DAVINCI_DMA_TIMER0_TINT0 48
135	#define DAVINCI_DMA_TIMER1_TINT1 49
136	#define DAVINCI_DMA_TIMER2_TINT2 50
137	#define DAVINCI_DMA_TIMER3_TINT3 51
138	#define DAVINCI_DMA_PWM0 52
139	#define DAVINCI_DMA_PWM1 53
140	#define DAVINCI_DMA_PWM2 54
141
142	/* DA830 specific EDMA3 information */
143	#define EDMA_DA830_NUM_DMACH 32
144	#define EDMA_DA830_NUM_TCC 32
145	#define EDMA_DA830_NUM_PARAMENTRY 128
146	#define EDMA_DA830_NUM_EVQUE 2
147	#define EDMA_DA830_NUM_TC 2
148	#define EDMA_DA830_CHMAP_EXIST 0
149	#define EDMA_DA830_NUM_REGIONS 4
150	#define DA830_DMACH2EVENT_MAP0 0x000FC03Fu
151	#define DA830_DMACH2EVENT_MAP1 0x00000000u
152	#define DA830_EDMA_ARM_OWN 0x30FFCCFFu
153
154	/ch_status paramater of callback function possible values/	69	/ch_status paramater of callback function possible values/
155	#define DMA_COMPLETE 1	70	#define DMA_COMPLETE 1
156	#define DMA_CC_ERROR 2	71	#define DMA_CC_ERROR 2


diff --git a/include/linux/platform_data/spi-davinci.h b/include/linux/platform_data/spi-davinci.h index 7af305b37868..8dc2fa47a2aa 100644 --- a/include/linux/platform_data/spi-davinci.h +++ b/include/linux/platform_data/spi-davinci.h
@@ -19,7 +19,7 @@
19	#ifndef __ARCH_ARM_DAVINCI_SPI_H	19	#ifndef __ARCH_ARM_DAVINCI_SPI_H
20	#define __ARCH_ARM_DAVINCI_SPI_H	20	#define __ARCH_ARM_DAVINCI_SPI_H
21		21
22	#include <mach/edma.h>	22	#include <linux/platform_data/edma.h>
23		23
24	#define SPI_INTERN_CS 0xFF	24	#define SPI_INTERN_CS 0xFF
25		25


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 @@
14	#include <linux/timer.h>	14	#include <linux/timer.h>
15	#include <linux/interrupt.h>	15	#include <linux/interrupt.h>
16	#include <linux/platform_device.h>	16	#include <linux/platform_device.h>
		17	#include <linux/platform_data/edma.h>
17	#include <linux/i2c.h>	18	#include <linux/i2c.h>
18	#include <sound/core.h>	19	#include <sound/core.h>
19	#include <sound/pcm.h>	20	#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 @@
17	#include <linux/dma-mapping.h>	17	#include <linux/dma-mapping.h>
18	#include <linux/kernel.h>	18	#include <linux/kernel.h>
19	#include <linux/genalloc.h>	19	#include <linux/genalloc.h>
		20	#include <linux/platform_data/edma.h>
20		21
21	#include <sound/core.h>	22	#include <sound/core.h>
22	#include <sound/pcm.h>	23	#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 @@
14		14
15	#include <linux/genalloc.h>	15	#include <linux/genalloc.h>
16	#include <linux/platform_data/davinci_asp.h>	16	#include <linux/platform_data/davinci_asp.h>
17	#include <mach/edma.h>	17	#include <linux/platform_data/edma.h>
18		18
19	struct davinci_pcm_dma_params {	19	struct davinci_pcm_dma_params {
20	int channel; /* sync dma channel ID */	20	int channel; /* sync dma channel ID */