aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 22:43:00 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 22:43:00 -0500
commitadca48f7c61c53708a1f1ed567e0447ccb2b3b96 (patch)
treed1860df280202eb86a625bd3400eab02b819100a /include/linux/regulator
parent9e218670737e01ef37bd1ac400482462049dfeff (diff)
parente1b0144f9997d3d52c46785143699d82dd525f1d (diff)
Merge remote-tracking branch 'regulator/topic/min' into regulator-next
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/driver.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index f2b72b230b9b..d10bb0f39c5e 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -187,6 +187,7 @@ enum regulator_type {
187 * 187 *
188 * @min_uV: Voltage given by the lowest selector (if linear mapping) 188 * @min_uV: Voltage given by the lowest selector (if linear mapping)
189 * @uV_step: Voltage increase with each selector (if linear mapping) 189 * @uV_step: Voltage increase with each selector (if linear mapping)
190 * @linear_min_sel: Minimal selector for starting linear mapping
190 * @ramp_delay: Time to settle down after voltage change (unit: uV/us) 191 * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
191 * @volt_table: Voltage mapping table (if table based mapping) 192 * @volt_table: Voltage mapping table (if table based mapping)
192 * 193 *
@@ -210,6 +211,7 @@ struct regulator_desc {
210 211
211 unsigned int min_uV; 212 unsigned int min_uV;
212 unsigned int uV_step; 213 unsigned int uV_step;
214 unsigned int linear_min_sel;
213 unsigned int ramp_delay; 215 unsigned int ramp_delay;
214 216
215 const unsigned int *volt_table; 217 const unsigned int *volt_table;