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

Commit 2b6b3b74 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

ARM/dmaengine: edma: Merge the two drivers under drivers/dma/ 



Move the code out from arch/arm/common and merge it inside of the dmaengine
driver.
This change is done with as minimal (if eny) functional change to the code
as possible to avoid introducing regression.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent cef5b0da

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ config ARCH_DAVINCI 
	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select TI_PRIV_EDMA

	select USE_OF

	select ZONE_DMA

	help

arch/arm/common/Kconfig

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


config SHARP_SCOOP

	bool
 


config TI_PRIV_EDMA

	bool

arch/arm/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -15,6 +15,5 @@ obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o 
CFLAGS_REMOVE_mcpm_entry.o	= -pg

AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_vlock.o			:= -march=armv7-a

obj-$(CONFIG_TI_PRIV_EDMA)	+= edma.o

obj-$(CONFIG_BL_SWITCHER)	+= bL_switcher.o

obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o

arch/arm/common/edma.c

deleted100644 → 0
+0 −1431

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ config ARCH_OMAP2PLUS 
	select OMAP_GPMC

	select PINCTRL

	select SOC_BUS

	select TI_PRIV_EDMA

	select OMAP_IRQCHIP

	help

	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5