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: 1486111 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork1.kernel.org (Postfix) with ESMTP id CFC793FD40 for ; Thu, 20 Sep 2012 14:47:26 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q8KEjwXQ010060; Thu, 20 Sep 2012 09:45:58 -0500 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8KEjwq9021481; Thu, 20 Sep 2012 09:45:58 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 20 Sep 2012 09:45:57 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8KEjvUH015292; Thu, 20 Sep 2012 09:45:57 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id B0DE680627; Thu, 20 Sep 2012 09:45:57 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 90BA280627 for ; Thu, 20 Sep 2012 09:42:31 -0500 (CDT) Received: from medina.ext.ti.com (medina.ext.ti.com [192.91.81.31]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id q8KEgVJG011997 for ; Thu, 20 Sep 2012 09:42:31 -0500 (CDT) Received: from psmtp.com (na3sys009amx171.postini.com [74.125.149.97]) by medina.ext.ti.com (8.13.7/8.13.7) with SMTP id q8KEgUBr030446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 20 Sep 2012 09:42:30 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]) (using TLSv1) by na3sys009amx171.postini.com ([74.125.148.10]) with SMTP; Thu, 20 Sep 2012 14:42:30 GMT Received: by mail-ie0-f173.google.com with SMTP id c10so3339295ieb.4 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-pstn-levels: (S:62.65138/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] 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: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com 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;