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

Commit e921a8b6 authored by Russell King's avatar Russell King Committed by Chris Ball
Browse files

mmc: sdhci: move regulator handling into sdhci_set_power() 



Move the regulator handling into sdhci_set_power() rather than being in
sdhci_do_set_ios().  This wraps all power control up into this function.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent b4f3b7c8

drivers/mmc/host/sdhci.c

+35 −37
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) 
}

EXPORT_SYMBOL_GPL(sdhci_set_clock);



static int sdhci_set_power(struct sdhci_host *host, unsigned short power)

static void sdhci_set_power(struct sdhci_host *host, unsigned short power)

{

	u8 pwr = 0;
@@ -1239,7 +1239,7 @@ static int sdhci_set_power(struct sdhci_host *host, unsigned short power) 
	}



	if (host->pwr == pwr)

		return -1;

		return;



	host->pwr = pwr;
@@ -1247,9 +1247,8 @@ static int sdhci_set_power(struct sdhci_host *host, unsigned short power) 
		sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);

		if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON)

			sdhci_runtime_pm_bus_off(host);

		return 0;

	}



		power = 0;

	} else {

		/*

		 * Spec says that we should clear the power reg before setting

		 * a new value. Some controllers don't seem to like this though.
@@ -1258,8 +1257,9 @@ static int sdhci_set_power(struct sdhci_host *host, unsigned short power) 
			sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);



		/*

	 * At least the Marvell CaFe chip gets confused if we set the voltage

	 * and set turn on power at the same time, so set the voltage first.

		 * At least the Marvell CaFe chip gets confused if we set the

		 * voltage and set turn on power at the same time, so set the

		 * voltage first.

		 */

		if (host->quirks & SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER)

			sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
@@ -1272,13 +1272,18 @@ static int sdhci_set_power(struct sdhci_host *host, unsigned short power) 
			sdhci_runtime_pm_bus_on(host);



		/*

	 * Some controllers need an extra 10ms delay of 10ms before they

	 * can apply clock after applying power

		 * Some controllers need an extra 10ms delay of 10ms before

		 * they can apply clock after applying power

		 */

		if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)

			mdelay(10);

	}



	return power;

	if (host->vmmc) {

		spin_unlock_irq(&host->lock);

		mmc_regulator_set_ocr(host->mmc, host->vmmc, power);

		spin_lock_irq(&host->lock);

	}

}



/*****************************************************************************\
@@ -1429,7 +1434,6 @@ EXPORT_SYMBOL_GPL(sdhci_set_uhs_signaling); 
static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)

{

	unsigned long flags;

	int vdd_bit = -1;

	u8 ctrl;



	spin_lock_irqsave(&host->lock, flags);
@@ -1461,15 +1465,9 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) 
	}



	if (ios->power_mode == MMC_POWER_OFF)

		vdd_bit = sdhci_set_power(host, -1);

		sdhci_set_power(host, -1);

	else

		vdd_bit = sdhci_set_power(host, ios->vdd);



	if (host->vmmc && vdd_bit != -1) {

		spin_unlock_irqrestore(&host->lock, flags);

		mmc_regulator_set_ocr(host->mmc, host->vmmc, vdd_bit);

		spin_lock_irqsave(&host->lock, flags);

	}

		sdhci_set_power(host, ios->vdd);



	if (host->ops->platform_send_init_74_clocks)

		host->ops->platform_send_init_74_clocks(host, ios->power_mode);