diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-09-09 15:21:20 (GMT) |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2008-10-13 20:51:51 (GMT) |
| commit | e5fda26c7ea9430d7d953364f900bafdce2be67b (patch) | |
| tree | 0c7f2ba6d37591eca7d2a1adb1e75b40067ff31c /drivers/regulator | |
| parent | e06f5b4fea243b152c79fe5d9552a852069de483 (diff) | |
| download | linux-e5fda26c7ea9430d7d953364f900bafdce2be67b.tar.xz | |
regulator: Enable regulators marked as always_on
If the machine constraints mark a regulator as always_on but this was
not done by the bootloader then enable the regulator when applying
constraints.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 0440889..9a6757d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -670,6 +670,7 @@ static int set_machine_constraints(struct regulator_dev *rdev, { int ret = 0; const char *name; + struct regulator_ops *ops = rdev->desc->ops; if (constraints->name) name = constraints->name; @@ -683,8 +684,8 @@ static int set_machine_constraints(struct regulator_dev *rdev, /* do we need to apply the constraint voltage */ if (rdev->constraints->apply_uV && rdev->constraints->min_uV == rdev->constraints->max_uV && - rdev->desc->ops->set_voltage) { - ret = rdev->desc->ops->set_voltage(rdev, + ops->set_voltage) { + ret = ops->set_voltage(rdev, rdev->constraints->min_uV, rdev->constraints->max_uV); if (ret < 0) { printk(KERN_ERR "%s: failed to apply %duV constraint to %s\n", @@ -710,6 +711,20 @@ static int set_machine_constraints(struct regulator_dev *rdev, } } + /* if always_on is set then turn the regulator on if it's not + * already on. */ + if (constraints->always_on && ops->enable && + ((ops->is_enabled && !ops->is_enabled(rdev)) || + (!ops->is_enabled && !constraints->boot_on))) { + ret = ops->enable(rdev); + if (ret < 0) { + printk(KERN_ERR "%s: failed to enable %s\n", + __func__, name); + rdev->constraints = NULL; + goto out; + } + } + print_constraints(rdev); out: return ret; |