From: mporter@ti.com (Matt Porter)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH v2 09/16] dmaengine: add dma_request_slave_channel_compat()
Date: Thu, 11 Oct 2012 15:04:34 -0400 [thread overview]
Message-ID: <1349982281-10785-10-git-send-email-mporter@ti.com> (raw)
In-Reply-To: <1349982281-10785-1-git-send-email-mporter@ti.com>
Adds a dma_request_slave_channel_compat() wrapper which accepts
both the arguments from dma_request_channel() and
dma_request_slave_channel(). Based on whether the driver is
instantiated via DT, the appropriate channel request call will be
made.
This allows for a much cleaner migration of drivers to the
dmaengine DT API as platforms continue to be mixed between those
that boot using DT and those that do not.
Suggested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Matt Porter <mporter@ti.com>
---
include/linux/dmaengine.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index c88f302..11d9e25 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -1007,6 +1007,16 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
struct dma_chan *net_dma_find_channel(void);
#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
+static inline struct dma_chan
+*dma_request_slave_channel_compat(dma_cap_mask_t mask, dma_filter_fn fn,
+ void *fn_param, struct device *dev,
+ char *name)
+{
+ if (dev->of_node)
+ return dma_request_slave_channel(dev, name);
+ else
+ return dma_request_channel(mask, fn, fn_param);
+}
/* --- Helper iov-locking functions --- */
--
1.7.9.5
next prev parent reply other threads:[~2012-10-11 19:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-11 19:04 [RFC PATCH v2 00/16] DMA Engine support for AM33xx Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 01/16] dmaengine: edma: fix slave config dependency on direction Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 02/16] ARM: davinci: move private EDMA API to arm/common Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 03/16] ARM: edma: remove unused transfer controller handlers Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 04/16] ARM: edma: add DT and runtime PM support for AM335x Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 05/16] dmaengine: edma: enable build for AM33XX Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 06/16] dmaengine: edma: Add TI EDMA device tree binding Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 07/16] ARM: dts: add AM33XX EDMA support Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 08/16] ARM: omap: add hsmmc am33xx specific init Matt Porter
2012-10-12 9:17 ` Hebbar, Gururaja
2012-10-12 11:54 ` Matt Porter
2012-10-11 19:04 ` Matt Porter [this message]
2012-10-11 19:04 ` [RFC PATCH v2 10/16] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 11/16] mmc: omap_hsmmc: limit max_segs with the EDMA DMAC Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 12/16] mmc: omap_hsmmc: add generic DMA request support to the DT binding Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 13/16] ARM: dts: add AM33XX MMC support Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 14/16] spi: omap2-mcspi: convert to dma_request_slave_channel_compat() Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 15/16] spi: omap2-mcspi: add generic DMA request support to the DT binding Matt Porter
2012-10-11 19:04 ` [RFC PATCH v2 16/16] ARM: dts: add AM33XX SPI support Matt Porter
2012-10-11 21:31 ` [RFC PATCH v2 00/16] DMA Engine support for AM33xx Grant Likely
2012-10-11 21:49 ` Matt Porter
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=1349982281-10785-10-git-send-email-mporter@ti.com \
--to=mporter@ti.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).