Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965465AbcCJEIu (ORCPT ); Wed, 9 Mar 2016 23:08:50 -0500 Received: from mail-oi0-f66.google.com ([209.85.218.66]:36382 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965096AbcCJEHz (ORCPT ); Wed, 9 Mar 2016 23:07:55 -0500 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 v3 3/6] mtd: nand: omap2: Support parsing dma channel information from DT Date: Wed, 9 Mar 2016 22:07:38 -0600 Message-Id: <1457582861-20619-4-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457582861-20619-1-git-send-email-fcooper@ti.com> References: <1457582861-20619-1-git-send-email-fcooper@ti.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1054 Lines: 31 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 3 changes: Instead of passing parent dev use the new property 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..1e5c803 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, pdata->gpmc_dev, "rxtx"); + if (!info->dma) { dev_err(&pdev->dev, "DMA engine request failed\n"); err = -ENXIO; -- 2.7.0