From patchwork Wed Mar 6 14:12:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 2226231 Return-Path: X-Original-To: patchwork-linux-mmc@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 4BDEA40077 for ; Wed, 6 Mar 2013 14:12:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758236Ab3CFOLr (ORCPT ); Wed, 6 Mar 2013 09:11:47 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:56793 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757408Ab3CFOLo (ORCPT ); Wed, 6 Mar 2013 09:11:44 -0500 Received: by mail-ie0-f174.google.com with SMTP id k10so9307873iea.19 for ; Wed, 06 Mar 2013 06:11:44 -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=y5QmxT2miTtPMXsQ4ygBVNHvhxZ/vKzegCnbvf2zhLc=; b=MaRI7TktCIZZSLViRJsAsmI7lsE0b5oO8zgZOvY2EZaYmDur/uvNtQCTAyru/gzCyC mmAE+ivEzoBguu6CXWFFj5Ujc9/6KDye2NuzOLtYtZCw9I5sR6VmnaBergseuHQnNVId Ir8IW8OFr0wnEZe1IJUC7KWT1pYXAjViI4E8/WpgsZ+joGdUnSxOeYI+0auPo9JG2rKQ TEM/TwoWO/qQ9h5Za8AymiH8FVCZtnrenz2PqslMAV8+J+zbxbIY3lERlM0wswlCZ60B 3GVEKOhy3bNx6Fsu4A3UruJCo7nRp8Rb2Zcd2rdQPNev2sb4pD8YHgNc8G7vjJfJ/YT2 mKww== X-Received: by 10.50.197.170 with SMTP id iv10mr10636071igc.62.1362579104159; Wed, 06 Mar 2013 06:11:44 -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 px9sm22544695igc.0.2013.03.06.06.11.41 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Mar 2013 06:11:42 -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 v3 1/2] mmc: omap_hsmmc: convert to dma_request_slave_channel_compat() Date: Wed, 6 Mar 2013 09:12:07 -0500 Message-Id: <1362579128-5312-2-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362579128-5312-1-git-send-email-mporter@ti.com> References: <1362579128-5312-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 platforms booting with or without DT populated. Signed-off-by: Matt Porter Acked-by: Tony Lindgren Acked-by: Arnd Bergmann --- 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;