From patchwork Fri Mar 21 12:14:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 26822 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B3DD203AB for ; Fri, 21 Mar 2014 12:15:16 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf7876534iec.6 for ; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=2253jK55XXg4b571zSMAYjUJYZXUVs/TGUMcQweYXPM=; b=DoOEy+ZA9Leypd5TPvDE+RLnM/SIfxkSQVEt9/UiTHWS10lA8c/jpjsbnWCVBd+AKD fn1MlEKL2rJhBOsQnZrlEEf++QRIiXLgIXVX4YLZBoPUoKcBR6BMDcY3n8C8OBbDebHC hLoQeTTMVIcNVRTAu6UgyWXWdL8kptfnYfeWPLQtzSwjF8WKYsEqXgGtNxbpWPMHrHiw 3fa4kssSr3yTl6OwkQ6O0tfRPRoUBYapk9l20b1zQFGvFto0K2tngodbHvyazMN21XAi DpLEQa08vTs/wqqQb2PsapKOAvdTlaKqnNkEgL8Yug9ZiyANT/Hjs2G29ZX+/TiOkL4P dkkw== X-Gm-Message-State: ALoCoQl1/QTye0juKsSB3Q5/3Kf1tzOlrYoksDps+GQ0s6jHXaND8IiOneRyJQXigftOj/13QUZv X-Received: by 10.182.28.36 with SMTP id y4mr5924004obg.46.1395404115669; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.51.130 with SMTP id u2ls605646qga.34.gmail; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) X-Received: by 10.221.74.65 with SMTP id yv1mr7375212vcb.31.1395404115559; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id f9si1079003vck.37.2014.03.21.05.15.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id la4so2488467vcb.31 for ; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) X-Received: by 10.58.31.136 with SMTP id a8mr24115399vei.20.1395404115432; Fri, 21 Mar 2014 05:15:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.78.9 with SMTP id i9csp26005vck; Fri, 21 Mar 2014 05:15:14 -0700 (PDT) X-Received: by 10.152.36.199 with SMTP id s7mr831755laj.48.1395404114302; Fri, 21 Mar 2014 05:15:14 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by mx.google.com with ESMTPS id qs7si3895354lbb.153.2014.03.21.05.15.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:14 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.179 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id p9so1574411lbv.38 for ; Fri, 21 Mar 2014 05:15:13 -0700 (PDT) X-Received: by 10.112.22.130 with SMTP id d2mr17634887lbf.33.1395404113816; Fri, 21 Mar 2014 05:15:13 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id tq9sm3255263lbb.10.2014.03.21.05.15.11 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 05:15:13 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King , Linus Walleij Cc: devicetree@vger.kernel.org, Ulf Hansson Subject: [PATCH 17/20] mmc: mmci: Enforce DT for signal direction Date: Fri, 21 Mar 2014 13:14:14 +0100 Message-Id: <1395404057-27835-18-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> References: <1395404057-27835-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Remove the option to provide signal direction configuration as platform data, enforce it through DT. Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 24 ++++++++---------------- drivers/mmc/host/mmci.h | 1 + include/linux/amba/mmci.h | 4 ---- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index edf3cfd..bef3f85 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -1287,7 +1288,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) * indicating signal direction for the signals in * the SD/MMC bus and feedback-clock usage. */ - pwr |= host->plat->sigdir; + pwr |= host->sigdir; if (ios->bus_width == MMC_BUS_WIDTH_4) pwr &= ~MCI_ST_DATA74DIREN; @@ -1386,24 +1387,18 @@ static struct mmc_host_ops mmci_ops = { .start_signal_voltage_switch = mmci_sig_volt_switch, }; -static void mmci_dt_populate_generic_pdata(struct device_node *np, - struct mmci_platform_data *pdata) -{ - u32 sigdir = 0; - - if (!of_property_read_u32(np, "signal-direction", &sigdir)) { - sigdir &= MCI_ST_DATA2DIREN|MCI_ST_CMDDIREN|MCI_ST_DATA0DIREN| - MCI_ST_DATA31DIREN|MCI_ST_FBCLKEN|MCI_ST_DATA74DIREN; - pdata->sigdir = sigdir; - } -} - static int mmci_of_parse(struct device_node *np, struct mmc_host *mmc) { + struct mmci_host *host = mmc_priv(mmc); int ret = mmc_of_parse(mmc); if (ret) return ret; + if (!of_property_read_u32(np, "signal-direction", &host->sigdir)) + host->sigdir &= MCI_ST_DATA2DIREN | MCI_ST_CMDDIREN | + MCI_ST_DATA0DIREN | MCI_ST_DATA31DIREN | + MCI_ST_FBCLKEN | MCI_ST_DATA74DIREN; + if (of_get_property(np, "mmc-cap-mmc-highspeed", NULL)) mmc->caps |= MMC_CAP_MMC_HIGHSPEED; if (of_get_property(np, "mmc-cap-sd-highspeed", NULL)) @@ -1434,9 +1429,6 @@ static int mmci_probe(struct amba_device *dev, return -ENOMEM; } - if (np) - mmci_dt_populate_generic_pdata(np, plat); - if (!devm_request_mem_region(&dev->dev, dev->res.start, resource_size(&dev->res), DRIVER_NAME)) return -ENOMEM; diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 8fc5814..6fdd11b 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -188,6 +188,7 @@ struct mmci_host { u32 busy_status; bool vqmmc_enabled; struct mmci_platform_data *plat; + u32 sigdir; struct variant_data *variant; u8 hw_designer; diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index 47ff176..0d3ff95 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -5,7 +5,6 @@ #define AMBA_MMCI_H #include -#include /* Just some dummy forwarding */ struct dma_chan; @@ -33,8 +32,6 @@ struct dma_chan; * @capabilities: the capabilities of the block as implemented in * this platform, signify anything MMC_CAP_* from mmc/host.h * @capabilities2: more capabilities, MMC_CAP2_* from mmc/host.h - * @sigdir: a bit field indicating for what bits in the MMC bus the host - * should enable signal direction indication. * @dma_filter: function used to select an appropriate RX and TX * DMA channel to be used for DMA, if and only if you're deploying the * generic DMA engine @@ -57,7 +54,6 @@ struct mmci_platform_data { bool cd_invert; unsigned long capabilities; unsigned long capabilities2; - u32 sigdir; bool (*dma_filter)(struct dma_chan *chan, void *filter_param); void *dma_rx_param; void *dma_tx_param;