Skip to content

Commit

Permalink
dmaengine: shdma: Enable on SH-Mobile ARM
Browse files Browse the repository at this point in the history
Enable the shdma dmaengine driver on SH-Mobile ARM.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Apr 7, 2010
1 parent b2623a6 commit 927a7c9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/dma/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ config TXX9_DMAC

config SH_DMAE
tristate "Renesas SuperH DMAC support"
depends on SUPERH && SH_DMA
depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
depends on !SH_DMA_API
select DMA_ENGINE
help
Expand Down
8 changes: 4 additions & 4 deletions drivers/dma/shdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ static irqreturn_t sh_dmae_interrupt(int irq, void *data)
return ret;
}

#if defined(CONFIG_CPU_SH4)
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
static irqreturn_t sh_dmae_err(int irq, void *data)
{
struct sh_dmae_device *shdev = (struct sh_dmae_device *)data;
Expand Down Expand Up @@ -1034,7 +1034,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
/* Default transfer size of 32 bytes requires 32-byte alignment */
shdev->common.copy_align = LOG2_DEFAULT_XFER_SIZE;

#if defined(CONFIG_CPU_SH4)
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);

if (!chanirq_res)
Expand All @@ -1059,7 +1059,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)

#else
chanirq_res = errirq_res;
#endif /* CONFIG_CPU_SH4 */
#endif /* CONFIG_CPU_SH4 || CONFIG_ARCH_SHMOBILE */

if (chanirq_res->start == chanirq_res->end &&
!platform_get_resource(pdev, IORESOURCE_IRQ, 1)) {
Expand Down Expand Up @@ -1106,7 +1106,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
chan_probe_err:
sh_dmae_chan_remove(shdev);
eirqres:
#if defined(CONFIG_CPU_SH4)
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)
free_irq(errirq, shdev);
eirq_err:
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/linux/serial_sci.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <linux/serial_core.h>
#ifdef CONFIG_SERIAL_SH_SCI_DMA
#include <asm/dmaengine.h>
#include <linux/sh_dma.h>
#endif

/*
Expand Down

0 comments on commit 927a7c9

Please sign in to comment.