From patchwork Thu Sep 20 14:43:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1486031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 4C4EBDF2D2 for ; Thu, 20 Sep 2012 14:46:24 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEhz3-00069m-Hg; Thu, 20 Sep 2012 14:44:05 +0000 Received: from mail-ie0-f177.google.com ([209.85.223.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEhxW-0005aF-42 for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 14:42:31 +0000 Received: by mail-ie0-f177.google.com with SMTP id e14so3946786iej.36 for ; Thu, 20 Sep 2012 07:42:30 -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=WIgIyeI3WIbMRpEYKw4CEUNLmoxHuYsou0GiCA2Ta5k=; b=qSD9hZyMPJFGRAUW8Vinjw7WZw5BAAagCVuPNlsDLFrqLwTQz4zeXsFmuwLCzgoH2N mw1YokBZegrDdm/6sycWAe0A1VgcVh8J3i7bDVmVOJSDUZouHjOwq7Ch30FUHExIQSaI c/bNWa3L242F/Q8IaGw4VZRvA9ecvNWPJbtuiwPi8BOIZHnlm4rMWRTbRnehkX0bs9iY rPvEqmZEtDr7BuhvgcRSbjpDZolzEyHJzVLGCugqKncXf5Tr+aZKlL423seJ/78tM5iJ jB6ZPg/N8IIfWm9nVaLqFRhkQbjd6bXTxN46IA9YBwyeXn8IpbWbAY3aX59lgLG3Serz stCA== Received: by 10.43.133.196 with SMTP id hz4mr1557293icc.52.1348152149963; Thu, 20 Sep 2012 07:42:29 -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 p5sm15288242igm.13.2012.09.20.07.42.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 07:42:29 -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 07/13] mmc: omap_hsmmc: dma_request_slave_channel() support for DT platforms Date: Thu, 20 Sep 2012 10:43:40 -0400 Message-Id: <1348152226-13588-8-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348152226-13588-1-git-send-email-mporter@ti.com> References: <1348152226-13588-1-git-send-email-mporter@ti.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.223.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ohiomdp[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org For platforms with DT populated, use dma_request_slave_channel() to acquire the DMA channel. For !DT platforms, we fall back to explicitly passing the omap_dma_filter_fn() to dma_request_channel(). Once all platforms boot from DT, the dma_request_channel() path can be dropped. Signed-off-by: Matt Porter --- drivers/mmc/host/omap_hsmmc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 3a09f93..c82d0ab 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1923,14 +1923,26 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev) dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); - host->rx_chan = dma_request_channel(mask, omap_dma_filter_fn, &rx_req); + if (pdev->dev.of_node) + host->rx_chan = + dma_request_slave_channel(&pdev->dev, "rx"); + else + host->rx_chan = dma_request_channel(mask, + omap_dma_filter_fn, + &rx_req); if (!host->rx_chan) { dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel %u\n", rx_req); ret = -ENXIO; goto err_irq; } - host->tx_chan = dma_request_channel(mask, omap_dma_filter_fn, &tx_req); + if (pdev->dev.of_node) + host->tx_chan = + dma_request_slave_channel(&pdev->dev, "tx"); + else + host->tx_chan = dma_request_channel(mask, + omap_dma_filter_fn, + &tx_req); if (!host->tx_chan) { dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req); ret = -ENXIO;