[1/2] mmc: sdhci move vmmc to set_ios

Commit Message

Zhangfei Gao July 26, 2011, 7:06 a.m. UTC

Move vmmc to set_ios, as a result mmc_power_up/down handles regulator_enable/disable vmmc
Move regulator outof spin_lock, since usually i2c operation is called
Remove vmmc from suspend/resume function, instead vmmc is handled properly in mmc_suspend/resume_host according to mmc_card_keep_power

CC: Ohad Ben-Cohen <[e-mail]>
Signed-off-by: Zhangfei Gao <[e-mail]>
---
 drivers/mmc/host/sdhci.c  |   27 +++++++++++++++------------
 include/linux/mmc/sdhci.h |    1 +
 2 files changed, 16 insertions(+), 12 deletions(-)

Comments

Zhangfei Gao Aug. 24, 2011, 1:22 p.m. UTC | #1

On Tue, Jul 26, 2011 at 3:06 PM, Zhangfei Gao <[e-mail]> wrote:
> Move vmmc to set_ios, as a result mmc_power_up/down handles regulator_enable/disable vmmc
> Move regulator outof spin_lock, since usually i2c operation is called
> Remove vmmc from suspend/resume function, instead vmmc is handled properly in mmc_suspend/resume_host according to mmc_card_keep_power
>
> CC: Ohad Ben-Cohen <[e-mail]>
> Signed-off-by: Zhangfei Gao <[e-mail]>
> ---
>  drivers/mmc/host/sdhci.c  |   27 +++++++++++++++------------
>  include/linux/mmc/sdhci.h |    1 +
>  2 files changed, 16 insertions(+), 12 deletions(-)
>

Hi, Daniel

We found some impact to sd if reusing vmmc in set_ios, when no sd card
is inserted.
When no sd card, CD pin is high, but when vmmc is disabled in
mmc_power_down, as a result CD pin will be pulled down, which is same
as sd card is inserted, however the card detect will fail since no sd
card in fact.

So additional regulator vsdio still required to control power of
vsdio, to make mmc_power_up/down control sdio power.

Thanks

Patch

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c31a334..ce4f97f 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1279,6 +1279,13 @@  static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
 	host = mmc_priv(mmc);
 
+	if (host->vmmc) {
+		if (ios->power_mode != host->power_mode_old) {
+			if (ios->power_mode == MMC_POWER_UP)
+				regulator_enable(host->vmmc);
+		}
+	}
+
 	spin_lock_irqsave(&host->lock, flags);
 
 	if (host->flags & SDHCI_DEVICE_DEAD)
@@ -1426,6 +1433,14 @@  static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 out:
 	mmiowb();
 	spin_unlock_irqrestore(&host->lock, flags);
+
+	if (host->vmmc) {
+		if (ios->power_mode != host->power_mode_old) {
+			if (ios->power_mode == MMC_POWER_OFF)
+				regulator_disable(host->vmmc);
+		}
+		host->power_mode_old = ios->power_mode;
+	}
 }
 
 static int check_ro(struct sdhci_host *host)
@@ -2262,9 +2277,6 @@  int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)
 
 	free_irq(host->irq, host);
 
-	if (host->vmmc)
-		ret = regulator_disable(host->vmmc);
-
 	return ret;
 }
 
@@ -2274,13 +2286,6 @@  int sdhci_resume_host(struct sdhci_host *host)
 {
 	int ret;
 
-	if (host->vmmc) {
-		int ret = regulator_enable(host->vmmc);
-		if (ret)
-			return ret;
-	}
-
-
 	if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
 		if (host->ops->enable_dma)
 			host->ops->enable_dma(host);
@@ -2749,8 +2754,6 @@  int sdhci_add_host(struct sdhci_host *host)
 	if (IS_ERR(host->vmmc)) {
 		printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc));
 		host->vmmc = NULL;
-	} else {
-		regulator_enable(host->vmmc);
 	}
 
 	sdhci_init(host, 0);
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 5666f3a..2e6e711 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -94,6 +94,7 @@  struct sdhci_host {
 	const struct sdhci_ops *ops;	/* Low level hw interface */
 
 	struct regulator *vmmc;	/* Power regulator */
+	unsigned char power_mode_old;	/* power supply mode */
 
 	/* Internal data */
 	struct mmc_host *mmc;	/* MMC structure */