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

Commit c00dc359 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Mark Brown
Browse files

regulator: core: Allow regulator_set_voltage for fixed regulators 



Make it okay to call regulator_set_voltage on regulators with fixed
voltage if the requested range overlaps the current/configured voltage.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d55efa4d

drivers/regulator/core.c

+14 −0
Original line number Diff line number Diff line
@@ -2395,6 +2395,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
	struct regulator_dev *rdev = regulator->rdev;

	int ret = 0;

	int old_min_uV, old_max_uV;

	int current_uV;



	mutex_lock(&rdev->mutex);
@@ -2405,6 +2406,19 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
	if (regulator->min_uV == min_uV && regulator->max_uV == max_uV)

		goto out;



	/* If we're trying to set a range that overlaps the current voltage,

	 * return succesfully even though the regulator does not support

	 * changing the voltage.

	 */

	if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {

		current_uV = _regulator_get_voltage(rdev);

		if (min_uV <= current_uV && current_uV <= max_uV) {

			regulator->min_uV = min_uV;

			regulator->max_uV = max_uV;

			goto out;

		}

	}



	/* sanity check */

	if (!rdev->desc->ops->set_voltage &&

	    !rdev->desc->ops->set_voltage_sel) {