mirror of
https://github.com/armbian/linux.git
synced 2026-01-06 10:13:00 -08:00
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: Javier Martin <javier.martin@vista-silicon.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
This commit is contained in:
Javier Martin
committed by
Vinod Koul
Vinod Koul
parent
beeaa103ee
commit
6bd081277e
@@ -1,6 +1,3 @@
|
||||
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
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
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
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,103 +0,0 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-imx/include/mach/dma-v1.h
|
||||
*
|
||||
* i.MX DMA registration and IRQ dispatching
|
||||
*
|
||||
* Copyright 2006 Pavel Pisa <pisa@cmp.felk.cvut.cz>
|
||||
* Copyright 2008 Juergen Beisert, <kernel@pengutronix.de>
|
||||
* Copyright 2008 Sascha Hauer, <s.hauer@pengutronix.de>
|
||||
*
|
||||
* 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 program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* 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., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __MACH_DMA_V1_H__
|
||||
#define __MACH_DMA_V1_H__
|
||||
|
||||
#define imx_has_dma_v1() (cpu_is_mx1() || cpu_is_mx21() || cpu_is_mx27())
|
||||
|
||||
#include <mach/dma.h>
|
||||
|
||||
#define IMX_DMA_CHANNELS 16
|
||||
|
||||
#define DMA_MODE_READ 0
|
||||
#define DMA_MODE_WRITE 1
|
||||
#define DMA_MODE_MASK 1
|
||||
|
||||
#define MX1_DMA_REG(offset) MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR + (offset))
|
||||
|
||||
/* DMA Interrupt Mask Register */
|
||||
#define MX1_DMA_DIMR MX1_DMA_REG(0x08)
|
||||
|
||||
/* Channel Control Register */
|
||||
#define MX1_DMA_CCR(x) MX1_DMA_REG(0x8c + ((x) << 6))
|
||||
|
||||
#define IMX_DMA_MEMSIZE_32 (0 << 4)
|
||||
#define IMX_DMA_MEMSIZE_8 (1 << 4)
|
||||
#define IMX_DMA_MEMSIZE_16 (2 << 4)
|
||||
#define IMX_DMA_TYPE_LINEAR (0 << 10)
|
||||
#define IMX_DMA_TYPE_2D (1 << 10)
|
||||
#define IMX_DMA_TYPE_FIFO (2 << 10)
|
||||
|
||||
#define IMX_DMA_ERR_BURST (1 << 0)
|
||||
#define IMX_DMA_ERR_REQUEST (1 << 1)
|
||||
#define IMX_DMA_ERR_TRANSFER (1 << 2)
|
||||
#define IMX_DMA_ERR_BUFFER (1 << 3)
|
||||
#define IMX_DMA_ERR_TIMEOUT (1 << 4)
|
||||
|
||||
int
|
||||
imx_dma_config_channel(int channel, unsigned int config_port,
|
||||
unsigned int config_mem, unsigned int dmareq, int hw_chaining);
|
||||
|
||||
void
|
||||
imx_dma_config_burstlen(int channel, unsigned int burstlen);
|
||||
|
||||
int
|
||||
imx_dma_setup_single(int channel, dma_addr_t dma_address,
|
||||
unsigned int dma_length, unsigned int dev_addr,
|
||||
unsigned int dmamode);
|
||||
|
||||
|
||||
/*
|
||||
* Use this flag as the dma_length argument to imx_dma_setup_sg()
|
||||
* to create an endless running dma loop. The end of the scatterlist
|
||||
* must be linked to the beginning for this to work.
|
||||
*/
|
||||
#define IMX_DMA_LENGTH_LOOP ((unsigned int)-1)
|
||||
|
||||
int
|
||||
imx_dma_setup_sg(int channel, struct scatterlist *sg,
|
||||
unsigned int sgcount, unsigned int dma_length,
|
||||
unsigned int dev_addr, unsigned int dmamode);
|
||||
|
||||
int
|
||||
imx_dma_setup_handlers(int channel,
|
||||
void (*irq_handler) (int, void *),
|
||||
void (*err_handler) (int, void *, int), void *data);
|
||||
|
||||
int
|
||||
imx_dma_setup_progression_handler(int channel,
|
||||
void (*prog_handler) (int, void*, struct scatterlist*));
|
||||
|
||||
void imx_dma_enable(int channel);
|
||||
|
||||
void imx_dma_disable(int channel);
|
||||
|
||||
int imx_dma_request(int channel, const char *name);
|
||||
|
||||
void imx_dma_free(int channel);
|
||||
|
||||
int imx_dma_request_by_prio(const char *name, enum imx_dma_prio prio);
|
||||
|
||||
#endif /* __MACH_DMA_V1_H__ */
|
||||
@@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user