Merge tag 'mmc-v3.19-4' of git://git.linaro.org/people/ulf.hansson/mmc

7b552bc1 · Linus Torvalds <[email protected]> · 2015-01-16 14:53:07 +13:00

Pull MMC bugfix from Ulf Hansson:
 "Fix sdhci regulator regression for Qualcomm and Nvidia boards"

* tag 'mmc-v3.19-4' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: sdhci: Set SDHCI_POWER_ON with external vmmc

Commit: 7b552bc12f0948d14fdc4725f5024e6b064b1e18
Parents: f8cb3954 · 3cbc6123

Merge commit. Changes below are compared with the first parent: f8cb3954.

Changes

1 files changed · +6 −0

File	Status	Add	Del	Content
drivers/mmc/host/sdhci.c	modified	+6	−0	View file

drivers/mmc/host/sdhci.c

View file

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 1453cd1..f1a488e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1271,6 +1271,12 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
 		spin_unlock_irq(&host->lock);
 		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
 		spin_lock_irq(&host->lock);
+
+		if (mode != MMC_POWER_OFF)
+			sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL);
+		else
+			sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+
 		return;
 	}
 