UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: core: Fix the init of DT defined fixed regulators 

When a regulator is defined using DT and it has a single voltage the
regulator init always tries to apply this voltage. However it fails if
the regulator isn't settable because it is using an internal low level
function. To overcome this we now first query the regulator and only
set it if needed.

Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Alban Bedel 2014-05-20 12:12:16 +02:00 committed by Mark Brown
parent fd482a3e3e
commit 064d5cd110
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/regulator/core.c
View File

@ -844,13 +844,22 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
/* do we need to apply the constraint voltage */ /* do we need to apply the constraint voltage */
if (rdev->constraints->apply_uV && if (rdev->constraints->apply_uV &&
rdev->constraints->min_uV == rdev->constraints->max_uV) { rdev->constraints->min_uV == rdev->constraints->max_uV) {
ret = _regulator_do_set_voltage(rdev, int current_uV = _regulator_get_voltage(rdev);
rdev->constraints->min_uV, if (current_uV < 0) {
rdev->constraints->max_uV); rdev_err(rdev, "failed to get the current voltage\n");
if (ret < 0) { return current_uV;
rdev_err(rdev, "failed to apply %duV constraint\n", }
rdev->constraints->min_uV); if (current_uV < rdev->constraints->min_uV ||
return ret; current_uV > rdev->constraints->max_uV) {
ret = _regulator_do_set_voltage(
rdev, rdev->constraints->min_uV,
rdev->constraints->max_uV);
if (ret < 0) {
rdev_err(rdev,
"failed to apply %duV constraint\n",
rdev->constraints->min_uV);
return ret;
}
} }
} }