diff options
| author | Magnus Damm <damm@opensource.se> | 2010-03-19 04:47:19 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-07 16:17:01 +0900 |
| commit | 927a7c9c1793def3a55d60c926d3945528e6bf1b (patch) | |
| tree | d7ea66aa528c619644522041a553ce64e0e3638e | |
| parent | b2623a61cfd3c6badb8396dc85ab5a70f4a05f61 (diff) | |
| download | kernel_samsung_smdk4412-927a7c9c1793def3a55d60c926d3945528e6bf1b.zip kernel_samsung_smdk4412-927a7c9c1793def3a55d60c926d3945528e6bf1b.tar.gz kernel_samsung_smdk4412-927a7c9c1793def3a55d60c926d3945528e6bf1b.tar.bz2 | |
dmaengine: shdma: Enable on SH-Mobile ARM
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>
| -rw-r--r-- | drivers/dma/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/dma/shdma.c | 8 | ||||
| -rw-r--r-- | include/linux/serial_sci.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index c27f80e..9d8ca99 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -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 diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 7a18b58..bbc3dfe 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c @@ -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; @@ -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) @@ -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)) { @@ -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 diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index f5364a1..837efa4 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h @@ -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 /* |