2008-12-12 13:58:53 +02:00
|
|
|
From 792fb6dd55c282de25005a1399ffaa084ece4b1c Mon Sep 17 00:00:00 2001
|
2008-12-12 02:02:36 +02:00
|
|
|
From: Andy Green <andy@openmoko.com>
|
2008-12-12 13:58:53 +02:00
|
|
|
Date: Wed, 30 Jul 2008 12:46:34 +0100
|
2008-12-12 02:02:36 +02:00
|
|
|
Subject: [PATCH] fix-glamo-mci-dont-filter-voltage-change.patch
|
|
|
|
|
|
|
|
Signed-off-by: Andy Green <andy@openmoko.com>
|
|
|
|
---
|
|
|
|
drivers/mfd/glamo/glamo-mci.c | 11 +++++------
|
|
|
|
1 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
|
2008-12-12 13:58:53 +02:00
|
|
|
index c2351e2..54ba613 100644
|
2008-12-12 02:02:36 +02:00
|
|
|
--- a/drivers/mfd/glamo/glamo-mci.c
|
|
|
|
+++ b/drivers/mfd/glamo/glamo-mci.c
|
|
|
|
@@ -690,17 +690,16 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
|
|
|
switch(ios->power_mode) {
|
|
|
|
case MMC_POWER_ON:
|
|
|
|
case MMC_POWER_UP:
|
|
|
|
- if (host->power_mode_current != MMC_POWER_OFF)
|
|
|
|
- break;
|
|
|
|
if (host->vdd_current != ios->vdd) {
|
|
|
|
host->pdata->glamo_set_mci_power(ios->power_mode,
|
|
|
|
ios->vdd);
|
|
|
|
host->vdd_current = ios->vdd;
|
|
|
|
}
|
|
|
|
- glamo_engine_enable(glamo_mci_def_pdata.pglamo,
|
|
|
|
- GLAMO_ENGINE_MMC);
|
|
|
|
- glamo_mci_reset(host);
|
|
|
|
- powering = 1;
|
|
|
|
+ if (host->power_mode_current == MMC_POWER_OFF) {
|
|
|
|
+ glamo_engine_enable(glamo_mci_def_pdata.pglamo,
|
|
|
|
+ GLAMO_ENGINE_MMC);
|
|
|
|
+ powering = 1;
|
|
|
|
+ }
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MMC_POWER_OFF:
|
|
|
|
--
|
2008-12-12 13:58:53 +02:00
|
|
|
1.5.6.5
|
2008-12-12 02:02:36 +02:00
|
|
|
|