From: Tony Lindgren <tony@atomide.com>
Date: Thu, 4 May 2006 08:20:37 +0000 (-0700)
Subject: Undo MMC patch e2607096a5fb9b67f8e1a7bafa824109b8da45d6
X-Git-Tag: v2.6.17-omap1~84
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6a033b86e94136f41e2fdb92ca80f2aa08b1806d;p=linux-2.6-omap-h63xx.git

Undo MMC patch e2607096a5fb9b67f8e1a7bafa824109b8da45d6

Using MMC_POWER_ON is a better solution as noted by RMK
---

diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 51670cf1eed..7c8b6ceb934 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -899,16 +899,9 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	int dsor;
 	int realclock, i;
 
-	/* According to the MMC spec we must not enable clock prior to
-	 * power stabilizing. But at least omap16xx needs clock dsor
-	 * configured during MMC_POWER_UP.
-	 */
-	if ((ios->power_mode == MMC_POWER_UP) && (ios->clock == 0))
-		realclock = mmc->f_min;
-	else
-		realclock = ios->clock;
+	realclock = ios->clock;
 
-	if (realclock == 0)
+	if (ios->clock == 0)
 		dsor = 0;
 	else {
 		int func_clk_rate = clk_get_rate(host->fclk);