aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-06-18 02:03:16 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-18 05:56:58 -0400
commitea38d13fd1666bc030cb1c0feec5b0da2f89f9b2 (patch)
tree463ca3908e6541a434c73117e716556fac49b596 /include/linux/regulator
parent398715ab9414b3b7741c8239c254111f5016821c (diff)
regulator: core: Change the unit of ramp_delay from mV/uS to uV/uS
This change makes it possible to set ramp_delay with 0.xxx mV/uS without truncation issue. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/driver.h2
-rw-r--r--include/linux/regulator/machine.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index ddc155d262da..84f999ed394b 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -173,7 +173,7 @@ enum regulator_type {
173 * 173 *
174 * @min_uV: Voltage given by the lowest selector (if linear mapping) 174 * @min_uV: Voltage given by the lowest selector (if linear mapping)
175 * @uV_step: Voltage increase with each selector (if linear mapping) 175 * @uV_step: Voltage increase with each selector (if linear mapping)
176 * @ramp_delay: Time to settle down after voltage change (unit: mV/us) 176 * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
177 * @volt_table: Voltage mapping table (if table based mapping) 177 * @volt_table: Voltage mapping table (if table based mapping)
178 * 178 *
179 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_ 179 * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 5f37ad3cc172..40dd0a394cfa 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -92,7 +92,7 @@ struct regulator_state {
92 * mode. 92 * mode.
93 * @initial_state: Suspend state to set by default. 93 * @initial_state: Suspend state to set by default.
94 * @initial_mode: Mode to set at startup. 94 * @initial_mode: Mode to set at startup.
95 * @ramp_delay: Time to settle down after voltage change (unit: mV/us) 95 * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
96 */ 96 */
97struct regulation_constraints { 97struct regulation_constraints {
98 98