diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 12:21:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 12:21:41 +1000 |
| commit | 124e5e25299bc85c4891a3f460e0c1642dd709b5 (patch) | |
| tree | e2c45f057b1f245d7513adc708b9f1f28beb32f2 /include/linux/regulator/machine.h | |
| parent | d14a2b61db484aefd480ed197af4c2c2e231d87d (diff) | |
| parent | af7a73de20f9f7a2362be322bf1e7303e08632a7 (diff) | |
Merge remote-tracking branch 'regulator/for-next'
Diffstat (limited to 'include/linux/regulator/machine.h')
| -rw-r--r-- | include/linux/regulator/machine.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 117699d1f7df..9cd4fef37203 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -110,6 +110,10 @@ struct regulator_state { * @ramp_delay: Time to settle down after voltage change (unit: uV/us) * @settling_time: Time to settle down after voltage change when voltage * change is non-linear (unit: microseconds). + * @settling_time_up: Time to settle down after voltage increase when voltage + * change is non-linear (unit: microseconds). + * @settling_time_down : Time to settle down after voltage decrease when + * voltage change is non-linear (unit: microseconds). * @active_discharge: Enable/disable active discharge. The enum * regulator_active_discharge values are used for * initialisation. @@ -152,6 +156,8 @@ struct regulation_constraints { unsigned int ramp_delay; unsigned int settling_time; + unsigned int settling_time_up; + unsigned int settling_time_down; unsigned int enable_time; unsigned int active_discharge; |