Skip to contentSkip to conversation

mmci: partially revert clock divisor code

PATCH New Linus Walleij 2 participants 3 messages Dec 9, 2010 – Dec 10, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/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.

---
 drivers/mmc/host/mmci.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
drivers/mmc/host/mmci.c +1 -7
index 82880e8..907e582 100644
@@ -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) {
 			/*
Signature · 1 line
1.7.3.2
#1 lore raw

PATCH 1/1 mmci: partially revert clock divisor code

Quoted 3 lines · Linus Walleij

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.

Should this be merged with the patch which introduced this change?

#2 lore raw

PATCH 1/1 mmci: partially revert clock divisor code

[Russell]

Quoted 6 lines · Linus Walleij
Quoted 3 lines

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.

Should this be merged with the patch which introduced this change?

If you want to squash them into one, feel free to go ahead. I'm fine either way.

Yours,
Linus Walleij