Merge remote-tracking branches 'regulator/topic/notifier', 'regulator/topic/pfuze100...

[sfrench/cifs-2.6.git] / include / linux / regulator / machine.h

diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index ad3e5158e586dc841e9cd37492ec7104d60e7a81..117699d1f7df4f72491bd65eccec39a160acf646 100644 (file)
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -65,7 +65,7 @@ struct regulator_state {
        int uV; /* suspend voltage */
        unsigned int mode; /* suspend regulator operating mode */
        int enabled; /* is regulator enabled in this suspend state */
-       int disabled; /* is the regulator disbled in this suspend state */
+       int disabled; /* is the regulator disabled in this suspend state */
 };
 
 /**
@@ -108,6 +108,8 @@ 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)
+ * @settling_time: Time to settle down after voltage change when voltage
+ *                change is non-linear (unit: microseconds).
  * @active_discharge: Enable/disable active discharge. The enum
  *                   regulator_active_discharge values are used for
  *                   initialisation.
@@ -149,6 +151,7 @@ struct regulation_constraints {
        unsigned int initial_mode;
 
        unsigned int ramp_delay;
+       unsigned int settling_time;
        unsigned int enable_time;
 
        unsigned int active_discharge;