From patchwork Fri Jan 11 05:48:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1964491 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork2.kernel.org (Postfix) with ESMTP id 317B6DF2A2 for ; Fri, 11 Jan 2013 05:54:52 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0B5p1wK004167; Thu, 10 Jan 2013 23:51:01 -0600 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0B5p1FY010074; Thu, 10 Jan 2013 23:51:01 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 10 Jan 2013 23:51:01 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0B5p02w019088; Thu, 10 Jan 2013 23:51:00 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 7130E8062C; Thu, 10 Jan 2013 23:51:00 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id AE37580632 for ; Thu, 10 Jan 2013 23:44:57 -0600 (CST) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0B5ivxt023378 for ; Thu, 10 Jan 2013 23:44:57 -0600 (CST) Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by white.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0B5iuKL008748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 10 Jan 2013 23:44:57 -0600 Received: from [216.82.250.51:49575] by server-15.bemta-12.messagelabs.com id D3/61-20970-8D6AFE05; Fri, 11 Jan 2013 05:44:56 +0000 X-Env-Sender: ohiomdp@gmail.com X-Msg-Ref: server-14.tower-108.messagelabs.com!1357883076!10793332!1 X-Originating-IP: [209.85.216.49] 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 14236 invoked from network); 11 Jan 2013 05:44:38 -0000 Received: from mail-qa0-f49.google.com (HELO mail-qa0-f49.google.com) (209.85.216.49) by server-14.tower-108.messagelabs.com with RC4-SHA encrypted SMTP; 11 Jan 2013 05:44:38 -0000 Received: by mail-qa0-f49.google.com with SMTP id r4so1239345qaq.1 for ; Thu, 10 Jan 2013 21:44:36 -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=Ijm1SSSrNo/il7YwsohpF4NnTsUmC/iEi3WiX2vhS1o=; b=gatbgDirSsDD6fy5gV2hcLUL8kCmW+pljYr2q77UvXHfqzwvHrDB+Tkvf908LT4iFc bVe18CCVYw+gdllOmtGAnB3nruGkNaS3pVSgV+vRoutR186eWnnu88GXtsVmNtzChoW+ Oqq2TZ/UuaOG2trKNue63G7UNiJfdgHkN/t/xduC1SZ76GYpcfFNtagaa2Z79CeRimka YPvtOlDrgchxL89J46CwEyadkRGVUs3hhoXMQeU80u2bk3FmO1vljTKm5kbOg4rpKIRd dUDDrv2jisQlOzBh/ACABubQlms4MXytD+GyGjEr5JswKFNzMMRC7+eYnHvq89N9NOsu im9Q== X-Received: by 10.49.108.9 with SMTP id hg9mr68698298qeb.34.1357883076029; Thu, 10 Jan 2013 21:44:36 -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 ds8sm1897114qab.18.2013.01.10.21.44.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jan 2013 21:44:35 -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 v4 07/14] dmaengine: add dma_request_slave_channel_compat() Date: Fri, 11 Jan 2013 00:48:43 -0500 Message-ID: <1357883330-5364-8-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357883330-5364-1-git-send-email-mporter@ti.com> References: <1357883330-5364-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 --- */