From patchwork Tue Mar 5 21:13:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 2222031 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 DBC52DF24C for ; Tue, 5 Mar 2013 21:13:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757940Ab3CEVNE (ORCPT ); Tue, 5 Mar 2013 16:13:04 -0500 Received: from mail-ie0-f177.google.com ([209.85.223.177]:59129 "EHLO mail-ie0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757265Ab3CEVNB (ORCPT ); Tue, 5 Mar 2013 16:13:01 -0500 Received: by mail-ie0-f177.google.com with SMTP id 16so8158554iea.8 for ; Tue, 05 Mar 2013 13:13:00 -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=RmNgc/O27mJrGh72yawpAkjDzGSEfFGUtOs+idEuHRiA539+IxzmxRd3gKcR7nSmbb R9b/9Q9qeNHY2ZbzWb7BkUmW7J2Orek7l4s/hkjJ7FeQX0GUWITQxTFPR10dVNYPoxxm sFPFQkYDbJN3dzbZY8FW4cF833dl9hUQnDGyN8k56c65kZlj+xOR1pivpczRmGqAe8hN bNNviAAlepRMg0l974Q6VwPT3IbUFfXYly5K3V6r0wSjkxaWuSb3QnmvwWL4O5llM3r9 lMNGxII7GjhiGFR9bKGqSR2DNk5uavUwNrJN5z/pM/4nMTd1ZOzmeW/z1wAStui563nz NAoQ== X-Received: by 10.50.57.232 with SMTP id l8mr7872989igq.49.1362517980867; Tue, 05 Mar 2013 13:13:00 -0800 (PST) Received: from beef.ohporter.com (cpe-98-27-254-98.neo.res.rr.com. [98.27.254.98]) by mx.google.com with ESMTPS id in10sm16921383igc.1.2013.03.05.13.12.59 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Mar 2013 13:13:00 -0800 (PST) From: Matt Porter To: Balaji T K , 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 v2 1/3] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Date: Tue, 5 Mar 2013 16:13:22 -0500 Message-Id: <1362518004-7083-2-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362518004-7083-1-git-send-email-mporter@ti.com> References: <1362518004-7083-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 --- 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;