From patchwork Tue Oct 13 01:38:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 7380651 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 2C0269F302 for ; Tue, 13 Oct 2015 01:40:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6AC4420574 for ; Tue, 13 Oct 2015 01:40:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81205205D3 for ; Tue, 13 Oct 2015 01:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932354AbbJMBkg (ORCPT ); Mon, 12 Oct 2015 21:40:36 -0400 Received: from mail-ob0-f181.google.com ([209.85.214.181]:33933 "EHLO mail-ob0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932203AbbJMBjY (ORCPT ); Mon, 12 Oct 2015 21:39:24 -0400 Received: by obbda8 with SMTP id da8so2594444obb.1; Mon, 12 Oct 2015 18:39:23 -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=YUB+HNnX/7IEwh+m1xoa323EcQXvQ4iUle46hLk9rM0=; b=EM6YmN+s4vUX94WkUMGRwOfidCia7nMNJsfVLnqnfXdzFxdyt5M7WmQMwGkeujoQ6O 14qwA4YgqGeHv2jU76qofZoe9a0zSv9dMwRD/JI2Jb7+8AHK3tLC6UmUTKDf9IlTMxHl mLDw1vmYH4Lv6k4p1x/QZxc2eOkk9zMoYIhyoCnV4YrYAOcRi0BHI8btd2uLOjGwfDu6 1fhMWB0fImAs8lKvUpq2trB4gNMfgYaFGpJeoZWClH2lfiHHndA11vZONZW7iTtOIixA 9+49OUvLzwfycKha+8w948XzP9ttzwlUuk+Zsv3rRkGTEGYKhTuXE+8n5LAZUaiJQVeS tIyw== X-Received: by 10.60.41.231 with SMTP id i7mr15893514oel.72.1444700363186; Mon, 12 Oct 2015 18:39:23 -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 ta5sm320312obc.13.2015.10.12.18.39.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Oct 2015 18:39:22 -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 1/5] mtd: nand: omap2: Support parsing dma channel information from DT Date: Mon, 12 Oct 2015 20:38:54 -0500 Message-Id: <1444700338-27582-2-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444700338-27582-1-git-send-email-fcooper@ti.com> References: <1444700338-27582-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 Acked-by: Roger Quadros --- 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;