Commit 4e74b6b3 authored by Ulf Hansson's avatar Ulf Hansson

mmc: core: Rename __mmc_set_signal_voltage() to mmc_set_signal_voltage()

Earlier the mmc_set_signal_voltage() existed, but since it has been renamed
to mmc_set_uhs_voltage(), we can now use that name instead.
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Tested-by: default avatarJan Glauber <jglauber@cavium.com>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
parent 2ed573b6
...@@ -1631,7 +1631,7 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) ...@@ -1631,7 +1631,7 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
return ocr; return ocr;
} }
int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage)
{ {
int err = 0; int err = 0;
int old_signal_voltage = host->ios.signal_voltage; int old_signal_voltage = host->ios.signal_voltage;
...@@ -1691,7 +1691,7 @@ int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr) ...@@ -1691,7 +1691,7 @@ int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr)
host->ios.clock = 0; host->ios.clock = 0;
mmc_set_ios(host); mmc_set_ios(host);
if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180)) { if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180)) {
/* /*
* Voltages may not have been switched, but we've already * Voltages may not have been switched, but we've already
* sent CMD11, so a power cycle is required anyway * sent CMD11, so a power cycle is required anyway
...@@ -1800,11 +1800,11 @@ void mmc_power_up(struct mmc_host *host, u32 ocr) ...@@ -1800,11 +1800,11 @@ void mmc_power_up(struct mmc_host *host, u32 ocr)
mmc_set_initial_state(host); mmc_set_initial_state(host);
/* Try to set signal voltage to 3.3V but fall back to 1.8v or 1.2v */ /* Try to set signal voltage to 3.3V but fall back to 1.8v or 1.2v */
if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330) == 0) if (!mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330))
dev_dbg(mmc_dev(host), "Initial signal voltage of 3.3v\n"); dev_dbg(mmc_dev(host), "Initial signal voltage of 3.3v\n");
else if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180) == 0) else if (!mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180))
dev_dbg(mmc_dev(host), "Initial signal voltage of 1.8v\n"); dev_dbg(mmc_dev(host), "Initial signal voltage of 1.8v\n");
else if (__mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120) == 0) else if (!mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120))
dev_dbg(mmc_dev(host), "Initial signal voltage of 1.2v\n"); dev_dbg(mmc_dev(host), "Initial signal voltage of 1.2v\n");
/* /*
......
...@@ -49,7 +49,7 @@ void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode); ...@@ -49,7 +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); void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
u32 mmc_select_voltage(struct mmc_host *host, u32 ocr); u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr); int mmc_set_uhs_voltage(struct mmc_host *host, u32 ocr);
int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage); 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_timing(struct mmc_host *host, unsigned int timing);
void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type); void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr, int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,
......
...@@ -1122,14 +1122,14 @@ static int mmc_select_hs_ddr(struct mmc_card *card) ...@@ -1122,14 +1122,14 @@ static int mmc_select_hs_ddr(struct mmc_card *card)
*/ */
err = -EINVAL; err = -EINVAL;
if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_1_2V) if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_1_2V)
err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120);
if (err && (card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_1_8V)) if (err && (card->mmc_avail_type & EXT_CSD_CARD_TYPE_DDR_1_8V))
err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
/* make sure vccq is 3.3v after switching disaster */ /* make sure vccq is 3.3v after switching disaster */
if (err) if (err)
err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330); err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330);
return err; return err;
} }
...@@ -1296,10 +1296,10 @@ static int mmc_select_hs400es(struct mmc_card *card) ...@@ -1296,10 +1296,10 @@ static int mmc_select_hs400es(struct mmc_card *card)
} }
if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_2V) if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_2V)
err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120);
if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_8V) if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_8V)
err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
/* If fails try again during next card power cycle */ /* If fails try again during next card power cycle */
if (err) if (err)
...@@ -1405,10 +1405,10 @@ static int mmc_select_hs200(struct mmc_card *card) ...@@ -1405,10 +1405,10 @@ static int mmc_select_hs200(struct mmc_card *card)
old_signal_voltage = host->ios.signal_voltage; old_signal_voltage = host->ios.signal_voltage;
if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200_1_2V) if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200_1_2V)
err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120); err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120);
if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200_1_8V) if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200_1_8V)
err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
/* If fails try again during next card power cycle */ /* If fails try again during next card power cycle */
if (err) if (err)
...@@ -1450,7 +1450,7 @@ static int mmc_select_hs200(struct mmc_card *card) ...@@ -1450,7 +1450,7 @@ static int mmc_select_hs200(struct mmc_card *card)
err: err:
if (err) { if (err) {
/* fall back to the old signal voltage, if fails report error */ /* fall back to the old signal voltage, if fails report error */
if (__mmc_set_signal_voltage(host, old_signal_voltage)) if (mmc_set_signal_voltage(host, old_signal_voltage))
err = -EIO; err = -EIO;
pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host), pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment