summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-22 13:34:04 +0100
committerMark Brown <broonie@kernel.org>2015-10-22 13:34:04 +0100
commit2098bf215f85fd92175bd9f851cfdc5df5b736e4 (patch)
treee33ef96c04520ad8f5eaaaf6f39d04c765652fd9
parenta204f41e2d670c07c4dbd382d5bd8f6db8347ac2 (diff)
parent5abe4f223ed6b820443d3657bd48600692f61c12 (diff)
downloadlinux-2098bf215f85fd92175bd9f851cfdc5df5b736e4.tar.gz
linux-2098bf215f85fd92175bd9f851cfdc5df5b736e4.tar.bz2
linux-2098bf215f85fd92175bd9f851cfdc5df5b736e4.zip
Merge remote-tracking branch 'regulator/topic/dropout' into HEAD
-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 45932228cbf5..9c2903e58adb 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -245,6 +245,7 @@ enum regulator_type {
* @linear_min_sel: Minimal selector for starting linear mapping
* @fixed_uV: Fixed voltage of rails.
* @ramp_delay: Time to settle down after voltage change (unit: uV/us)
+ * @min_dropout_uV: The minimum dropout voltage this regulator can handle
* @linear_ranges: A constant table of possible voltage ranges.
* @n_linear_ranges: Number of entries in the @linear_ranges table.
* @volt_table: Voltage mapping table (if table based mapping)
@@ -292,6 +293,7 @@ struct regulator_desc {
unsigned int linear_min_sel;
int fixed_uV;
unsigned int ramp_delay;
+ int min_dropout_uV;
const struct regulator_linear_range *linear_ranges;
int n_linear_ranges;