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

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

mmc: host: omap_hsmmc: use ios->vdd for setting vmmc voltage 



vdd voltage is set in mmc core to ios->vdd and vmmc should actually
be set to this voltage. Modify omap_hsmmc_enable_supply
to not take vdd as argument since now it's directly set to
the voltage in ios->vdd.

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 c55d7a05

drivers/mmc/host/omap_hsmmc.c

+4 −3
Original line number Diff line number Diff line
@@ -246,13 +246,14 @@ 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)

static int omap_hsmmc_enable_supply(struct mmc_host *mmc)

{

	int ret;

	struct omap_hsmmc_host *host = mmc_priv(mmc);

	struct mmc_ios *ios = &mmc->ios;



	if (mmc->supply.vmmc) {

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

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

		if (ret)

			return ret;

	}
@@ -387,7 +388,7 @@ 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) {

		ret = omap_hsmmc_enable_supply(mmc, vdd);

		ret = omap_hsmmc_enable_supply(mmc);

		if (ret)

			return ret;