From patchwork Thu Mar 10 23:56:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 8560791 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DBAA9C0553 for ; Thu, 10 Mar 2016 23:58:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E93C20380 for ; Thu, 10 Mar 2016 23:58:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 232B120376 for ; Thu, 10 Mar 2016 23:58:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933117AbcCJX6b (ORCPT ); Thu, 10 Mar 2016 18:58:31 -0500 Received: from mail-ob0-f196.google.com ([209.85.214.196]:35140 "EHLO mail-ob0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932882AbcCJX4y (ORCPT ); Thu, 10 Mar 2016 18:56:54 -0500 Received: by mail-ob0-f196.google.com with SMTP id e7so7584426obv.2; Thu, 10 Mar 2016 15:56:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CI6k1nGF3tSFbW1JU/QZug2MH+TggRDI3FnmgKMWOZI=; b=X8zJ6nA8BtTuZpO5gxKoIuFvS9boSwK8t0NIZU1vbBAHEjcPsr5FXwNzOFWReWdEqE bWO9t1MrCtBwdtblKNwS+ue2bcwABFDdCZsfYj2CebDoZBm1qwxOrgARY3nLbR1pxZi9 PhLgtTu1mqhzgsfmzt28hNKgzrAtS57w+FLl45tQqtAmOVj2SNTWN0TNDww1XxDn+3u0 Si86uJzr4WEedXr3w6uae9g+H/79CTPSC2ZzyMHofC43C+7N6jGLs5CHA8vr8/CYGixN /FnmBBc8Q7T5r0+ptm98Y4AKJ59K7PoYwpPgvyr7BF7y1DiQhUFFOEaoVVVT3GAPIogz zCFg== X-Gm-Message-State: AD7BkJKCtnpk6ryLnn6/Jxwul/ZVHt+NNN0Ddl8KPGTBusC1DE1nb0GBH5aggIB/lEFWoA== X-Received: by 10.60.67.71 with SMTP id l7mr4056702oet.55.1457654213661; Thu, 10 Mar 2016 15:56:53 -0800 (PST) Received: from beast-server.fios-router.home (pool-173-57-21-86.dllstx.fios.verizon.net. [173.57.21.86]) by smtp.gmail.com with ESMTPSA id d1sm2907073oby.16.2016.03.10.15.56.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Mar 2016 15:56:53 -0800 (PST) From: Franklin S Cooper Jr To: nsekhar@ti.com, dwmw2@infradead.org, computersforpeace@gmail.com, rogerq@ti.com, tony@atomide.com, devicetree@vger.kernel.org, linux-omap@vger.kernel.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Franklin S Cooper Jr Subject: [PATCH v4 4/7] mtd: nand: omap2: Support parsing dma channel information from DT Date: Thu, 10 Mar 2016 17:56:40 -0600 Message-Id: <1457654203-20856-5-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457654203-20856-1-git-send-email-fcooper@ti.com> References: <1457654203-20856-1-git-send-email-fcooper@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Switch from dma_request_channel to allow passing dma channel information from DT rather than hardcoding a value. Also provide a handle to the GPMC's dev so it can be used to parse the DMA channel information within the GPMC's DT node. Signed-off-by: Franklin S Cooper Jr --- Version 4 changes: Pass parent instead of new variable from the platform data drivers/mtd/nand/omap2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index c553f78..95bc636 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1731,7 +1731,9 @@ static int omap_nand_probe(struct platform_device *pdev) dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); sig = OMAP24XX_DMA_GPMC; - info->dma = dma_request_channel(mask, omap_dma_filter_fn, &sig); + info->dma = dma_request_slave_channel_compat(mask, + omap_dma_filter_fn, &sig, pdev->dev.parent, "rxtx"); + if (!info->dma) { dev_err(&pdev->dev, "DMA engine request failed\n"); err = -ENXIO;