diff options
| author | Chris Ball <cjb@laptop.org> | 2012-09-19 22:27:04 +0800 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-10-07 17:41:43 -0400 |
| commit | 9cde5b7a49a88939d648c361ec938fa8a633a045 (patch) | |
| tree | c51a30ca2a4d86923b6ff0743e70fb6ef22a5f2e | |
| parent | f4f24ade1b24ec09981b5506e3a9a19a96055435 (diff) | |
| download | linux-stable-9cde5b7a49a88939d648c361ec938fa8a633a045.tar.gz linux-stable-9cde5b7a49a88939d648c361ec938fa8a633a045.tar.bz2 linux-stable-9cde5b7a49a88939d648c361ec938fa8a633a045.zip | |
mmc: core: Replace MMC_CAP2_BROKEN_VOLTAGE with test for fixed regulator
Before this patch, we were using MMC_CAP2_BROKEN_VOLTAGE as a way to
avoid calling regulator_set_voltage() on a fixed regulator, but that's
just duplicating information that already exists -- we should test
whether the regulator is fixed directly, instead of via a capability.
This patch implements that test. We can't reclaim the capability bit
just yet, since there are still boards in arch/arm/ that reference it;
those references can be removed now.
Reported-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/core/core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 044cd016320e..66121633c9cd 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1113,7 +1113,8 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc, int tmp; int voltage; - /* REVISIT mmc_vddrange_to_ocrmask() may have set some + /* + * REVISIT mmc_vddrange_to_ocrmask() may have set some * bits this regulator doesn't quite support ... don't * be too picky, most cards and regulators are OK with * a 0.1V range goof (it's a small error percentage). @@ -1127,12 +1128,13 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc, max_uV = min_uV + 100 * 1000; } - /* avoid needless changes to this voltage; the regulator - * might not allow this operation + /* + * If we're using a fixed/static regulator, don't call + * regulator_set_voltage; it would fail. */ voltage = regulator_get_voltage(supply); - if (mmc->caps2 & MMC_CAP2_BROKEN_VOLTAGE) + if (regulator_count_voltages(supply) == 1) min_uV = max_uV = voltage; if (voltage < 0) |