Commit 991a86e1 authored Dec 10, 2010 by Linus Walleij Committed by Russell King Dec 19, 2010

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>

parent b70a67f9

drivers/mmc/host/mmci.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -101,12 +101,6 @@ 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;
		host->cclk = host->mclk;
		} else if (variant->st_clkdiv) {