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

Commit e137788d authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: add a function to get regulators, supplying card's power 



Add a function to get regulators, supplying card's Vdd and Vccq on a
specific host. If a Vdd supplying regulator is found, the function checks,
whether a valid OCR mask can be obtained from it. The Vccq regulator is
optional. A failure to get it is not fatal.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviwed-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 6de707f2

drivers/mmc/core/core.c

+23 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,29 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc, 
}

EXPORT_SYMBOL_GPL(mmc_regulator_set_ocr);



int mmc_regulator_get_supply(struct mmc_host *mmc)

{

	struct device *dev = mmc_dev(mmc);

	struct regulator *supply;

	int ret;



	supply = devm_regulator_get(dev, "vmmc");

	mmc->supply.vmmc = supply;

	mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");



	if (IS_ERR(supply))

		return PTR_ERR(supply);



	ret = mmc_regulator_get_ocrmask(supply);

	if (ret > 0)

		mmc->ocr_avail = ret;

	else

		dev_warn(mmc_dev(mmc), "Failed getting OCR mask: %d\n", ret);



	return 0;

}

EXPORT_SYMBOL_GPL(mmc_regulator_get_supply);



#endif /* CONFIG_REGULATOR */



/*

include/linux/mmc/host.h

+14 −2
Original line number Diff line number Diff line
@@ -155,6 +155,13 @@ struct mmc_hotplug { 
	void *handler_priv;

};



struct regulator;



struct mmc_supply {

	struct regulator *vmmc;		/* Card power supply */

	struct regulator *vqmmc;	/* Optional Vccq supply */

};



struct mmc_host {

	struct device		*parent;

	struct device		class_dev;
@@ -309,6 +316,7 @@ struct mmc_host { 
#ifdef CONFIG_REGULATOR

	bool			regulator_enabled; /* regulator state */

#endif

	struct mmc_supply	supply;



	struct dentry		*debugfs_root;
@@ -357,13 +365,12 @@ static inline void mmc_signal_sdio_irq(struct mmc_host *host) 
	wake_up_process(host->sdio_irq_thread);

}



struct regulator;



#ifdef CONFIG_REGULATOR

int mmc_regulator_get_ocrmask(struct regulator *supply);

int mmc_regulator_set_ocr(struct mmc_host *mmc,

			struct regulator *supply,

			unsigned short vdd_bit);

int mmc_regulator_get_supply(struct mmc_host *mmc);

#else

static inline int mmc_regulator_get_ocrmask(struct regulator *supply)

{
@@ -376,6 +383,11 @@ static inline int mmc_regulator_set_ocr(struct mmc_host *mmc, 
{

	return 0;

}



static inline int mmc_regulator_get_supply(struct mmc_host *mmc)

{

	return 0;

}

#endif



int mmc_card_awake(struct mmc_host *host);