mmc: core: Factor out mmc_host_set_uhs_voltage()

Factor out mmc_host_set_uhs_voltage() so it can be reused.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index a9ee960..12b271c 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1672,11 +1672,33 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage)
 
 }
 
+int mmc_host_set_uhs_voltage(struct mmc_host *host)
+{
+       u32 clock;
+
+       /*
+        * During a signal voltage level switch, the clock must be gated
+        * for 5 ms according to the SD spec
+        */
+       clock = host->ios.clock;
+       host->ios.clock = 0;
+       mmc_set_ios(host);
+
+       if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180))
+               return -EAGAIN;
+
+       /* Keep clock gated for at least 10 ms, though spec only says 5 ms */
+       mmc_delay(10);
+       host->ios.clock = clock;
+       mmc_set_ios(host);
+
+       return 0;
+}
+
 int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr)
 {
        struct mmc_command cmd = {};
        int err = 0;
-       u32 clock;
 
        /*
         * If we cannot switch voltages, return failure so the caller
@@ -1708,15 +1730,8 @@ int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr)
                err = -EAGAIN;
                goto power_cycle;
        }
-       /*
-        * During a signal voltage level switch, the clock must be gated
-        * for 5 ms according to the SD spec
-        */
-       clock = host->ios.clock;
-       host->ios.clock = 0;
-       mmc_set_ios(host);
 
-       if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180)) {
+       if (mmc_host_set_uhs_voltage(host)) {
                /*
                 * Voltages may not have been switched, but we've already
                 * sent CMD11, so a power cycle is required anyway
@@ -1725,11 +1740,6 @@ int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr)
                goto power_cycle;
        }
 
-       /* Keep clock gated for at least 10 ms, though spec only says 5 ms */
-       mmc_delay(10);
-       host->ios.clock = clock;
-       mmc_set_ios(host);
-
        /* Wait for at least 1 ms according to spec */
        mmc_delay(1);
 

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 51a1607..71e6c6d 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -49,6 +49,7 @@ void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
 void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
 u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
 int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr);
+int mmc_host_set_uhs_voltage(struct mmc_host *host);
 int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage);
 void mmc_set_timing(struct mmc_host *host, unsigned int timing);
 void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);