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: 1610651 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C877EDFB34 for ; Thu, 18 Oct 2012 13:29:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755811Ab2JRN2T (ORCPT ); Thu, 18 Oct 2012 09:28:19 -0400 Received: from mail-ia0-f174.google.com ([209.85.210.174]:61187 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755803Ab2JRN0D (ORCPT ); Thu, 18 Oct 2012 09:26:03 -0400 Received: by mail-ia0-f174.google.com with SMTP id y32so6308842iag.19 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 Cc: Devicetree Discuss , Linux OMAP List , Linux ARM Kernel List , Linux DaVinci Kernel List , Linux Kernel Mailing List , Linux Documentation List , Linux MMC List , Linux SPI Devel List , Arnd Bergmann , Dan Williams , Rob Herring 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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;