aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator/driver.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 07:44:17 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 07:44:17 -0500
commitb17fc86cc5e8fbfd1d18765f6463d1989c59f9c6 (patch)
tree8e0b967c8b63ecf085b762d9c9b1015f063e5759 /include/linux/regulator/driver.h
parentd1e7de3007c6e34c5e6d5e1b707b5aba4a1cd57f (diff)
parente1b0144f9997d3d52c46785143699d82dd525f1d (diff)
Merge branch 'topic/min' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-change
Diffstat (limited to 'include/linux/regulator/driver.h')
-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 7932a3bf21bd..d9ce98a5028b 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -185,6 +185,7 @@ enum regulator_type {
185 * 185 *
186 * @min_uV: Voltage given by the lowest selector (if linear mapping) 186 * @min_uV: Voltage given by the lowest selector (if linear mapping)
187 * @uV_step: Voltage increase with each selector (if linear mapping) 187 * @uV_step: Voltage increase with each selector (if linear mapping)
188 * @linear_min_sel: Minimal selector for starting linear mapping
188 * @ramp_delay: Time to settle down after voltage change (unit: uV/us) 189 * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
189 * @volt_table: Voltage mapping table (if table based mapping) 190 * @volt_table: Voltage mapping table (if table based mapping)
190 * 191 *
@@ -207,6 +208,7 @@ struct regulator_desc {
207 208
208 unsigned int min_uV; 209 unsigned int min_uV;
209 unsigned int uV_step; 210 unsigned int uV_step;
211 unsigned int linear_min_sel;
210 unsigned int ramp_delay; 212 unsigned int ramp_delay;
211 213
212 const unsigned int *volt_table; 214 const unsigned int *volt_table;