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

Commit 61951fd6 authored by Daniel Mack's avatar Daniel Mack Committed by Ulf Hansson
Browse files

mmc: pxamci: let mmc core handle regulators 



Strip some code by letting the mmc core handle the regulators. The old
.gpio_power pdata handling is kept around for now.

This also set the voltage on the regulator and handles -EPROBE_DEFER
correctly.

Signed-off-by: default avatarDaniel Mack <daniel@zonque.org>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f37216de

drivers/mmc/host/pxamci.c

+22 −32
Original line number Diff line number Diff line
@@ -73,58 +73,46 @@ struct pxamci_host { 
	dma_cookie_t		dma_cookie;

	unsigned int		dma_len;

	unsigned int		dma_dir;



	struct regulator	*vcc;

};



static inline void pxamci_init_ocr(struct pxamci_host *host)

static int pxamci_init_ocr(struct pxamci_host *host)

{

#ifdef CONFIG_REGULATOR

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

	struct mmc_host *mmc = host->mmc;

	int ret;



	if (IS_ERR(host->vcc))

		host->vcc = NULL;

	else {

		host->mmc->ocr_avail = mmc_regulator_get_ocrmask(host->vcc);

		if (host->pdata && host->pdata->ocr_mask)

			dev_warn(mmc_dev(host->mmc),

				"ocr_mask/setpower will not be used\n");

	}

#endif

	if (host->vcc == NULL) {

	ret = mmc_regulator_get_supply(mmc);

	if (ret < 0)

		return ret;



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

		/* fall-back to platform data */

		host->mmc->ocr_avail = host->pdata ?

		mmc->ocr_avail = host->pdata ?

			host->pdata->ocr_mask :

			MMC_VDD_32_33 | MMC_VDD_33_34;

	}



	return 0;

}



static inline int pxamci_set_power(struct pxamci_host *host,

				    unsigned char power_mode,

				    unsigned int vdd)

{

	struct mmc_host *mmc = host->mmc;

	struct regulator *supply = mmc->supply.vmmc;

	int on;



	if (host->vcc) {

		int ret;

	if (!IS_ERR(supply))

		return mmc_regulator_set_ocr(mmc, supply, vdd);



		if (power_mode == MMC_POWER_UP) {

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

			if (ret)

				return ret;

		} else if (power_mode == MMC_POWER_OFF) {

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

			if (ret)

				return ret;

		}

	}

	if (!host->vcc && host->pdata &&

	if (host->pdata &&

	    gpio_is_valid(host->pdata->gpio_power)) {

		on = ((1 << vdd) & host->pdata->ocr_mask);

		gpio_set_value(host->pdata->gpio_power,

			       !!on ^ host->pdata->gpio_power_invert);

	}

	if (!host->vcc && host->pdata && host->pdata->setpower)



	if (host->pdata && host->pdata->setpower)

		return host->pdata->setpower(mmc_dev(host->mmc), vdd);



	return 0;
@@ -691,7 +679,9 @@ static int pxamci_probe(struct platform_device *pdev) 
	mmc->f_min = (host->clkrate + 63) / 64;

	mmc->f_max = (mmc_has_26MHz()) ? 26000000 : host->clkrate;



	pxamci_init_ocr(host);

	ret = pxamci_init_ocr(host);

	if (ret < 0)

		return ret;



	mmc->caps = 0;

	host->cmdat = 0;