diff options
author | Adrian Hunter <adrian.hunter@nokia.com> | 2010-02-15 13:03:34 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 13:03:34 -0500 |
commit | 1df58db8a25ec7656005f1dd161a9ede044551b7 (patch) | |
tree | 33d94939a62ccec8c51753a015833d165d7bdd2b /arch/arm/mach-omap2 | |
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/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/hsmmc.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 4a05c3722d54..e4ab123cd4d0 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) | |||
202 | if (c->power_saving) | 202 | if (c->power_saving) |
203 | mmc->slots[0].power_saving = 1; | 203 | mmc->slots[0].power_saving = 1; |
204 | 204 | ||
205 | if (c->no_off) | ||
206 | mmc->slots[0].no_off = 1; | ||
207 | |||
205 | /* NOTE: MMC slots should have a Vcc regulator set up. | 208 | /* NOTE: MMC slots should have a Vcc regulator set up. |
206 | * This may be from a TWL4030-family chip, another | 209 | * This may be from a TWL4030-family chip, another |
207 | * controllable regulator, or a fixed supply. | 210 | * controllable regulator, or a fixed supply. |
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h index f641f592ffad..2453a7aeaf6f 100644 --- a/arch/arm/mach-omap2/hsmmc.h +++ b/arch/arm/mach-omap2/hsmmc.h | |||
@@ -14,6 +14,7 @@ struct omap2_hsmmc_info { | |||
14 | bool cover_only; /* No card detect - just cover switch */ | 14 | bool cover_only; /* No card detect - just cover switch */ |
15 | bool nonremovable; /* Nonremovable e.g. eMMC */ | 15 | bool nonremovable; /* Nonremovable e.g. eMMC */ |
16 | bool power_saving; /* Try to sleep or power off when possible */ | 16 | bool power_saving; /* Try to sleep or power off when possible */ |
17 | bool no_off; /* power_saving and power is not to go off */ | ||
17 | int gpio_cd; /* or -EINVAL */ | 18 | int gpio_cd; /* or -EINVAL */ |
18 | int gpio_wp; /* or -EINVAL */ | 19 | int gpio_wp; /* or -EINVAL */ |
19 | char *name; /* or NULL for default */ | 20 | char *name; /* or NULL for default */ |