From patchwork Thu Oct 11 19:04:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1583371 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 46BA13FD9C for ; Thu, 11 Oct 2012 19:07:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964899Ab2JKTGs (ORCPT ); Thu, 11 Oct 2012 15:06:48 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:54472 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964828Ab2JKTEN (ORCPT ); Thu, 11 Oct 2012 15:04:13 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so3579968iea.19 for ; Thu, 11 Oct 2012 12:04:13 -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=cCKVqsETVarY7m8XGRLbItsdzMiflLNuVNth/M/H7Rmf2255Kj8qhtq/FQIPMjLZfT 1QetEsHFIntv9El5qk2s4CYK6Xg0g8qZzVzXcWj2hg1EeBN6+TniOh0BKvajSeWUSGam SB9u5PXUjh66ToKVdmR/elLmIA5I4rjs2DO1WJhIuw3nXNiP1ZVR7Pc+IMt6/Ov640VN y2gsZgqbwGqC7lW9KenC+miuGq2rXrxlSNmdkEu5becpV/11Ff0+3wdWI0Xa2tMwmPw1 hqv1IpQmdNTs1nqoWJ+JJBOJFS/LYpkVZP/mnjuYzAAHx4GQQlnie3xyo0ViCy60kHpw fsdA== Received: by 10.50.135.74 with SMTP id pq10mr1839931igb.30.1349982252996; Thu, 11 Oct 2012 12:04:12 -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 us4sm7461igc.9.2012.10.11.12.04.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 12:04:11 -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 v2 10/16] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Date: Thu, 11 Oct 2012 15:04:35 -0400 Message-Id: <1349982281-10785-11-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349982281-10785-1-git-send-email-mporter@ti.com> References: <1349982281-10785-1-git-send-email-mporter@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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;