From: Suneel Garapati <suneel.garapati@xilinx.com>
To: <linux-mmc@vger.kernel.org>, <linux-kernel@vger.kernel.org>
CC: Ulf Hansson <ulf.hansson@linaro.org>, <michals@xilinx.com>,
        <sorenb@xilinx.com>, Adrian Hunter <adrian.hunter@intel.com>,
        Aisheng Dong <b29396@freescale.com>,
        Haibo Chen <haibo.chen@freescale.com>,
        Tim Kryger <tim.kryger@gmail.com>, Shawn Guo <shawn.guo@linaro.org>,
        Yi Sun <yi.y.sun@intel.com>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>, <stripathi@apm.com>,
        Suneel Garapati <suneel.garapati@xilinx.com>
Subject: [PATCH] drivers: mmc: sdhci: update max frequency only if undefined
Date: Thu, 18 Jun 2015 12:57:07 +0530
Message-ID: <1434612427-1758-1-git-send-email-suneel.garapati@xilinx.com>
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2015 07:27:25.1212
 (UTC)
X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.60.83];Helo=[xsj-pvapsmtpgw01]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2FFO11HUB024
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1060
Lines: 32

f_max parameter of mmc structure is updated unconditionally.
If dt property max-frequency is assigned, this update is
overwriting the dt property value which is undesired.

Signed-off-by: Suneel Garapati <suneel.garapati@xilinx.com>
---
 drivers/mmc/host/sdhci.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index bc14452..c2917d5 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3047,7 +3047,10 @@ int sdhci_add_host(struct sdhci_host *host)
	 * Set host parameters.
	 */
	mmc->ops = &sdhci_ops;
-	mmc->f_max = host->max_clk;
+
+	if(!mmc->f_max)
+		mmc->f_max = host->max_clk;
+
	if (host->ops->get_min_clock)
		mmc->f_min = host->ops->get_min_clock(host);
	else if (host->version >= SDHCI_SPEC_300) {
--
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/