diff options
author | Adrian Hunter <adrian.hunter@nokia.com> | 2010-02-15 19:03:34 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 19:03:34 +0100 |
commit | ce6f00165d5314698afd04ee20cede156cfcc593 (patch) | |
tree | d7df468cf7143cdb99917b5de25a923c4abc2807 /arch/arm/mach-omap2/hsmmc.c | |
parent | omap: Reconnect hsmmc context loss count (diff) | |
download | linux-ce6f00165d5314698afd04ee20cede156cfcc593.tar.xz linux-ce6f00165d5314698afd04ee20cede156cfcc593.zip |
omap: RX51: Remux to pull eMMC lines down when powering off
It has been discovered that, when eMMC is powered off, current
will flow from OMAP eMMC data pull-ups to the eMMC voltage supply.
Configuring pads for OMAP off-mode does not help because eMMC is
powered off independently of OMAP off-mode. Hence the pads are
now re-configured when eMMC is powered on or off.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/hsmmc.c')
-rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index cc7e77f09268..4a05c3722d54 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -48,6 +48,9 @@ static void hsmmc1_before_set_reg(struct device *dev, int slot, u32 reg, prog_io; struct omap_mmc_platform_data *mmc = dev->platform_data; + if (mmc->slots[0].remux) + mmc->slots[0].remux(dev, slot, power_on); + /* * Assume we power both OMAP VMMC1 (for CMD, CLK, DAT0..3) and the * card with Vcc regulator (from twl4030 or whatever). OMAP has both @@ -121,6 +124,9 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot, { struct omap_mmc_platform_data *mmc = dev->platform_data; + if (mmc->slots[0].remux) + mmc->slots[0].remux(dev, slot, power_on); + if (power_on) { /* Only MMC2 supports a CLKIN */ if (mmc->slots[0].internal_clock) { @@ -185,6 +191,8 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) mmc->slots[0].switch_pin = c->gpio_cd; mmc->slots[0].gpio_wp = c->gpio_wp; + mmc->slots[0].remux = c->remux; + if (c->cover_only) mmc->slots[0].cover = 1; |