summaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:36 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:36 +0100
commit97844ede9487fc7c4689ce1499bbaa10312618be (patch)
treef65b9136b96ecc47b71fe43aacf93ba149ece508 /include/linux/regulator
parent83b0dd9ea30bae84913907dfba452233ea3cc898 (diff)
parentb92f567deb51d2ee312e02e59f60021778e657ae (diff)
downloadblackbird-op-linux-97844ede9487fc7c4689ce1499bbaa10312618be.tar.gz
blackbird-op-linux-97844ede9487fc7c4689ce1499bbaa10312618be.zip
Merge remote-tracking branch 'regulator/topic/ascend' into v3.9-rc8
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 7df93f52db08..2acdc66f8342 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -329,6 +329,8 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
int min_uV, int max_uV);
int regulator_map_voltage_iterate(struct regulator_dev *rdev,
int min_uV, int max_uV);
+int regulator_map_voltage_ascend(struct regulator_dev *rdev,
+ int min_uV, int max_uV);
int regulator_get_voltage_sel_regmap(struct regulator_dev *rdev);
int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel);
int regulator_is_enabled_regmap(struct regulator_dev *rdev);
OpenPOWER on IntegriCloud