diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-26 19:24:19 +0000 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-03-31 09:56:24 +0100 |
| commit | a308466c24b4f42bab6945026e938874d22cde50 (patch) | |
| tree | 7eea151552bacfa580099cb6f9a32a9140d65c89 | |
| parent | fe203ddfa5451a13589b1c7da9edab80b7fc06d1 (diff) | |
| download | op-kernel-dev-a308466c24b4f42bab6945026e938874d22cde50.zip op-kernel-dev-a308466c24b4f42bab6945026e938874d22cde50.tar.gz | |
regulator: Allow regulators to set the initial operating mode
This is useful when wishing to run in a fixed operating mode that isn't
the default.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
| -rw-r--r-- | drivers/regulator/core.c | 17 | ||||
| -rw-r--r-- | include/linux/regulator/machine.h | 4 |
2 files changed, 21 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d55a25a..75abcd8 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -724,6 +724,23 @@ static int set_machine_constraints(struct regulator_dev *rdev, } } + if (constraints->initial_mode) { + if (!ops->set_mode) { + printk(KERN_ERR "%s: no set_mode operation for %s\n", + __func__, name); + ret = -EINVAL; + goto out; + } + + ret = ops->set_mode(rdev, constraints->initial_mode); + if (ret < 0) { + printk(KERN_ERR + "%s: failed to set initial mode for %s: %d\n", + __func__, name, ret); + goto out; + } + } + /* if always_on is set then turn the regulator on if it's not * already on. */ if (constraints->always_on && ops->enable && diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 5aa00ee..1eb861c 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -83,6 +83,7 @@ struct regulator_state { * @state_standby: State for regulator when system is suspended in standby * mode. * @initial_state: Suspend state to set by default. + * @initial_mode: Mode to set at startup. */ struct regulation_constraints { @@ -111,6 +112,9 @@ struct regulation_constraints { struct regulator_state state_standby; suspend_state_t initial_state; /* suspend state to set at init */ + /* mode to set on startup */ + unsigned int initial_mode; + /* constriant flags */ unsigned always_on:1; /* regulator never off when system is on */ unsigned boot_on:1; /* bootloader/firmware enabled regulator */ |
