aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/driver.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 80226383e561..ae5c25379237 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -170,6 +170,7 @@ enum regulator_type {
170 * 170 *
171 * @min_uV: Voltage given by the lowest selector (if linear mapping) 171 * @min_uV: Voltage given by the lowest selector (if linear mapping)
172 * @uV_step: Voltage increase with each selector (if linear mapping) 172 * @uV_step: Voltage increase with each selector (if linear mapping)
173 * @ramp_delay: Time to settle down after voltage change (unit: mV/us)
173 * @volt_table: Voltage mapping table (if table based mapping) 174 * @volt_table: Voltage mapping table (if table based mapping)
174 * 175 *
175 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_ 176 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_
@@ -189,6 +190,7 @@ struct regulator_desc {
189 190
190 unsigned int min_uV; 191 unsigned int min_uV;
191 unsigned int uV_step; 192 unsigned int uV_step;
193 unsigned int ramp_delay;
192 194
193 const unsigned int *volt_table; 195 const unsigned int *volt_table;
194 196
@@ -285,6 +287,9 @@ int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel);
285int regulator_is_enabled_regmap(struct regulator_dev *rdev); 287int regulator_is_enabled_regmap(struct regulator_dev *rdev);
286int regulator_enable_regmap(struct regulator_dev *rdev); 288int regulator_enable_regmap(struct regulator_dev *rdev);
287int regulator_disable_regmap(struct regulator_dev *rdev); 289int regulator_disable_regmap(struct regulator_dev *rdev);
290int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
291 unsigned int old_selector,
292 unsigned int new_selector);
288 293
289void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data); 294void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data);
290 295