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

Commit bb8f563c authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback 



Platforms may have some external power control which need to be
controlled from board specific code.  Rename the translate_vdd()
callback to vdd_handler() and pass it the power mode.

Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f5e2574e

drivers/mmc/host/mmci.c

+3 −10
Original line number Diff line number Diff line
@@ -493,16 +493,9 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
			/* This implicitly enables the regulator */

			mmc_regulator_set_ocr(host->vcc, ios->vdd);

#endif

		/*

		 * The translate_vdd function is not used if you have

		 * an external regulator, or your design is really weird.

		 * Using it would mean sending in power control BOTH using

		 * a regulator AND the 4 MMCIPWR bits. If we don't have

		 * a regulator, we might have some other platform specific

		 * power control behind this translate function.

		 */

		if (!host->vcc && host->plat->translate_vdd)

			pwr |= host->plat->translate_vdd(mmc_dev(mmc), ios->vdd);

		if (host->plat->vdd_handler)

			pwr |= host->plat->vdd_handler(mmc_dev(mmc), ios->vdd,

						       ios->power_mode);

		/* The ST version does not have this, fall through to POWER_ON */

		if (host->hw_designer != AMBA_VENDOR_ST) {

			pwr |= MCI_PWR_UP;

include/linux/amba/mmci.h

+6 −4
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ 
 * @ocr_mask: available voltages on the 4 pins from the block, this

 * is ignored if a regulator is used, see the MMC_VDD_* masks in

 * mmc/host.h

 * @translate_vdd: a callback function to translate a MMC_VDD_*

 * mask into a value to be binary or:ed and written into the

 * MMCIPWR register of the block

 * @vdd_handler: a callback function to translate a MMC_VDD_*

 * mask into a value to be binary (or set some other custom bits

 * in MMCIPWR) or:ed and written into the MMCIPWR register of the

 * block.  May also control external power based on the power_mode.

 * @status: if no GPIO read function was given to the block in

 * gpio_wp (below) this function will be called to determine

 * whether a card is present in the MMC slot or not
@@ -29,7 +30,8 @@ 
struct mmci_platform_data {

	unsigned int f_max;

	unsigned int ocr_mask;

	u32 (*translate_vdd)(struct device *, unsigned int);

	u32 (*vdd_handler)(struct device *, unsigned int vdd,

			   unsigned char power_mode);

	unsigned int (*status)(struct device *);

	int	gpio_wp;

	int	gpio_cd;