diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 22:32:00 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 22:32:00 +0400 |
| commit | 3384fb98845dc014770caa224d61a2effd258ca5 (patch) | |
| tree | 8189134a4938632e2d06e93af04c9fc1f3c2d4c9 /include/linux/regulator/machine.h | |
| parent | 8cfc545e0e3e6cc82acfdc79321b41eeeab0ca45 (diff) | |
| parent | ade7515fefad9af13f6dd469f35bb413b6a5b473 (diff) | |
| download | linux-3384fb98845dc014770caa224d61a2effd258ca5.tar.xz | |
Merge branch 'regulator-drivers' into regulator-next
Diffstat (limited to 'include/linux/regulator/machine.h')
| -rw-r--r-- | include/linux/regulator/machine.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index b02108446be7..40dd0a394cfa 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -92,6 +92,7 @@ struct regulator_state { * mode. * @initial_state: Suspend state to set by default. * @initial_mode: Mode to set at startup. + * @ramp_delay: Time to settle down after voltage change (unit: uV/us) */ struct regulation_constraints { @@ -125,6 +126,8 @@ struct regulation_constraints { /* mode to set on startup */ unsigned int initial_mode; + unsigned int ramp_delay; + /* constraint flags */ unsigned always_on:1; /* regulator never off when system is on */ unsigned boot_on:1; /* bootloader/firmware enabled regulator */ |