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

Commit 3ad7a42d authored by Matt Porter's avatar Matt Porter Committed by Sekhar Nori
Browse files

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: default avatarMatt Porter <mporter@ti.com>
Acked-by: Chris Ball <cjb@laptop.org> # davinci_mmc.c
Acked-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
[nsekhar@ti.com: dropped davinci sffsdr changes]
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent b464e3cb

arch/arm/Kconfig

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

arch/arm/common/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,3 +17,6 @@ config SHARP_PARAM 


config SHARP_SCOOP

	bool



config TI_PRIV_EDMA

	bool

arch/arm/common/Makefile

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

arch/arm/mach-davinci/dma.c→arch/arm/common/edma.c

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

arch/arm/mach-davinci/Makefile

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