FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-07 18:14:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM i.MX: dmav1: kill SoC ifdefs

Browse Source 
since we now can include all soc specific headers at once we do not
need the ifdeffery anymore.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-05-09 18:41:35 +02:00
parent db279c1b8d
commit 6b66ef01f5
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/mach-imx/dma-v1.c
View File

@ -475,7 +475,6 @@ void imx_dma_enable(int channel)
imx_dmav1_writel(imx_dmav1_readl(DMA_CCR(channel)) | CCR_CEN | imx_dmav1_writel(imx_dmav1_readl(DMA_CCR(channel)) | CCR_CEN |
CCR_ACRPT, DMA_CCR(channel)); CCR_ACRPT, DMA_CCR(channel));
#ifdef CONFIG_ARCH_MX2
if ((cpu_is_mx21() || cpu_is_mx27()) && if ((cpu_is_mx21() || cpu_is_mx27()) &&
imxdma->sg && imx_dma_hw_chain(imxdma)) { imxdma->sg && imx_dma_hw_chain(imxdma)) {
imxdma->sg = sg_next(imxdma->sg); imxdma->sg = sg_next(imxdma->sg);
@ -487,7 +486,6 @@ void imx_dma_enable(int channel)
DMA_CCR(channel)); DMA_CCR(channel));
} }
} }
#endif
imxdma->in_use = 1; imxdma->in_use = 1;
local_irq_restore(flags); local_irq_restore(flags);
@ -518,7 +516,6 @@ void imx_dma_disable(int channel)
} }
EXPORT_SYMBOL(imx_dma_disable); EXPORT_SYMBOL(imx_dma_disable);
#ifdef CONFIG_ARCH_MX2
static void imx_dma_watchdog(unsigned long chno) static void imx_dma_watchdog(unsigned long chno)
{ {
struct imx_dma_channel *imxdma = &imx_dma_channels[chno]; struct imx_dma_channel *imxdma = &imx_dma_channels[chno];
@ -530,7 +527,6 @@ static void imx_dma_watchdog(unsigned long chno)
if (imxdma->err_handler) if (imxdma->err_handler)
imxdma->err_handler(chno, imxdma->data, IMX_DMA_ERR_TIMEOUT); imxdma->err_handler(chno, imxdma->data, IMX_DMA_ERR_TIMEOUT);
} }
#endif
static irqreturn_t dma_err_handler(int irq, void *dev_id) static irqreturn_t dma_err_handler(int irq, void *dev_id)
{ {
@ -654,10 +650,8 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
{ {
int i, disr; int i, disr;
#ifdef CONFIG_ARCH_MX2
if (cpu_is_mx21() || cpu_is_mx27()) if (cpu_is_mx21() || cpu_is_mx27())
dma_err_handler(irq, dev_id); dma_err_handler(irq, dev_id);
#endif
disr = imx_dmav1_readl(DMA_DISR); disr = imx_dmav1_readl(DMA_DISR);
@ -703,7 +697,6 @@ int imx_dma_request(int channel, const char *name)
imxdma->name = name; imxdma->name = name;
local_irq_restore(flags); /* request_irq() can block */ local_irq_restore(flags); /* request_irq() can block */
#ifdef CONFIG_ARCH_MX2
if (cpu_is_mx21() || cpu_is_mx27()) { if (cpu_is_mx21() || cpu_is_mx27()) {
ret = request_irq(MX2x_INT_DMACH0 + channel, ret = request_irq(MX2x_INT_DMACH0 + channel,
dma_irq_handler, 0, "DMA", NULL); dma_irq_handler, 0, "DMA", NULL);
@ -717,7 +710,6 @@ int imx_dma_request(int channel, const char *name)
imxdma->watchdog.function = &imx_dma_watchdog; imxdma->watchdog.function = &imx_dma_watchdog;
imxdma->watchdog.data = channel; imxdma->watchdog.data = channel;
} }
#endif
return ret; return ret;
} }
@ -744,10 +736,8 @@ void imx_dma_free(int channel)
imx_dma_disable(channel); imx_dma_disable(channel);
imxdma->name = NULL; imxdma->name = NULL;
#ifdef CONFIG_ARCH_MX2
if (cpu_is_mx21() || cpu_is_mx27()) if (cpu_is_mx21() || cpu_is_mx27())
free_irq(MX2x_INT_DMACH0 + channel, NULL); free_irq(MX2x_INT_DMACH0 + channel, NULL);
#endif
local_irq_restore(flags); local_irq_restore(flags);
} }
@ -803,21 +793,13 @@ static int __init imx_dma_init(void)
int ret = 0; int ret = 0;
int i; int i;
#ifdef CONFIG_ARCH_MX1
if (cpu_is_mx1()) if (cpu_is_mx1())
imx_dmav1_baseaddr = MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR); imx_dmav1_baseaddr = MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR);
else else if (cpu_is_mx21())
#endif
#ifdef CONFIG_MACH_MX21
if (cpu_is_mx21())
imx_dmav1_baseaddr = MX21_IO_ADDRESS(MX21_DMA_BASE_ADDR); imx_dmav1_baseaddr = MX21_IO_ADDRESS(MX21_DMA_BASE_ADDR);
else else if (cpu_is_mx27())
#endif
#ifdef CONFIG_MACH_MX27
if (cpu_is_mx27())
imx_dmav1_baseaddr = MX27_IO_ADDRESS(MX27_DMA_BASE_ADDR); imx_dmav1_baseaddr = MX27_IO_ADDRESS(MX27_DMA_BASE_ADDR);
else else
#endif
return 0; return 0;
dma_clk = clk_get(NULL, "dma"); dma_clk = clk_get(NULL, "dma");
@ -828,7 +810,6 @@ static int __init imx_dma_init(void)
/* reset DMA module */ /* reset DMA module */
imx_dmav1_writel(DCR_DRST, DMA_DCR); imx_dmav1_writel(DCR_DRST, DMA_DCR);
#ifdef CONFIG_ARCH_MX1
if (cpu_is_mx1()) { if (cpu_is_mx1()) {
ret = request_irq(MX1_DMA_INT, dma_irq_handler, 0, "DMA", NULL); ret = request_irq(MX1_DMA_INT, dma_irq_handler, 0, "DMA", NULL);
if (ret) { if (ret) {
@ -843,7 +824,7 @@ static int __init imx_dma_init(void)
return ret; return ret;
} }
} }
#endif
/* enable DMA module */ /* enable DMA module */
imx_dmav1_writel(DCR_DEN, DMA_DCR); imx_dmav1_writel(DCR_DEN, DMA_DCR);