mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Matt Porter <mporter@ti.com>
To: Tony Lindgren <tony@atomide.com>, Sekhar Nori <nsekhar@ti.com>,
	Grant Likely <grant.likely@secretlab.ca>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Benoit Cousson <b-cousson@ti.com>,
	Russell King <linux@arm.linux.org.uk>,
	Vinod Koul <vinod.koul@intel.com>, Rob Landley <rob@landley.net>,
	Chris Ball <cjb@laptop.org>
Cc: Devicetree Discuss <devicetree-discuss@lists.ozlabs.org>,
	Linux OMAP List <linux-omap@vger.kernel.org>,
	Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
	Linux DaVinci Kernel List 
	<davinci-linux-open-source@linux.davincidsp.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Documentation List <linux-doc@vger.kernel.org>,
	Linux MMC List <linux-mmc@vger.kernel.org>,
	Linux SPI Devel List  <spi-devel-general@lists.sourceforge.net>,
	Arnd Bergmann <arnd@arndb.de>, Dan Williams <djbw@fb.com>,
	Rob Herring <rob.herring@calxeda.com>
Subject: [PATCH v7 07/10] dmaengine: add dma_request_slave_channel_compat()
Date: Fri,  1 Feb 2013 13:22:52 -0500	[thread overview]
Message-ID: <1359742975-10421-8-git-send-email-mporter@ti.com> (raw)
In-Reply-To: <1359742975-10421-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>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/dmaengine.h |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index bfcdecb..17d8ffd 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -1001,6 +1001,22 @@ 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)
+#define dma_request_slave_channel_compat(mask, x, y, dev, name) \
+	__dma_request_slave_channel_compat(&(mask), x, y, dev, name)
+
+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)
+{
+	struct dma_chan *chan;
+
+	chan = dma_request_slave_channel(dev, name);
+	if (chan)
+		return chan;
+
+	return __dma_request_channel(mask, fn, fn_param);
+}
 
 /* --- Helper iov-locking functions --- */
 
-- 
1.7.9.5


  parent reply	other threads:[~2013-02-01 18:24 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-01 18:22 [PATCH v7 00/10] DMA Engine support for AM33XX Matt Porter
2013-02-01 18:22 ` [PATCH v7 01/10] ARM: davinci: move private EDMA API to arm/common Matt Porter
2013-02-01 18:41   ` Tony Lindgren
2013-02-02 12:49     ` Russell King - ARM Linux
2013-02-02 14:44       ` Matt Porter
     [not found]   ` <5022f635a527470dbd0be932063e9cd2@DFLE72.ent.ti.com>
2013-02-01 18:49     ` Matt Porter
     [not found]       ` <2077c13e12314dc3adc8e5b653855da0@DFLE72.ent.ti.com>
2013-02-01 18:59         ` Matt Porter
2013-02-02  0:01           ` Sergei Shtylyov
2013-02-02 12:45           ` Russell King - ARM Linux
2013-02-02 17:27             ` Sergei Shtylyov
     [not found]           ` <e9be6668da8b4372a04687847daa1d8c@DFLE72.ent.ti.com>
2013-02-02 18:07             ` Matt Porter
2013-02-02 18:16               ` Tony Lindgren
2013-02-02 19:48                 ` Matt Porter
2013-02-02 21:02                   ` Tony Lindgren
2013-02-02 19:06               ` Sergei Shtylyov
     [not found]               ` <3245316d7aa94b2e823f98b69497547d@DLEE74.ent.ti.com>
2013-02-02 19:55                 ` Matt Porter
2013-02-02 20:18                   ` Sergei Shtylyov
2013-02-01 19:52       ` Sergei Shtylyov
2013-02-01 18:58         ` Felipe Balbi
2013-02-01 20:49           ` Sergei Shtylyov
2013-02-01 20:56             ` Felipe Balbi
2013-02-01 21:30               ` Russell King - ARM Linux
2013-02-02  0:07                 ` Sergei Shtylyov
2013-02-02  0:44                   ` Russell King - ARM Linux
2013-02-02  2:09                     ` Sergei Shtylyov
2013-02-02 10:18                       ` Russell King - ARM Linux
2013-02-02 12:17                         ` Russell King - ARM Linux
2013-02-02 17:02                           ` Sergei Shtylyov
2013-02-02 16:27                         ` Sergei Shtylyov
2013-02-02 16:45                           ` Russell King - ARM Linux
2013-02-02 17:17                             ` Sergei Shtylyov
2013-02-04 14:27                   ` Arnd Bergmann
2013-02-02  0:13                 ` Sergei Shtylyov
2013-02-04 15:41                 ` Felipe Balbi
2013-02-04 15:45                   ` Russell King - ARM Linux
2013-02-04 17:36                   ` Sergei Shtylyov
2013-02-04 16:47                     ` Felipe Balbi
2013-02-04 17:10                       ` Russell King - ARM Linux
2013-02-04 17:54                       ` Sergei Shtylyov
2013-02-04 17:02                         ` Felipe Balbi
2013-02-04 18:22                           ` Sergei Shtylyov
2013-02-04 19:22                           ` Cyril Chemparathy
2013-02-04 20:29                             ` Linus Walleij
2013-02-04 20:33                               ` Mark Brown
2013-02-04 21:11                                 ` Linus Walleij
2013-02-04 21:47                                   ` Arnd Bergmann
2013-02-05 12:38                                     ` Russell King - ARM Linux
2013-02-05 15:37                                       ` Cyril Chemparathy
2013-02-04 21:54                                   ` Cyril Chemparathy
2013-02-05 12:41                                     ` Russell King - ARM Linux
2013-02-05 15:42                                       ` Cyril Chemparathy
2013-02-05 15:30                                     ` Linus Walleij
2013-02-05 17:14                                       ` Russell King - ARM Linux
2013-02-05 18:33                                         ` Linus Walleij
2013-02-04 22:30                               ` Cyril Chemparathy
2013-02-05 16:21                                 ` Linus Walleij
2013-02-05 16:47                                   ` Mark Brown
2013-02-05 17:06                                     ` Russell King - ARM Linux
2013-02-05 17:41                                       ` Mark Brown
2013-02-05 18:29                                     ` Linus Walleij
2013-02-05 19:45                                       ` Cyril Chemparathy
2013-02-05 18:28                   ` Tony Lindgren
2013-02-05 22:26                     ` Arnd Bergmann
2013-02-06  7:45                       ` Felipe Balbi
2013-02-01 23:10               ` Sergei Shtylyov
2013-02-09 16:05   ` Sekhar Nori
2013-02-09 20:08     ` Russell King - ARM Linux
2013-03-04 22:05     ` Matt Porter
     [not found]     ` <e92425fefcc04bb4ab739ec8d4e82672@DLEE74.ent.ti.com>
2013-03-04 22:12       ` Matt Porter
2013-02-01 18:22 ` [PATCH v7 02/10] ARM: edma: remove unused transfer controller handlers Matt Porter
2013-02-01 18:22 ` [PATCH v7 03/10] ARM: edma: add AM33XX support to the private EDMA API Matt Porter
2013-02-01 18:22 ` [PATCH v7 04/10] dmaengine: edma: enable build for AM33XX Matt Porter
2013-02-01 18:22 ` [PATCH v7 05/10] dmaengine: edma: Add TI EDMA device tree binding Matt Porter
2013-02-01 18:26   ` Matt Porter
2013-02-01 18:22 ` [PATCH v7 06/10] ARM: dts: add AM33XX EDMA support Matt Porter
2013-02-01 18:22 ` Matt Porter [this message]
2013-02-01 18:28   ` [PATCH v7 07/10] dmaengine: add dma_request_slave_channel_compat() Matt Porter
2013-02-12 16:38   ` Vinod Koul
2013-02-01 18:22 ` [PATCH v7 08/10] spi: omap2-mcspi: convert to dma_request_slave_channel_compat() Matt Porter
2013-02-01 18:22 ` [PATCH v7 09/10] spi: omap2-mcspi: add generic DMA request support to the DT binding Matt Porter
2013-02-01 18:22 ` [PATCH v7 10/10] ARM: dts: add AM33XX SPI DMA support Matt Porter
2013-02-01 18:32 ` [PATCH v7 00/10] DMA Engine support for AM33XX 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=1359742975-10421-8-git-send-email-mporter@ti.com \
    --to=mporter@ti.com \
    --cc=arnd@arndb.de \
    --cc=b-cousson@ti.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=cjb@laptop.org \
    --cc=davinci-linux-open-source@linux.davincidsp.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=djbw@fb.com \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=nsekhar@ti.com \
    --cc=rob.herring@calxeda.com \
    --cc=rob@landley.net \
    --cc=spi-devel-general@lists.sourceforge.net \
    --cc=tony@atomide.com \
    --cc=vinod.koul@intel.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®