From patchwork Fri Feb 1 21:01:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 2083181 Return-Path: X-Original-To: patchwork-linux-omap@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 71A97DF264 for ; Fri, 1 Feb 2013 21:01:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757664Ab3BAVBi (ORCPT ); Fri, 1 Feb 2013 16:01:38 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:63080 "EHLO mail-ia0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757477Ab3BAVAr (ORCPT ); Fri, 1 Feb 2013 16:00:47 -0500 Received: by mail-ia0-f173.google.com with SMTP id h37so1576218iak.18 for ; Fri, 01 Feb 2013 13:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=ivMI0mWsvGgT2KwnGg6M5FEzVSGYlATBNY97lBX3hZ0=; b=wPap74T6rRNyUBH+A9tem/UPp3njRhoRTa1g/S1vZk/6jKQ0zOYr/7OHVvsQP2eji0 +g+9hRNsnX4NyodfHu/uAQLYC885OIUZ6SVy3hc+8fiflzyWrFilon0d8WwljTcJmBPN pmNJmIfgZwPKiZ6CBjC8OFxrBrfhVxVxEpKuPqB3Amml9/y5IxtrR4V1HOuydcKHY+vU /7NFhMiScpS1g26A6UUHyMBviIERj8IdO5Sa8xWzYSXmvt/g8aDQ/mpytydH7uJzy9lx +X+Hih5ljX1hn8oDX6WuR/rDx+BEzvMIjQwtGrvMAdUPiH8yDZFCdh17/Pbut9dQwKS9 ODqg== X-Received: by 10.50.214.10 with SMTP id nw10mr80868igc.15.1359752446614; Fri, 01 Feb 2013 13:00:46 -0800 (PST) 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 eg7sm3728002igc.7.2013.02.01.13.00.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 13:00:46 -0800 (PST) From: Matt Porter To: Venkatraman S , Chris Ball , Grant Likely , Rob Herring Cc: Vinod Koul , Tony Lindgren , Devicetree Discuss , Linux OMAP List , Linux Kernel Mailing List , Linux MMC List , Arnd Bergmann , Dan Williams , Jon Hunter , Santosh Shilimkar Subject: [PATCH 1/3] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Date: Fri, 1 Feb 2013 16:01:17 -0500 Message-Id: <1359752479-29427-2-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359752479-29427-1-git-send-email-mporter@ti.com> References: <1359752479-29427-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 platforms booting with or without DT populated. Signed-off-by: Matt Porter Acked-by: Tony Lindgren Acked-by: Santosh Shilimkar --- 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 bc58078..e79b12d 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1915,14 +1915,20 @@ static int 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;