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

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

mmc: host: omap_hsmmc: use mmc_host's vmmc and vqmmc 



No functional change. Instead of using omap_hsmmc_host's vcc and vcc_aux
members, use vmmc and vqmmc present in mmc_host which is present
for the same purpose.

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

drivers/mmc/host/omap_hsmmc.c

+28 −35
Original line number Diff line number Diff line
@@ -181,15 +181,6 @@ struct omap_hsmmc_host { 
	struct	mmc_data	*data;

	struct	clk		*fclk;

	struct	clk		*dbclk;

	/*

	 * vcc == configured supply

	 * vcc_aux == optional

	 *   -	MMC1, supply for DAT4..DAT7

	 *   -	MMC2/MMC2, external level shifter voltage supply, for

	 *	chip (SDIO, eMMC, etc) or transceiver (MMC2 only)

	 */

	struct	regulator	*vcc;

	struct	regulator	*vcc_aux;

	struct	regulator	*pbias;

	bool			pbias_enabled;

	void	__iomem		*base;
@@ -259,6 +250,7 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd) 
{

	struct omap_hsmmc_host *host =

		platform_get_drvdata(to_platform_device(dev));

	struct mmc_host *mmc = host->mmc;

	int ret = 0;



	if (mmc_pdata(host)->set_power)
@@ -268,7 +260,7 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd) 
	 * If we don't see a Vcc regulator, assume it's a fixed

	 * voltage always-on regulator.

	 */

	if (!host->vcc)

	if (!mmc->supply.vmmc)

		return 0;



	if (mmc_pdata(host)->before_set_reg)
@@ -297,23 +289,23 @@ 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 (host->vcc)

			ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);

		if (mmc->supply.vmmc)

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

		/* Enable interface voltage rail, if needed */

		if (ret == 0 && host->vcc_aux) {

			ret = regulator_enable(host->vcc_aux);

			if (ret < 0 && host->vcc)

				ret = mmc_regulator_set_ocr(host->mmc,

							host->vcc, 0);

		if (ret == 0 && mmc->supply.vqmmc) {

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

			if (ret < 0 && mmc->supply.vmmc)

				ret = mmc_regulator_set_ocr(mmc,

							    mmc->supply.vmmc,

							    0);

		}

	} else {

		/* Shut down the rail */

		if (host->vcc_aux)

			ret = regulator_disable(host->vcc_aux);

		if (host->vcc) {

		if (mmc->supply.vqmmc)

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

		if (mmc->supply.vmmc) {

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

			ret = mmc_regulator_set_ocr(host->mmc,

						host->vcc, 0);

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

		}

	}
@@ -345,33 +337,34 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) 
{

	int ocr_value = 0;

	int ret;

	struct mmc_host *mmc = host->mmc;



	if (mmc_pdata(host)->set_power)

		return 0;



	host->vcc = devm_regulator_get_optional(host->dev, "vmmc");

	if (IS_ERR(host->vcc)) {

		ret = PTR_ERR(host->vcc);

	mmc->supply.vmmc = devm_regulator_get_optional(host->dev, "vmmc");

	if (IS_ERR(mmc->supply.vmmc)) {

		ret = PTR_ERR(mmc->supply.vmmc);

		if (ret != -ENODEV)

			return ret;

		dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",

			PTR_ERR(host->vcc));

		host->vcc = NULL;

			PTR_ERR(mmc->supply.vmmc));

		mmc->supply.vmmc = NULL;

	} else {

		ocr_value = mmc_regulator_get_ocrmask(host->vcc);

		ocr_value = mmc_regulator_get_ocrmask(mmc->supply.vmmc);

		if (ocr_value > 0)

			mmc_pdata(host)->ocr_mask = ocr_value;

	}



	/* Allow an aux regulator */

	host->vcc_aux = devm_regulator_get_optional(host->dev, "vmmc_aux");

	if (IS_ERR(host->vcc_aux)) {

		ret = PTR_ERR(host->vcc_aux);

	mmc->supply.vqmmc = devm_regulator_get_optional(host->dev, "vmmc_aux");

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

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

		if (ret != -ENODEV)

			return ret;

		dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n",

			PTR_ERR(host->vcc_aux));

		host->vcc_aux = NULL;

			PTR_ERR(mmc->supply.vqmmc));

		mmc->supply.vqmmc = NULL;

	}



	host->pbias = devm_regulator_get_optional(host->dev, "pbias");
@@ -391,8 +384,8 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) 
	 * To disable boot_on regulator, enable regulator

	 * to increase usecount and then disable it.

	 */

	if ((host->vcc && regulator_is_enabled(host->vcc) > 0) ||

	    (host->vcc_aux && regulator_is_enabled(host->vcc_aux))) {

	if ((mmc->supply.vmmc && regulator_is_enabled(mmc->supply.vmmc) > 0) ||

	    (mmc->supply.vqmmc && regulator_is_enabled(mmc->supply.vqmmc))) {

		int vdd = ffs(mmc_pdata(host)->ocr_mask) - 1;



		omap_hsmmc_set_power(host->dev, 1, vdd);