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: 3873561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4C7D29F370 for ; Fri, 21 Mar 2014 12:20:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 68C2A2026C for ; Fri, 21 Mar 2014 12:20:48 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B33E20268 for ; Fri, 21 Mar 2014 12:20:47 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyPX-0000GK-Aa; Fri, 21 Mar 2014 12:18:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyOX-0003WL-Bi; Fri, 21 Mar 2014 12:17:53 +0000 Received: from mail-lb0-f180.google.com ([209.85.217.180]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQyMJ-0003I8-U4 for linux-arm-kernel@lists.infradead.org; Fri, 21 Mar 2014 12:15:38 +0000 Received: by mail-lb0-f180.google.com with SMTP id 10so1570958lbg.39 for ; Fri, 21 Mar 2014 05:15:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2253jK55XXg4b571zSMAYjUJYZXUVs/TGUMcQweYXPM=; b=LlVzq1IUeJhNctybjeDEtJSXaGKO209KbSMd4OlegtWLcO6dNVu+u1JoSedzK/uJ0x N9LlJhoP0e1rQ/B4/FUZtQD1VbN12rzxdJY4DMVonJV7VK011KQdwIPsslgL2b/sYjNC nxbOOJGpr7iRMTZ69Eg96ncfTfJBpdsTt2qwBFoCJ2qeGxkCqRjzqegKxmzqUu5/XE9A wy3063CiGLTC4IaACKX6zEhXmWlYMv84O6BEtMPxgF30QuTJBu8QCv+gKMT9Tj9JArfc b20K8Okah0Wk/VowCyLlusUdvsxLowm8m/qv28aCTNr2nCQl76citAvpu45ipQuNE0H2 HrDQ== X-Gm-Message-State: ALoCoQkdVk1fHPzM46na0kFqfwERwUmxmWPmqlcg73dxlIrXIH3he8akEhR+u/9MEAdPMyFGMRPp 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140321_081536_235588_DC53FD9C X-CRM114-Status: GOOD ( 16.21 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;