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

Commit 9cde5b7a authored by Chris Ball's avatar Chris Ball
Browse files

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: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent f4f24ade

drivers/mmc/core/core.c

+6 −4
Original line number Diff line number Diff line
@@ -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)