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 f67fd4f..0b4a5bf 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -101,13 +101,7 @@
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) {
/*