The patch titled
MMC: OMAP: Fix omap to use MMC_POWER_ON
has been added to the -mm tree. Its filename is
mmc-omap-fix-omap-to-use-mmc_power_on.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: MMC: OMAP: Fix omap to use MMC_POWER_ON
From: Carlos Aguiar <carlos.aguiar@xxxxxxxxxxx>
As discussed earlier on LKML:
http://lkml.org/lkml/2006/5/4/44
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Pierre Ossman <drzeus@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/host/omap.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/mmc/host/omap.c~mmc-omap-fix-omap-to-use-mmc_power_on drivers/mmc/host/omap.c
--- a/drivers/mmc/host/omap.c~mmc-omap-fix-omap-to-use-mmc_power_on
+++ a/drivers/mmc/host/omap.c
@@ -969,8 +969,10 @@ static void mmc_omap_set_ios(struct mmc_
mmc_omap_power(host, 0);
break;
case MMC_POWER_UP:
- case MMC_POWER_ON:
+ /* Cannot touch dsor yet, just power up MMC */
mmc_omap_power(host, 1);
+ return;
+ case MMC_POWER_ON:
dsor |= 1 << 11;
break;
}
@@ -986,7 +988,7 @@ static void mmc_omap_set_ios(struct mmc_
* Writing to the CON register twice seems to do the trick. */
for (i = 0; i < 2; i++)
OMAP_MMC_WRITE(host, CON, dsor);
- if (ios->power_mode == MMC_POWER_UP) {
+ if (ios->power_mode == MMC_POWER_ON) {
/* Send clock cycles, poll completion */
OMAP_MMC_WRITE(host, IE, 0);
OMAP_MMC_WRITE(host, STAT, 0xffff);
_
Patches currently in -mm which might be from carlos.aguiar@xxxxxxxxxxx are
mmc-omap-add-missing-newline.patch
mmc-omap-fix-omap-to-use-mmc_power_on.patch
mmc-omap-clean-up-omap-set_ios-and-make-mmc_power_on.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
