From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 05/05] dmaengine: shdma: Enable on SH-Mobile ARM
Date: Fri, 19 Mar 2010 04:47:19 +0000 [thread overview]
Message-ID: <20100319044719.17051.57155.sendpatchset@t400s> (raw)
From: Magnus Damm <damm@opensource.se>
Enable the shdma dmaengine driver on SH-Mobile ARM.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
drivers/dma/Kconfig | 2 +-
drivers/dma/shdma.c | 8 ++++----
include/linux/serial_sci.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
--- 0001/drivers/dma/Kconfig
+++ work/drivers/dma/Kconfig 2010-03-18 23:38:59.000000000 +0900
@@ -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
--- 0008/drivers/dma/shdma.c
+++ work/drivers/dma/shdma.c 2010-03-19 12:39:33.000000000 +0900
@@ -793,7 +793,7 @@ static irqreturn_t sh_dmae_interrupt(int
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 p
/* 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 p
#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 p
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
--- 0005/include/linux/serial_sci.h
+++ work/include/linux/serial_sci.h 2010-03-18 23:38:59.000000000 +0900
@@ -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
/*
next reply other threads:[~2010-03-19 4:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-19 4:47 Magnus Damm [this message]
2010-03-19 7:24 ` [PATCH 05/05] dmaengine: shdma: Enable on SH-Mobile ARM Guennadi Liakhovetski
2010-03-19 8:15 ` Magnus Damm
2010-03-19 8:15 ` Paul Mundt
2010-04-07 7:34 ` Paul Mundt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100319044719.17051.57155.sendpatchset@t400s \
--to=magnus.damm@gmail.com \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox