summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorTirupathi Reddy <tirupath@codeaurora.org>2017-05-25 15:33:17 +0530
committerMark Brown <broonie@kernel.org>2017-06-28 20:39:36 +0100
commit2c2874b191d54fbf9216524e629558eee89e1d20 (patch)
tree2230fb67ff104b417d50cb3ff0099f2f89f6e90f /drivers/regulator
parent2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff)
downloadlinux-2c2874b191d54fbf9216524e629558eee89e1d20.tar.bz2
regulator: core: Fix voltage change propagations to supply regulators
Some regulators support get_voltage() and some support get_voltage_sel() operations but currently we only propagate changes if the regulator has a get_voltage() operation. Also do this if we've got get_voltage_sel() [Rewite commit message for clarity -- broonie] Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index c0d9ae8d0860..9fecbd4e3546 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2938,7 +2938,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
if (rdev->supply &&
regulator_ops_is_valid(rdev->supply->rdev,
REGULATOR_CHANGE_VOLTAGE) &&
- (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) {
+ (rdev->desc->min_dropout_uV || !(rdev->desc->ops->get_voltage ||
+ rdev->desc->ops->get_voltage_sel))) {
int current_supply_uV;
int selector;