From: Linus Walleij <linus.walleij@stericsson.com>
Date: Fri, 10 Dec 2010 08:35:53 +0000 (+0100)
Subject: ARM: 6530/1: mmci: partially revert clock divisor code
X-Git-Tag: v2.6.38-rc1~471^2~4^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=991a86e182203913b71607f0695955d7e23075d7;p=~shefty%2Frdma-dev.git

ARM: 6530/1: mmci: partially revert clock divisor code

I misread the datasheet as if bypass mode was not available at all
on the ux500's, I was wrong. It is there, the datasheet just
states that you should not have to use it.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f67fd4f2ab4..0b4a5bf0ec2 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -101,13 +101,7 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired)
 
 	if (desired) {
 		if (desired >= host->mclk) {
-			/*
-			 * The ST clock divider does not like the bypass bit,
-			 * even though it's available. Instead the datasheet
-			 * recommends setting the divider to zero.
-			 */
-			if (!variant->st_clkdiv)
-				clk = MCI_CLK_BYPASS;
+			clk = MCI_CLK_BYPASS;
 			host->cclk = host->mclk;
 		} else if (variant->st_clkdiv) {
 			/*