From patchwork Thu Oct 18 13:26:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1610631 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by patchwork2.kernel.org (Postfix) with ESMTP id 6492BDFB34 for ; Thu, 18 Oct 2012 13:28:37 +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 q9IDSbZT032227 for ; Thu, 18 Oct 2012 08:28:37 -0500 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 q9IDSbND031254 for ; Thu, 18 Oct 2012 08:28:37 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 18 Oct 2012 08:28:36 -0500 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 q9IDSaNA009854 for ; Thu, 18 Oct 2012 08:28:36 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 8FDC98062F for ; Thu, 18 Oct 2012 08:28:36 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 731F980637 for ; Thu, 18 Oct 2012 08:26:02 -0500 (CDT) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id q9IDQ1RF019583 for ; Thu, 18 Oct 2012 08:26:01 -0500 (CDT) Received: from psmtp.com (na3sys009amx234.postini.com [74.125.149.118]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id q9IDQ0Nv016946 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Oct 2012 08:26:01 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]) (using TLSv1) by na3sys009amx234.postini.com ([74.125.148.10]) with SMTP; Thu, 18 Oct 2012 06:26:01 PDT Received: by mail-ie0-f173.google.com with SMTP id 17so13404569iea.4 for ; Thu, 18 Oct 2012 06:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=vbLLGBB8xnkNLfBTt4WBYyBavATfGnqBZjBwVCMar7Q=; b=ADzvr38HZCkbr1w+W00x9N+loDxjfaQDLWc1SMU8ipoD1jJzcqPxIYbwfsZPMA+29g XMuVcigy61i9omInrOB2nguhbTnSHj2o9e1tPE6ucU/ssMN4zyI9YQeDoY4hJprDH+ov ZcdD7V/tM6HHWrmaGnEoe/7lYEraKoM0DnpINkszoFOO6Ul4Z6BB0q4dWaUaDyurpl1k 0l2kTOgoHA90XybWD5MoQ1iK8qDYFlbQZklo6rCiqWod/rrEPCYT6MbDJCFJRVVxjAGs d5XE9YkG5dgXEW3wxkmj+AmQmCXyQeqzg3Yw0bB098hXooluI1Wf1kBnpM1XzQF+lhAe N80w== Received: by 10.50.57.200 with SMTP id k8mr4790297igq.29.1350566760340; Thu, 18 Oct 2012 06:26:00 -0700 (PDT) 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 x7sm14244186igk.8.2012.10.18.06.25.58 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 06:25:59 -0700 (PDT) From: Matt Porter To: Tony Lindgren , Sekhar Nori , Grant Likely , Mark Brown , Benoit Cousson , Russell King , Vinod Koul , Rob Landley , Chris Ball Subject: [RFC PATCH v3 09/16] dmaengine: add dma_request_slave_channel_compat() Date: Thu, 18 Oct 2012 09:26:48 -0400 Message-ID: <1350566815-409-10-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350566815-409-1-git-send-email-mporter@ti.com> References: <1350566815-409-1-git-send-email-mporter@ti.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:95.39197/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] 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+patchwork-davinci=patchwork.kernel.org@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 --- 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 --- */