summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/stpmic1_regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-02-19 12:06:41 +0100
committerMark Brown <broonie@kernel.org>2019-02-19 12:06:41 +0100
commit16646d8d3d66e0a89528f72a28a23023b054417d (patch)
tree6620abf1d2021486f30e7036324e4de6f0b14321 /drivers/regulator/stpmic1_regulator.c
parentregulator: stpmic1: Add active discharge support (diff)
parentregulator: stpmic1: Change buck1 voltage range (diff)
downloadlinux-16646d8d3d66e0a89528f72a28a23023b054417d.tar.xz
linux-16646d8d3d66e0a89528f72a28a23023b054417d.zip
Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range
Diffstat (limited to 'drivers/regulator/stpmic1_regulator.c')
-rw-r--r--drivers/regulator/stpmic1_regulator.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/stpmic1_regulator.c b/drivers/regulator/stpmic1_regulator.c
index 0668d61df7d4..f09061473613 100644
--- a/drivers/regulator/stpmic1_regulator.c
+++ b/drivers/regulator/stpmic1_regulator.c
@@ -56,8 +56,9 @@ enum {
#define PMIC_ENABLE_TIME_US 2200
static const struct regulator_linear_range buck1_ranges[] = {
- REGULATOR_LINEAR_RANGE(600000, 0, 30, 25000),
- REGULATOR_LINEAR_RANGE(1350000, 31, 63, 0),
+ REGULATOR_LINEAR_RANGE(725000, 0, 4, 0),
+ REGULATOR_LINEAR_RANGE(725000, 5, 36, 25000),
+ REGULATOR_LINEAR_RANGE(1500000, 37, 63, 0),
};
static const struct regulator_linear_range buck2_ranges[] = {