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

Commit 599c1d5c authored by Ulf Hansson's avatar Ulf Hansson Committed by Russell King
Browse files

ARM: 7620/1: mmc: mmci: Convert to use mmc_regulator_get_supply 



By using the mmc_regulator_get_supply API we are able to do some
cleanups of the regulator code. Additionally let the regulator
API handle the error printing.

Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 70be208f

drivers/mmc/host/mmci.c

+11 −43
Original line number Diff line number Diff line
@@ -1093,7 +1093,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	struct variant_data *variant = host->variant;

	u32 pwr = 0;

	unsigned long flags;

	int ret;



	pm_runtime_get_sync(mmc_dev(mmc));
@@ -1103,23 +1102,13 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 


	switch (ios->power_mode) {

	case MMC_POWER_OFF:

		if (host->vcc)

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

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

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

		break;

	case MMC_POWER_UP:

		if (host->vcc) {

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

			if (ret) {

				dev_err(mmc_dev(mmc), "unable to set OCR\n");

				/*

				 * The .set_ios() function in the mmc_host_ops

				 * struct return void, and failing to set the

				 * power should be rare so we print an error

				 * and return here.

				 */

				goto out;

			}

		}

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

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



		/*

		 * The ST Micro variant doesn't have the PL180s MCI_PWR_UP

		 * and instead uses MCI_PWR_ON so apply whatever value is
@@ -1168,7 +1157,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 


	spin_unlock_irqrestore(&host->lock, flags);



 out:

	pm_runtime_mark_last_busy(mmc_dev(mmc));

	pm_runtime_put_autosuspend(mmc_dev(mmc));

}
@@ -1391,29 +1379,13 @@ static int mmci_probe(struct amba_device *dev, 
	} else

		dev_warn(&dev->dev, "could not get default pinstate\n");



#ifdef CONFIG_REGULATOR

	/* If we're using the regulator framework, try to fetch a regulator */

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

	if (IS_ERR(host->vcc))

		host->vcc = NULL;

	else {

		int mask = mmc_regulator_get_ocrmask(host->vcc);



		if (mask < 0)

			dev_err(&dev->dev, "error getting OCR mask (%d)\n",

				mask);

		else {

			host->mmc->ocr_avail = (u32) mask;

			if (plat->ocr_mask)

				dev_warn(&dev->dev,

				 "Provided ocr_mask/setpower will not be used "

				 "(using regulator instead)\n");

		}

	}

#endif

	/* Fall back to platform data if no regulator is found */

	if (host->vcc == NULL)

	/* Get regulators and the supported OCR mask */

	mmc_regulator_get_supply(mmc);

	if (!mmc->ocr_avail)

		mmc->ocr_avail = plat->ocr_mask;

	else if (plat->ocr_mask)

		dev_warn(mmc_dev(mmc), "Platform OCR mask is ignored\n");



	mmc->caps = plat->capabilities;

	mmc->caps2 = plat->capabilities2;
@@ -1595,10 +1567,6 @@ static int mmci_remove(struct amba_device *dev) 
		clk_disable_unprepare(host->clk);

		clk_put(host->clk);



		if (host->vcc)

			mmc_regulator_set_ocr(mmc, host->vcc, 0);

		regulator_put(host->vcc);



		mmc_free_host(mmc);



		amba_release_regions(dev);

drivers/mmc/host/mmci.h

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ struct mmci_host { 
	/* pio stuff */

	struct sg_mapping_iter	sg_miter;

	unsigned int		size;

	struct regulator	*vcc;



	/* pinctrl handles */

	struct pinctrl		*pinctrl;