1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e0808d4a7681..47adb161d3ad 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -244,6 +244,13 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
          */
         if (!host->vcc)
                 return 0;
+        /*
+         * With DT, never turn OFF the regulator. This is because
+         * the pbias cell programming support is still missing when
+         * booting with Device tree
+         */
+        if (of_have_populated_dt() && !vdd)
+                return 0;
 
         if (mmc_slot(host).before_set_reg)
                 mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
@@ -1536,7 +1543,13 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                  * of external transceiver; but they all handle 1.8V.
                  */
                 if ((OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET) &&
-                        (ios->vdd == DUAL_VOLT_OCR_BIT)) {
+                        (ios->vdd == DUAL_VOLT_OCR_BIT) &&
+                        /*
+                         * With pbias cell programming missing, this
+                         * can't be allowed when booting with device
+                         * tree.
+                         */
+                        (!of_have_populated_dt())) {
                                 /*
                                  * The mmc_select_voltage fn of the core does
                                  * not seem to set the power_mode to