diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 14:11:33 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 14:11:33 +0400 |
| commit | 81e439f476a397af695e8141df6e7324a8ac4893 (patch) | |
| tree | 8a79f8d7805e4f2f838a39cdc751d43a987ee1e1 /include/linux/regulator | |
| parent | cea64d8c089289baede77c324e706d748e87725f (diff) | |
| parent | 5df529d440aa4f0e67be9af3718e7edf05db7d02 (diff) | |
| download | linux-81e439f476a397af695e8141df6e7324a8ac4893.tar.xz | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/machine.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 999b20ce06cf..8108751acb86 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -95,6 +95,7 @@ struct regulator_state { * @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) + * @enable_time: Turn-on time of the rails (unit: microseconds) */ struct regulation_constraints { @@ -129,6 +130,7 @@ struct regulation_constraints { unsigned int initial_mode; unsigned int ramp_delay; + unsigned int enable_time; /* constraint flags */ unsigned always_on:1; /* regulator never off when system is on */ |