From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: dan.j.williams@intel.com, maciej.sosnowski@intel.com,
avictor.za@gmail.com, linux-arm-kernel@lists.arm.linux.org.uk
Cc: patrice.vilchez@atmel.com, linux-kernel@vger.kernel.org,
nicolas.ferre@atmel.com
Subject: [PATCH 2/2 v2] at91/dmaengine: integration of at_hdmac driver in at91sam9rl
Date: Fri, 26 Jun 2009 12:42:16 +0200 [thread overview]
Message-ID: <1246012936-10812-2-git-send-email-nicolas.ferre@atmel.com> (raw)
In-Reply-To: <1246012936-10812-1-git-send-email-nicolas.ferre@atmel.com>
This is the integration of DMA engine driver into at91sam9rl device file. The
associated driver is at_hdmac.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
This patch is based on async_tx.git/next and may need modification for
inclusion in the at91 patch submission flow.
arch/arm/mach-at91/at91sam9rl_devices.c | 49 ++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 7281865..65a4997 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -21,11 +21,57 @@
#include <mach/at91sam9rl.h>
#include <mach/at91sam9rl_matrix.h>
#include <mach/at91sam9_smc.h>
+#include <mach/at_hdmac.h>
#include "generic.h"
/* --------------------------------------------------------------------
+ * HDMAC - AHB DMA Controller
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)
+static u64 hdmac_dmamask = DMA_BIT_MASK(32);
+
+static struct at_dma_platform_data atdma_pdata = {
+ .nr_channels = 2,
+};
+
+static struct resource hdmac_resources[] = {
+ [0] = {
+ .start = AT91_BASE_SYS + AT91_DMA,
+ .end = AT91_BASE_SYS + AT91_DMA + SZ_512 - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [2] = {
+ .start = AT91SAM9RL_ID_DMA,
+ .end = AT91SAM9RL_ID_DMA,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device at_hdmac_device = {
+ .name = "at_hdmac",
+ .id = -1,
+ .dev = {
+ .dma_mask = &hdmac_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ .platform_data = &atdma_pdata,
+ },
+ .resource = hdmac_resources,
+ .num_resources = ARRAY_SIZE(hdmac_resources),
+};
+
+void __init at91_add_device_hdmac(void)
+{
+ dma_cap_set(DMA_MEMCPY, atdma_pdata.cap_mask);
+ platform_device_register(&at_hdmac_device);
+}
+#else
+void __init at91_add_device_hdmac(void) {}
+#endif
+
+/* --------------------------------------------------------------------
* USB HS Device (Gadget)
* -------------------------------------------------------------------- */
@@ -823,7 +869,7 @@ static struct resource dbgu_resources[] = {
};
static struct atmel_uart_data dbgu_data = {
- .use_dma_tx = 0,
+ .use_dma_tx = 1,
.use_dma_rx = 0, /* DBGU not capable of receive DMA */
.regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
};
@@ -1103,6 +1149,7 @@ void __init at91_add_device_serial(void) {}
*/
static int __init at91_add_standard_devices(void)
{
+ at91_add_device_hdmac();
at91_add_device_rtc();
at91_add_device_rtt();
at91_add_device_watchdog();
--
1.5.3.7
next prev parent reply other threads:[~2009-06-26 9:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-26 10:42 [PATCH 1/2 v2] dmaengine: at_hdmac: new driver for the Atmel AHB DMA Controller Nicolas Ferre
2009-06-26 10:42 ` Nicolas Ferre [this message]
2009-06-27 15:06 ` Atsushi Nemoto
2009-07-01 15:30 ` Nicolas Ferre
2009-07-03 15:12 ` Atsushi Nemoto
2009-07-01 13:58 ` Nicolas Ferre
2009-07-02 0:58 ` Dan Williams
2009-07-02 1:18 ` Dan Williams
2009-07-03 12:59 ` Sosnowski, Maciej
2009-07-03 13:03 ` Nicolas Ferre
[not found] ` <0bb1aaf3fca441453fbb9296e1a35d7921d74467.1246641180.git.nicolas.ferre@atmel.com>
2009-07-03 17:24 ` [PATCH 1/2 v3] " Nicolas Ferre
2009-07-17 10:38 ` Nicolas Ferre
2009-07-18 16:01 ` Dan Williams
2009-07-21 8:33 ` Nicolas Ferre
2009-07-22 13:35 ` Sosnowski, Maciej
2009-07-22 18:04 ` [PATCH] dmaengine: at_hdmac: add DMA slave transfers Nicolas Ferre
2009-07-23 17:13 ` Dan Williams
2009-07-24 7:35 ` Nicolas Ferre
2009-07-24 13:29 ` Atsushi Nemoto
2009-07-24 14:10 ` Haavard Skinnemoen
2009-07-27 13:24 ` Sosnowski, Maciej
2009-07-28 15:13 ` Atsushi Nemoto
2009-07-29 13:05 ` Sosnowski, Maciej
2009-07-29 15:16 ` Atsushi Nemoto
2009-07-29 14:27 ` Dan Williams
2009-07-31 3:58 ` Atsushi Nemoto
2009-07-27 13:22 ` Sosnowski, Maciej
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=1246012936-10812-2-git-send-email-nicolas.ferre@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=avictor.za@gmail.com \
--cc=dan.j.williams@intel.com \
--cc=linux-arm-kernel@lists.arm.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.sosnowski@intel.com \
--cc=patrice.vilchez@atmel.com \
/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
all inboxes | Powered by JetHome®