From patchwork Thu Oct 18 13:26:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1611071 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by patchwork2.kernel.org (Postfix) with ESMTP id E7914DFB34 for ; Thu, 18 Oct 2012 13:32:19 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id q9IDUQe7020719; Thu, 18 Oct 2012 08:30:26 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9IDUPlj003771; Thu, 18 Oct 2012 08:30:26 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Thu, 18 Oct 2012 08:30:26 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9IDUQ2K004535; Thu, 18 Oct 2012 08:30:26 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id DE3D980628; Thu, 18 Oct 2012 08:30:24 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 530568062B for ; Thu, 18 Oct 2012 08:26:04 -0500 (CDT) Received: from medina.ext.ti.com (medina.ext.ti.com [192.91.81.31]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9IDQ4GL017679 for ; Thu, 18 Oct 2012 08:26:04 -0500 (CDT) Received: from psmtp.com (na3sys009amx163.postini.com [74.125.149.89]) by medina.ext.ti.com (8.13.7/8.13.7) with SMTP id q9IDQ2KV001308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Oct 2012 08:26:03 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]) (using TLSv1) by na3sys009amx163.postini.com ([74.125.148.10]) with SMTP; Thu, 18 Oct 2012 09:26:03 EDT Received: by mail-ia0-f173.google.com with SMTP id m10so6253421iam.4 for ; Thu, 18 Oct 2012 06:26:02 -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=l+gbdvS5SbRE5I56ru3YQMJqiwIWAw8FvEUg4OHS6s8=; b=tMk0hPujOTIpk9kfOh0sotw070i78NrVD6AOttoJAoQyYAQ7j+XTh7w7kpANyQxZCp yEVwUAcwMmU5wphC7E3AhMl0L56UvBqUGEtfmHXHau5DoGvKLAn9lR0yHfPX+W4sZc6I CCTWhdyn8HjcTXuMvLo2rN5Gggt2dVyh0eIpXuCd90ixe1ptpoFsD2GxD2mqM9UMdr0W vhytM0IETVhBKenqpHM4JGnSJyX1NbDv+XUBLC2+X1zUU7As9LRONnNoo1ih+cRFjCRp DF4h7oZsAEkIhc571e1m24tR2kKVQPW8d2bo+uJ5UbQdaq5ZZJtiDKqzTS8mKvzeVF0f zv3g== Received: by 10.50.91.169 with SMTP id cf9mr4693561igb.44.1350566762564; Thu, 18 Oct 2012 06:26:02 -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 x7sm14244186igk.8.2012.10.18.06.26.00 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 06:26:01 -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 v3 10/16] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Date: Thu, 18 Oct 2012 09:26:49 -0400 Message-ID: <1350566815-409-11-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350566815-409-1-git-send-email-mporter@ti.com> References: <1350566815-409-1-git-send-email-mporter@ti.com> X-pstn-levels: (S:53.57327/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 Convert dmaengine channel requests to use dma_request_slave_channel_compat(). This supports the DT case of platforms requiring channel selection from either the OMAP DMA or the EDMA engine. AM33xx only boots from DT and is the only user implementing EDMA so in the !DT case we can default to the OMAP DMA filter. Signed-off-by: Matt Porter --- drivers/mmc/host/omap_hsmmc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 54bfd0c..b327cd0 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1866,14 +1866,20 @@ 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); + host->rx_chan = + dma_request_slave_channel_compat(mask, omap_dma_filter_fn, + &rx_req, &pdev->dev, "rx"); + 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); + host->tx_chan = + dma_request_slave_channel_compat(mask, omap_dma_filter_fn, + &tx_req, &pdev->dev, "tx"); + if (!host->tx_chan) { dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req); ret = -ENXIO;