linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/12] dma: mmp_pdma: make the controller a DMA provider
Date: Wed,  7 Aug 2013 12:19:24 +0200	[thread overview]
Message-ID: <1375870770-14263-7-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1375870770-14263-1-git-send-email-zonque@gmail.com>

This patch makes the mmp_pdma controller able to provide DMA resources
in DT environments.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
 drivers/dma/mmp_pdma.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index 60a1410..d60217a 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -18,6 +18,7 @@
 #include <linux/platform_data/mmp_dma.h>
 #include <linux/dmapool.h>
 #include <linux/of_device.h>
+#include <linux/of_dma.h>
 #include <linux/of.h>
 #include <linux/dma/mmp-pdma.h>
 
@@ -783,6 +784,10 @@ static struct of_device_id mmp_pdma_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, mmp_pdma_dt_ids);
 
+static struct of_dma_filter_info mmp_pdma_info = {
+	.filter_fn = mmp_pdma_filter_fn,
+};
+
 static int mmp_pdma_probe(struct platform_device *op)
 {
 	struct mmp_pdma_device *pdev;
@@ -869,6 +874,19 @@ static int mmp_pdma_probe(struct platform_device *op)
 		return ret;
 	}
 
+	if (op->dev.of_node) {
+		mmp_pdma_info.dma_cap = pdev->device.cap_mask;
+
+		/* Device-tree DMA controller registration */
+		ret = of_dma_controller_register(op->dev.of_node,
+						 of_dma_simple_xlate,
+						 &mmp_pdma_info);
+		if (ret < 0) {
+			dev_err(&op->dev, "of_dma_controller_register failed\n");
+			return ret;
+		}
+	}
+
 	dev_info(pdev->device.dev, "initialized\n");
 	return 0;
 }
-- 
1.8.3.1

  parent reply	other threads:[~2013-08-07 10:19 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-07 10:19 [PATCH 00/12] dma: pdma: some patches needed for PXA DT environments Daniel Mack
2013-08-07 10:19 ` [PATCH 01/12] dma: mmp_pdma: add protect when alloc/free phy channels Daniel Mack
2013-08-07 12:40   ` Ezequiel Garcia
2013-08-07 12:42     ` Daniel Mack
2013-08-08  8:35     ` Daniel Mack
2013-08-07 10:19 ` [PATCH 02/12] dma: mmp_pdma: clear DRCMR when free a phy channel Daniel Mack
2013-08-07 10:19 ` [PATCH 03/12] dma: mmp_pdma: factor out DRCMR register calculation Daniel Mack
2013-08-07 10:19 ` [PATCH 04/12] dma: mmp_pdma: fix maximum transfer length Daniel Mack
2013-08-07 10:19 ` [PATCH 05/12] dma: mmp_pdma: add filter function Daniel Mack
2013-08-07 10:19 ` Daniel Mack [this message]
2013-08-07 16:12   ` [PATCH 06/12] dma: mmp_pdma: make the controller a DMA provider Arnd Bergmann
2013-08-07 16:17     ` Daniel Mack
2013-08-07 20:17       ` Arnd Bergmann
2013-08-08  8:38     ` Daniel Mack
2013-08-09 13:10     ` Daniel Mack
2013-08-09 14:32       ` zhangfei gao
2013-08-09 21:08         ` Arnd Bergmann
2013-08-07 10:19 ` [PATCH 07/12] dma: mmp_pdma: print the number of channels at probe time Daniel Mack
2013-08-07 10:19 ` [PATCH 08/12] dma: mmp_pdma: remove duplicate assignment Daniel Mack
2013-08-07 10:19 ` [PATCH 09/12] dma: mmp_pdma: add support for byte-aligned transfers Daniel Mack
2013-08-08  9:04   ` Xiang Wang
2013-08-08  9:11     ` Daniel Mack
2013-08-16  8:05       ` Xiang Wang
2013-08-07 10:19 ` [PATCH 10/12] dma: mmp_pdma: implement DMA_PAUSE and DMA_RESUME Daniel Mack
2013-08-07 10:19 ` [PATCH 11/12] dma: mmp_pdma: add support for residue reporting Daniel Mack
2013-08-07 10:19 ` [PATCH 12/12] dma: mmp_pdma: add support for cyclic DMA descriptors Daniel Mack

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=1375870770-14263-7-git-send-email-zonque@gmail.com \
    --to=zonque@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).