diff options
| author | Bjorn Andersson <bjorn@kryo.se> | 2014-02-05 12:30:26 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-07 12:14:19 +0000 |
| commit | c00dc359e5e0b10de993651d8e73e60c41bf29cd (patch) | |
| tree | e749b8fefe82b51a8f7f9850d5a8d1ae395e0635 /drivers/regulator/core.c | |
| parent | d55efa4d9bff20c98ca05e0bf458691e6869b5a1 (diff) | |
| download | linux-c00dc359e5e0b10de993651d8e73e60c41bf29cd.tar.gz linux-c00dc359e5e0b10de993651d8e73e60c41bf29cd.tar.bz2 linux-c00dc359e5e0b10de993651d8e73e60c41bf29cd.zip | |
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>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b38a6b669e8c..0cd1a3b8e589 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -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) { |