summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBalaji T K <balajitk@ti.com>2011-05-30 19:55:34 +0530
committerTony Lindgren <tony@atomide.com>2011-06-01 02:25:04 -0700
commitb1c1df7a7d50bf94de89704e963467bc94b1fef9 (patch)
treebe95cd2ed5cc248ac22cb31f3e6da382b135f41f /drivers
parente68273baf30390e9c907831b47384085c7f664d5 (diff)
downloadlinux-stable-b1c1df7a7d50bf94de89704e963467bc94b1fef9.tar.gz
linux-stable-b1c1df7a7d50bf94de89704e963467bc94b1fef9.tar.bz2
linux-stable-b1c1df7a7d50bf94de89704e963467bc94b1fef9.zip
ARM: OMAP4: MMC: no regulator off during probe for eMMC
eMMC does not handle power off when not in sleep state, Skip regulator disable during probe when eMMC is not in known state - state left by bootloader. Resolves eMMC failure on OMAP4 mmc0: error -110 whilst initialising MMC card Signed-off-by: Balaji T K <balajitk@ti.com> Tested-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Acked-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/omap_hsmmc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 259ece047afc..5b2e2155b413 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -435,6 +435,9 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
reg = regulator_get(host->dev, "vmmc_aux");
host->vcc_aux = IS_ERR(reg) ? NULL : reg;
+ /* For eMMC do not power off when not in sleep state */
+ if (mmc_slot(host).no_regulator_off_init)
+ return 0;
/*
* UGLY HACK: workaround regulator framework bugs.
* When the bootloader leaves a supply active, it's