1 files changed, 30 insertions, 9 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 8670f162dec7..6bd3d1794966 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1210,10 +1210,24 @@ clock_set:
 }
 EXPORT_SYMBOL_GPL(sdhci_set_clock);
 
-static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
-                            unsigned short vdd)
+static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode,
+                                unsigned short vdd)
 {
         struct mmc_host *mmc = host->mmc;
+
+        spin_unlock_irq(&host->lock);
+        mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
+        spin_lock_irq(&host->lock);
+
+        if (mode != MMC_POWER_OFF)
+                sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL);
+        else
+                sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+}
+
+void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
+                     unsigned short vdd)
+{
         u8 pwr = 0;
 
         if (mode != MMC_POWER_OFF) {
@@ -1245,7 +1259,6 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
                 sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
                 if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON)
                         sdhci_runtime_pm_bus_off(host);
-                vdd = 0;
         } else {
                 /*
                  * Spec says that we should clear the power reg before setting
@@ -1276,12 +1289,20 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
                 if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)
                         mdelay(10);
         }
+}
+EXPORT_SYMBOL_GPL(sdhci_set_power);
 
-        if (!IS_ERR(mmc->supply.vmmc)) {
-                spin_unlock_irq(&host->lock);
-                mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
-                spin_lock_irq(&host->lock);
-        }
+static void __sdhci_set_power(struct sdhci_host *host, unsigned char mode,
+                              unsigned short vdd)
+{
+        struct mmc_host *mmc = host->mmc;
+
+        if (host->ops->set_power)
+                host->ops->set_power(host, mode, vdd);
+        else if (!IS_ERR(mmc->supply.vmmc))
+                sdhci_set_power_reg(host, mode, vdd);
+        else
+                sdhci_set_power(host, mode, vdd);
 }
 
 /*****************************************************************************\
@@ -1431,7 +1452,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
                 }
         }
 
-        sdhci_set_power(host, ios->power_mode, ios->vdd);
+        __sdhci_set_power(host, ios->power_mode, ios->vdd);
 
         if (host->ops->platform_send_init_74_clocks)
                 host->ops->platform_send_init_74_clocks(host, ios->power_mode);