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

Commit 6bd08127 authored by Javier Martin's avatar Javier Martin Committed by Vinod Koul
Browse files

dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c 



It is mainly a simple merge changing the prefix of some
functions to fit the imx-dma namings.

As there are no users of the old dma-v1.c api we can safely
remove this file.

Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent beeaa103

arch/arm/mach-imx/Kconfig

+0 −6
Original line number Diff line number Diff line 
config IMX_HAVE_DMA_V1

	bool



config HAVE_IMX_GPC

	bool
@@ -26,7 +23,6 @@ config SOC_IMX1 
	bool

	select ARCH_MX1

	select CPU_ARM920T

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC
@@ -35,7 +31,6 @@ config SOC_IMX21 
	select MACH_MX21

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC
@@ -52,7 +47,6 @@ config SOC_IMX27 
	select MACH_MX27

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC

arch/arm/mach-imx/Makefile

+0 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o



obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o

arch/arm/mach-imx/dma-v1.c

deleted100644 → 0
+0 −846

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-imx/include/mach/dma-v1.h

deleted100644 → 0
+0 −103

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/dma/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ config IMX_SDMA 


config IMX_DMA

	tristate "i.MX DMA support"

	depends on IMX_HAVE_DMA_V1

	select DMA_ENGINE

	help

	  Support the i.MX DMA engine. This engine is integrated into