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

Commit ec85c95e authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Ulf Hansson
Browse files

mmc: host: omap_hsmmc: add separate function to set pbias 



No functional change. Cleanup omap_hsmmc_set_power by adding separate
functions to set pbias and invoke it from omap_hsmmc_set_power.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2a17f844

drivers/mmc/host/omap_hsmmc.c

+48 −30
Original line number Diff line number Diff line
@@ -305,6 +305,48 @@ static int omap_hsmmc_disable_supply(struct mmc_host *mmc) 
	return ret;

}



static int omap_hsmmc_set_pbias(struct omap_hsmmc_host *host, bool power_on,

				int vdd)

{

	int ret;



	if (!host->pbias)

		return 0;



	if (power_on) {

		if (vdd <= VDD_165_195)

			ret = regulator_set_voltage(host->pbias, VDD_1V8,

						    VDD_1V8);

		else

			ret = regulator_set_voltage(host->pbias, VDD_3V0,

						    VDD_3V0);

		if (ret < 0) {

			dev_err(host->dev, "pbias set voltage fail\n");

			return ret;

		}



		if (host->pbias_enabled == 0) {

			ret = regulator_enable(host->pbias);

			if (ret) {

				dev_err(host->dev, "pbias reg enable fail\n");

				return ret;

			}

			host->pbias_enabled = 1;

		}

	} else {

		if (host->pbias_enabled == 1) {

			ret = regulator_disable(host->pbias);

			if (ret) {

				dev_err(host->dev, "pbias reg disable fail\n");

				return ret;

			}

			host->pbias_enabled = 0;

		}

	}



	return 0;

}



static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd)

{

	struct omap_hsmmc_host *host =
@@ -325,16 +367,9 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd) 
	if (mmc_pdata(host)->before_set_reg)

		mmc_pdata(host)->before_set_reg(dev, power_on, vdd);



	if (host->pbias) {

		if (host->pbias_enabled == 1) {

			ret = regulator_disable(host->pbias);

			if (ret) {

				dev_err(dev, "pbias reg disable failed\n");

	ret = omap_hsmmc_set_pbias(host, false, 0);

	if (ret)

		return ret;

			}

			host->pbias_enabled = 0;

		}

	}



	/*

	 * Assume Vcc regulator is used only to power the card ... OMAP
@@ -359,26 +394,9 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd) 
			return ret;

	}



	if (host->pbias) {

		if (vdd <= VDD_165_195)

			ret = regulator_set_voltage(host->pbias, VDD_1V8,

								VDD_1V8);

		else

			ret = regulator_set_voltage(host->pbias, VDD_3V0,

								VDD_3V0);

		if (ret < 0)

			goto err_set_voltage;



		if (host->pbias_enabled == 0) {

			ret = regulator_enable(host->pbias);

			if (ret) {

				dev_err(dev, "pbias reg enable failed\n");

	ret = omap_hsmmc_set_pbias(host, true, vdd);

	if (ret)

		goto err_set_voltage;

			} else {

				host->pbias_enabled = 1;

			}

		}

	}



	if (mmc_pdata(host)->after_set_reg)

		mmc_pdata(host)->after_set_reg(dev, power_on, vdd);