From patchwork Tue Jan 15 20:32:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1981171 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by patchwork1.kernel.org (Postfix) with ESMTP id 902B33FC85 for ; Tue, 15 Jan 2013 20:33:56 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0FKUI1u011488; Tue, 15 Jan 2013 14:30:18 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0FKUIvT001904; Tue, 15 Jan 2013 14:30:18 -0600 Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Tue, 15 Jan 2013 14:30:14 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0FKUFqt014760; Tue, 15 Jan 2013 14:30:15 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id BF9E680636; Tue, 15 Jan 2013 14:30:11 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id BCA6D8062E for ; Tue, 15 Jan 2013 14:28:27 -0600 (CST) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id r0FKSRCp017384 for ; Tue, 15 Jan 2013 14:28:27 -0600 (CST) Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by white.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0FKSR2Q017891 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Jan 2013 14:28:27 -0600 Received: from [216.82.253.147:14600] by server-11.bemta-7.messagelabs.com id 2E/35-14333-BEBB5F05; Tue, 15 Jan 2013 20:28:27 +0000 X-Env-Sender: ohiomdp@gmail.com X-Msg-Ref: server-13.tower-165.messagelabs.com!1358281705!12205157!1 X-Originating-IP: [209.85.216.51] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13825 invoked from network); 15 Jan 2013 20:28:26 -0000 Received: from mail-qa0-f51.google.com (HELO mail-qa0-f51.google.com) (209.85.216.51) by server-13.tower-165.messagelabs.com with RC4-SHA encrypted SMTP; 15 Jan 2013 20:28:26 -0000 Received: by mail-qa0-f51.google.com with SMTP id i20so568023qad.17 for ; Tue, 15 Jan 2013 12:28:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=FicYArG4in1KNXuEJlQaeQk0rQPRTDAPhQDBQH3JIQw=; b=XI8shFDYb43E2gguTrlXSeMLNuKg87FjtPwwT4WD7k3zT1371RYnR8X2tqdIGYTCPc C5iEdh0KdPnNU7PjDRBE9epnEx9+5tblOZvE4CD1peUBfAvi4/iV6d0+ptBsoOammFZq ma8zU7Mtb2sf04u9Tbgd7iTwF4gzDvc3ZDNQERqZMJigp3ThNZlcK/YF9hSS/tFNnr9A /gLlpWMu5lvoUMWv7MyH8Lp7yINMHzT5jCQmxzs4qA6cPDjy/eEUYoZbobrNHjT79EAn ynwgzRGSxOR5kS5Ao+gg5hsQ91yHNNgGc9Nw5VICfnlwsdpaxXZn6t/q3B3T7gNNpwB0 ywmw== X-Received: by 10.224.193.130 with SMTP id du2mr74932953qab.95.1358281705198; Tue, 15 Jan 2013 12:28:25 -0800 (PST) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id gw9sm4308048qab.10.2013.01.15.12.28.22 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Jan 2013 12:28:24 -0800 (PST) From: Matt Porter To: Tony Lindgren , Sekhar Nori , Grant Likely , Mark Brown , Benoit Cousson , Russell King , Vinod Koul , Rob Landley , Chris Ball Subject: [PATCH v5 07/14] dmaengine: add dma_request_slave_channel_compat() Date: Tue, 15 Jan 2013 15:32:47 -0500 Message-ID: <1358281974-8411-8-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358281974-8411-1-git-send-email-mporter@ti.com> References: <1358281974-8411-1-git-send-email-mporter@ti.com> CC: Linux DaVinci Kernel List , Arnd Bergmann , Linux Documentation List , Devicetree Discuss , Linux MMC List , Linux Kernel Mailing List , Rob Herring , Dan Williams , Linux SPI Devel List , Linux OMAP List , Linux ARM Kernel List X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.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 Signed-off-by: Matt Porter Acked-by: Tony Lindgren --- include/linux/dmaengine.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 9fd0c5b..64f9f69 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1047,6 +1047,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 --- */