Commit 2bb16663 authored by Olliver Schinagl's avatar Olliver Schinagl Committed by Mark Brown

regulator: core: enable power when setting up constraints

When a regulator is marked as always on, it is enabled early on, when
checking and setting up constraints. It makes the assumption that the
bootloader properly initialized the regulator, and just in case enables
the regulator anyway.

Some constraints however currently get missed, such as the soft-start
and ramp-delay. This causes the regulator to be enabled, without the
soft-start and ramp-delay being applied, which in turn can cause
high-currents or other start-up problems.

By moving the always-enabled constraints later in the constraints check,
we can at least ensure all constraints for the regulator are followed.
Signed-off-by: default avatarOlliver Schinagl <oliver@schinagl.nl>
Signed-off-by: default avatarPriit Laes <plaes@plaes.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f1abf672
...@@ -1158,17 +1158,6 @@ static int set_machine_constraints(struct regulator_dev *rdev, ...@@ -1158,17 +1158,6 @@ static int set_machine_constraints(struct regulator_dev *rdev,
} }
} }
/* If the constraints say the regulator should be on at this point
* and we have control then make sure it is enabled.
*/
if (rdev->constraints->always_on || rdev->constraints->boot_on) {
ret = _regulator_do_enable(rdev);
if (ret < 0 && ret != -EINVAL) {
rdev_err(rdev, "failed to enable\n");
return ret;
}
}
if ((rdev->constraints->ramp_delay || rdev->constraints->ramp_disable) if ((rdev->constraints->ramp_delay || rdev->constraints->ramp_disable)
&& ops->set_ramp_delay) { && ops->set_ramp_delay) {
ret = ops->set_ramp_delay(rdev, rdev->constraints->ramp_delay); ret = ops->set_ramp_delay(rdev, rdev->constraints->ramp_delay);
...@@ -1214,6 +1203,17 @@ static int set_machine_constraints(struct regulator_dev *rdev, ...@@ -1214,6 +1203,17 @@ static int set_machine_constraints(struct regulator_dev *rdev,
} }
} }
/* If the constraints say the regulator should be on at this point
* and we have control then make sure it is enabled.
*/
if (rdev->constraints->always_on || rdev->constraints->boot_on) {
ret = _regulator_do_enable(rdev);
if (ret < 0 && ret != -EINVAL) {
rdev_err(rdev, "failed to enable\n");
return ret;
}
}
print_constraints(rdev); print_constraints(rdev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment