aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/hsmmc.c3
-rw-r--r--arch/arm/mach-omap2/hsmmc.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index e4ab123cd4d0..9ad229594b46 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -205,6 +205,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
205 if (c->no_off) 205 if (c->no_off)
206 mmc->slots[0].no_off = 1; 206 mmc->slots[0].no_off = 1;
207 207
208 if (c->vcc_aux_disable_is_sleep)
209 mmc->slots[0].vcc_aux_disable_is_sleep = 1;
210
208 /* NOTE: MMC slots should have a Vcc regulator set up. 211 /* NOTE: MMC slots should have a Vcc regulator set up.
209 * This may be from a TWL4030-family chip, another 212 * This may be from a TWL4030-family chip, another
210 * controllable regulator, or a fixed supply. 213 * controllable regulator, or a fixed supply.
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
index 2453a7aeaf6f..36f0ba8d89e2 100644
--- a/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h
@@ -15,6 +15,7 @@ struct omap2_hsmmc_info {
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 bool no_off; /* power_saving and power is not to go off */
18 bool vcc_aux_disable_is_sleep; /* Regulator off remapped to sleep */
18 int gpio_cd; /* or -EINVAL */ 19 int gpio_cd; /* or -EINVAL */
19 int gpio_wp; /* or -EINVAL */ 20 int gpio_wp; /* or -EINVAL */
20 char *name; /* or NULL for default */ 21 char *name; /* or NULL for default */