From patchwork Thu Apr 18 08:02:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 237473 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A6A4A2C01E4 for ; Thu, 18 Apr 2013 18:02:58 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USjnw-00073f-Du; Thu, 18 Apr 2013 08:02:52 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1USjnt-0006NX-JU; Thu, 18 Apr 2013 08:02:49 +0000 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USjnr-0006ND-4j for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2013 08:02:47 +0000 Received: by mail-wi0-f182.google.com with SMTP id m6so2511559wiv.3 for ; Thu, 18 Apr 2013 01:02:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent:x-gm-message-state; bh=EBlLNA1OVpBBn/7N3GveW7/GU6TKOcf29TB37mRD+Jc=; b=ojrUolHDvIYsVq1NfTG3ZkTuwiTPuov1/ZCJ6nAu3h7ZNprMeoaPKJZ//K8Dnl4Xrw RjDNI1cqu7t61C/dSFqfrPRk3iyNMPmNpjD1HF4mslHpWmSNUgsMlDEB1+S52mUmmZt6 JuqD5iKi4464nBUUffx6ZStIYEw3KiA08ZnHXytUrUt9yu5vguH47/g0V+MOJ0hFMnQy +COVDo6wwzOHcJDW/hDj/Z2n/vJQpHERb0gNIVJCQP9EdCkk6thxFyKQ0bSA4I92/w3a k7qiWutCk2P9blDDABRUk3i+DeWKfKAYgG3tO2TY58e82ECUcdoGwmM15mRqRMWIvmDS umiA== X-Received: by 10.180.72.165 with SMTP id e5mr31246859wiv.7.1366272162323; Thu, 18 Apr 2013 01:02:42 -0700 (PDT) Received: from gmail.com (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id o3sm14398348wia.2.2013.04.18.01.02.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 18 Apr 2013 01:02:41 -0700 (PDT) Date: Thu, 18 Apr 2013 09:02:38 +0100 From: Lee Jones To: Arnd Bergmann Subject: Re: [PATCH] mmc: mmci: Allow MMCI to request channels with information acquired from DT Message-ID: <20130418080238.GB3137@gmail.com> References: <1366205534-25079-1-git-send-email-lee.jones@linaro.org> <201304171550.56037.arnd@arndb.de> <20130417150437.GA3137@gmail.com> <201304171731.56292.arnd@arndb.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201304171731.56292.arnd@arndb.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmnN4skhq9gLnIBGgA12Zwby4SBuUR64zIQ3rNxIw04hsLk65dsobFpyPK/55qVYpnP+UYp X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130418_040247_300964_76560177 X-CRM114-Status: GOOD ( 14.88 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Russell King , linus.walleij@stericsson.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Ball , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org > I think you can further simplify this, given that in the DT case we always > allocate a zeroed mmci_platform_data for host->plat, so !plat cannot happen > when we get here. Okay, third time lucky. :) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 372e921..3260ab4 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -298,14 +298,16 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data) * no custom DMA interfaces are supported. */ #ifdef CONFIG_DMA_ENGINE -static void mmci_dma_setup(struct mmci_host *host) +static void mmci_dma_setup(struct amba_device *dev, + struct mmci_host *host) { + struct device_node *np = dev->dev.of_node; struct mmci_platform_data *plat = host->plat; const char *rxname, *txname; dma_cap_mask_t mask; - if (!plat || !plat->dma_filter) { - dev_info(mmc_dev(host->mmc), "no DMA platform data\n"); + if (!(plat->dma_filter || np)) { + dev_info(mmc_dev(host->mmc), "no DMA platform data or DT\n"); return; } @@ -321,19 +323,21 @@ static void mmci_dma_setup(struct mmci_host *host) * attempt to use it bidirectionally, however if it is * is specified but cannot be located, DMA will be disabled. */ - if (plat->dma_rx_param) { - host->dma_rx_channel = dma_request_channel(mask, - plat->dma_filter, - plat->dma_rx_param); + if (plat->dma_rx_param || np) { + host->dma_rx_channel = dma_request_slave_channel_compat(mask, + plat->dma_filter, + plat->dma_rx_param, + &dev->dev, "rx"); /* E.g if no DMA hardware is present */ if (!host->dma_rx_channel) dev_err(mmc_dev(host->mmc), "no RX DMA channel\n"); } - if (plat->dma_tx_param) { - host->dma_tx_channel = dma_request_channel(mask, - plat->dma_filter, - plat->dma_tx_param); + if (plat->dma_tx_param || np) { + host->dma_tx_channel = dma_request_slave_channel_compat(mask, + plat->dma_filter, + plat->dma_tx_param, + &dev->dev, "tx"); if (!host->dma_tx_channel) dev_warn(mmc_dev(host->mmc), "no TX DMA channel\n"); } else { @@ -1538,7 +1542,7 @@ static int mmci_probe(struct amba_device *dev, amba_rev(dev), (unsigned long long)dev->res.start, dev->irq[0], dev->irq[1]); - mmci_dma_setup(host); + mmci_dma_setup(dev, host); pm_runtime_set_autosuspend_delay(&dev->dev, 50); pm_runtime_use_autosuspend(&dev->dev);