p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Bjorn Andersson 2014-02-05 12:30:26 -08:00 committed by Mark Brown
parent d55efa4d9b
commit c00dc359e5
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/regulator/core.c
View File

@ -2395,6 +2395,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
struct regulator_dev *rdev = regulator->rdev; struct regulator_dev *rdev = regulator->rdev;
int ret = 0; int ret = 0;
int old_min_uV, old_max_uV; int old_min_uV, old_max_uV;
int current_uV;
mutex_lock(&rdev->mutex); 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) if (regulator->min_uV == min_uV && regulator->max_uV == max_uV)
goto out; 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 */ /* sanity check */
if (!rdev->desc->ops->set_voltage && if (!rdev->desc->ops->set_voltage &&
!rdev->desc->ops->set_voltage_sel) { !rdev->desc->ops->set_voltage_sel) {