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

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

mmc: host: omap_hsmmc: add separate functions for enable/disable supply 



No functional change. Cleanup omap_hsmmc_set_power by adding separate
functions for enable/disable supply 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 229f3292

drivers/mmc/host/omap_hsmmc.c

+66 −35
Original line number Diff line number Diff line
@@ -246,6 +246,65 @@ static int omap_hsmmc_get_cover_state(struct device *dev) 


#ifdef CONFIG_REGULATOR



static int omap_hsmmc_enable_supply(struct mmc_host *mmc, int vdd)

{

	int ret;



	if (mmc->supply.vmmc) {

		ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		if (ret)

			return ret;

	}



	/* Enable interface voltage rail, if needed */

	if (mmc->supply.vqmmc) {

		ret = regulator_enable(mmc->supply.vqmmc);

		if (ret) {

			dev_err(mmc_dev(mmc), "vmmc_aux reg enable failed\n");

			goto err_vqmmc;

		}

	}



	return 0;



err_vqmmc:

	if (mmc->supply.vmmc)

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);



	return ret;

}



static int omap_hsmmc_disable_supply(struct mmc_host *mmc)

{

	int ret;

	int status;



	if (mmc->supply.vqmmc) {

		ret = regulator_disable(mmc->supply.vqmmc);

		if (ret) {

			dev_err(mmc_dev(mmc), "vmmc_aux reg disable failed\n");

			return ret;

		}

	}



	if (mmc->supply.vmmc) {

		ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);

		if (ret)

			goto err_set_ocr;

	}



	return 0;



err_set_ocr:

	if (mmc->supply.vqmmc) {

		status = regulator_enable(mmc->supply.vqmmc);

		if (status)

			dev_err(mmc_dev(mmc), "vmmc_aux re-enable failed\n");

	}



	return ret;

}



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

{

	struct omap_hsmmc_host *host =
@@ -291,37 +350,14 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd) 
	 * chips/cards need an interface voltage rail too.

	 */

	if (power_on) {

		if (mmc->supply.vmmc) {

			ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		ret = omap_hsmmc_enable_supply(mmc, vdd);

		if (ret)

			return ret;

		}



		/* Enable interface voltage rail, if needed */

		if (mmc->supply.vqmmc) {

			ret = regulator_enable(mmc->supply.vqmmc);

			if (ret) {

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

				goto err_set_vqmmc;

			}

		}

	} else {

		/* Shut down the rail */

		if (mmc->supply.vqmmc) {

			ret = regulator_disable(mmc->supply.vqmmc);

			if (ret) {

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

				return ret;

			}

		}



		if (mmc->supply.vmmc) {

			/* Then proceed to shut down the local regulator */

			ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);

		ret = omap_hsmmc_disable_supply(mmc);

		if (ret)

			return ret;

	}

	}



	if (host->pbias) {

		if (vdd <= VDD_165_195)
@@ -350,12 +386,7 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd) 
	return 0;



err_set_voltage:

	if (mmc->supply.vqmmc)

		regulator_disable(mmc->supply.vqmmc);



err_set_vqmmc:

	if (mmc->supply.vmmc)

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);

	omap_hsmmc_disable_supply(mmc);



	return ret;

}