aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/driver.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 4b628139a9cb..efe058f8f746 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -238,6 +238,7 @@ enum regulator_type {
238 * @bypass_val_off: Disabling value for control when using regmap set_bypass 238 * @bypass_val_off: Disabling value for control when using regmap set_bypass
239 * 239 *
240 * @enable_time: Time taken for initial enable of regulator (in uS). 240 * @enable_time: Time taken for initial enable of regulator (in uS).
241 * @off_on_delay: guard time (in uS), before re-enabling a regulator
241 */ 242 */
242struct regulator_desc { 243struct regulator_desc {
243 const char *name; 244 const char *name;
@@ -276,6 +277,8 @@ struct regulator_desc {
276 unsigned int bypass_val_off; 277 unsigned int bypass_val_off;
277 278
278 unsigned int enable_time; 279 unsigned int enable_time;
280
281 unsigned int off_on_delay;
279}; 282};
280 283
281/** 284/**
@@ -348,6 +351,9 @@ struct regulator_dev {
348 351
349 struct regulator_enable_gpio *ena_pin; 352 struct regulator_enable_gpio *ena_pin;
350 unsigned int ena_gpio_state:1; 353 unsigned int ena_gpio_state:1;
354
355 /* time when this regulator was disabled last time */
356 unsigned long last_off_jiffy;
351}; 357};
352 358
353struct regulator_dev * 359struct regulator_dev *