Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fac49ce5 authored by Nicolas Boichat's avatar Nicolas Boichat Committed by Ulf Hansson
Browse files

mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch 



We've introduced a new helper in the MMC core:
mmc_regulator_set_vqmmc().  Let's use this in mtk-sd.  Using this new
helper has some advantages:

    1. We get the mmc_regulator_set_vqmmc() behavior of trying to match
       VQMMC and VMMC when the signal voltage is 3.3V.  This ensures max
       compatibility.

    2. We get rid of a few more warnings when probing unsupported
       voltages.

    3. We get rid of some non-mediatek specific code in mtk-sd.

Signed-off-by: default avatarNicolas Boichat <drinkcat@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f9bab9d2

drivers/mmc/host/mtk-sd.c

+5 −12
Original line number Diff line number Diff line
@@ -1021,26 +1021,19 @@ static void msdc_set_buswidth(struct msdc_host *host, u32 width) 
static int msdc_ops_switch_volt(struct mmc_host *mmc, struct mmc_ios *ios)

{

	struct msdc_host *host = mmc_priv(mmc);

	int min_uv, max_uv;

	int ret = 0;



	if (!IS_ERR(mmc->supply.vqmmc)) {

		if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) {

			min_uv = 3300000;

			max_uv = 3300000;

		} else if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) {

			min_uv = 1800000;

			max_uv = 1800000;

		} else {

		if (ios->signal_voltage != MMC_SIGNAL_VOLTAGE_330 &&

		    ios->signal_voltage != MMC_SIGNAL_VOLTAGE_180) {

			dev_err(host->dev, "Unsupported signal voltage!\n");

			return -EINVAL;

		}



		ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv);

		ret = mmc_regulator_set_vqmmc(mmc, ios);

		if (ret) {

			dev_dbg(host->dev,

					"Regulator set error %d: %d - %d\n",

					ret, min_uv, max_uv);

			dev_dbg(host->dev, "Regulator set error %d (%d)\n",

				ret, ios->signal_voltage);

		} else {

			/* Apply different pinctrl settings for different signal voltage */

			if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180)