From patchwork Thu Oct 15 17:37:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 7408691 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A4499F443 for ; Thu, 15 Oct 2015 17:39:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8AB44206DF for ; Thu, 15 Oct 2015 17:39:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4C17206B5 for ; Thu, 15 Oct 2015 17:39:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752270AbbJORhj (ORCPT ); Thu, 15 Oct 2015 13:37:39 -0400 Received: from mail-oi0-f51.google.com ([209.85.218.51]:35915 "EHLO mail-oi0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752221AbbJORhi (ORCPT ); Thu, 15 Oct 2015 13:37:38 -0400 Received: by oihr205 with SMTP id r205so50322391oih.3; Thu, 15 Oct 2015 10:37:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0TdAcNCGapkX16ZxWbuGpRW6i4BLJxhKDfsrgBBr/n0=; b=Pz+naYJlQbNf95BbtChhyK+Zdlh7yxeiEMYXUZnR7RSVSsoS+dqBiWRa6ttCMLaLUT 7nfAp7BWK0r3zuVbtrgoHXahmmwtnVO4WTO3q37vJMle7YMVDCOet+YYzkMpIgy+oova 6U3oN/aqnuRudJqxm8+nw4WpVQogI2GciVTO2cdxZwsNK8q9MWzXrYPpqfZ2ZUJWrbou 3HAPTEGb93RngZSXEkzTLQZP+GIXM7IiQcrjA6kbojEu0G4Ec1vb2xJ/2N71i5j9lhQI EYOfc5D6slHuRpIxv9XPXw+DzTZPqT/s1F/Vh6QRpivI2jNUzTqa/Cy4AdIA2dNd7W28 W3vg== X-Received: by 10.202.107.19 with SMTP id g19mr6332544oic.61.1444930657952; Thu, 15 Oct 2015 10:37:37 -0700 (PDT) Received: from localhost.localdomain (pool-71-97-41-79.dllstx.fios.verizon.net. [71.97.41.79]) by smtp.gmail.com with ESMTPSA id l133sm6771574oia.19.2015.10.15.10.37.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 10:37:37 -0700 (PDT) From: Franklin S Cooper Jr To: linux-kernel@vger.kernel.org, rogerq@ti.com, devicetree@vger.kernel.org, linux-omap@vger.kernel.org, linux-mtd@lists.infradead.org, nsekhar@ti.com, computersforpeace@gmail.com, dwmw2@infradead.org, tony@atomide.com Cc: Franklin S Cooper Jr Subject: [PATCH v2 1/5] mtd: nand: omap2: Support parsing dma channel information from DT Date: Thu, 15 Oct 2015 12:37:24 -0500 Message-Id: <1444930648-19313-2-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444930648-19313-1-git-send-email-fcooper@ti.com> References: <1444930648-19313-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, T_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. Signed-off-by: Franklin S Cooper Jr --- V2 Changes: None 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 d0f2620..957c32f 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1866,7 +1866,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;