diff options
| author | Adrian Hunter <adrian.hunter@nokia.com> | 2010-02-15 10:03:34 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 10:03:34 -0800 |
| commit | 1df58db8a25ec7656005f1dd161a9ede044551b7 (patch) | |
| tree | 33d94939a62ccec8c51753a015833d165d7bdd2b /arch | |
| parent | ce6f00165d5314698afd04ee20cede156cfcc593 (diff) | |
omap_hsmmc: Allow for power saving without going off
An eMMC may be always powered on, so that the lowest
power saving state possible is sleeping. Add a field
to the platform data to indicate that.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.h | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 4a05c3722d5..e4ab123cd4d 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -202,6 +202,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) if (c->power_saving) mmc->slots[0].power_saving = 1; + if (c->no_off) + mmc->slots[0].no_off = 1; + /* NOTE: MMC slots should have a Vcc regulator set up. * This may be from a TWL4030-family chip, another * controllable regulator, or a fixed supply. diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h index f641f592ffa..2453a7aeaf6 100644 --- a/arch/arm/mach-omap2/hsmmc.h +++ b/arch/arm/mach-omap2/hsmmc.h @@ -14,6 +14,7 @@ struct omap2_hsmmc_info { bool cover_only; /* No card detect - just cover switch */ bool nonremovable; /* Nonremovable e.g. eMMC */ bool power_saving; /* Try to sleep or power off when possible */ + bool no_off; /* power_saving and power is not to go off */ int gpio_cd; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */ char *name; /* or NULL for default */ diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 8b23d32895f..b46394955f3 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -96,6 +96,9 @@ struct omap_mmc_platform_data { /* Try to sleep or power off when possible */ unsigned power_saving:1; + /* If using power_saving and the MMC power is not to go off */ + unsigned no_off:1; + int switch_pin; /* gpio (card detect) */ int gpio_wp; /* gpio (write protect) */ |