Skip to contentSkip to conversation

mmc: core: Remove fixed voltage regulator logic

PATCH RESEND Superseded Tim Kryger 1 participant 1 message Jul 30, 2014 MMC, SD and SDIO

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Tim Kryger

author
#0 lore raw

PATCH RESEND 1/1 mmc: core: Remove fixed voltage regulator logic

There is no need for regulator consumers to include special logic for fixed voltage regulators as they support regulator_set_voltage() just like their non-fixed regulator counterparts.

---

Since this eliminates logic that was concealing a bug in how the SDHCI driver was setting ocr_avail, it is important that the following patch to fix that bug be taken first. Fortunately, it is already queued.

https://lkml.org/lkml/2014/6/13/451

 drivers/mmc/core/core.c |    8 --------
 1 file changed, 8 deletions(-)
drivers/mmc/core/core.c +0 -8
index 7dc0c85..e56375c 100644
@@ -1280,15 +1280,7 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,
 			max_uV = min_uV + 100 * 1000;
 		}
 
-		/*
-		 * If we're using a fixed/static regulator, don't call
-		 * regulator_set_voltage; it would fail.
-		 */
 		voltage = regulator_get_voltage(supply);
-
-		if (!regulator_can_change_voltage(supply))
-			min_uV = max_uV = voltage;
-
 		if (voltage < 0)
 			result = voltage;
 		else if (voltage < min_uV || voltage > max_uV)
Signature · 1 line
1.7.9.5