omap_hsmmc: Allow for a shared VccQ

EMMC can have two voltage supplies, Vcc and VccQ
which are implemented in the code as consumer
supplies vmmc and vmmc_aux.

If the regulator that supplies vmmc_aux is shared
with other consumers, then sending it to sleep
will disrupt those consumers.  However, the
TWL4030-family regulators may have OFF remapped
to SLEEP, in which case 'regulator_disable()'
will put the regulator to sleep only when all
consumers are disabled - which is the desired
behaviour.

This patch adds a platform data field to allow
that option.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

4 files changed, 22 insertions, 1 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)
                 if (c->no_off)
                         mmc->slots[0].no_off = 1;
 
+                if (c->vcc_aux_disable_is_sleep)
+                        mmc->slots[0].vcc_aux_disable_is_sleep = 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 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 {
         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 */
+        bool    vcc_aux_disable_is_sleep; /* Regulator off remapped to sleep */
         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 b46394955f37..a1bac07c89eb 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -99,6 +99,9 @@ struct omap_mmc_platform_data {
                 /* If using power_saving and the MMC power is not to go off */
                 unsigned no_off:1;
 
+                /* Regulator off remapped to sleep */
+                unsigned vcc_aux_disable_is_sleep:1;
+
                 int switch_pin;                 /* gpio (card detect) */
                 int gpio_wp;                    /* gpio (write protect) */
 
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index d2fad587f371..af374771bed0 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -347,7 +347,14 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
                 err = regulator_set_mode(host->vcc, mode);
         if (err)
                 return err;
-        return regulator_set_mode(host->vcc_aux, mode);
+
+        if (!mmc_slot(host).vcc_aux_disable_is_sleep)
+                return regulator_set_mode(host->vcc_aux, mode);
+
+        if (sleep)
+                return regulator_disable(host->vcc_aux);
+        else
+                return regulator_enable(host->vcc_aux);
 }
 
 static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
@@ -1982,6 +1989,13 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
         else
                 mmc->ops        = &omap_hsmmc_ops;
 
+        /*
+         * If regulator_disable can only put vcc_aux to sleep then there is
+         * no off state.
+         */
+        if (mmc_slot(host).vcc_aux_disable_is_sleep)
+                mmc_slot(host).no_off = 1;
+
         mmc->f_min      = 400000;
         mmc->f_max      = 52000000;