diff options
author | Mark Brown <broonie@kernel.org> | 2019-02-19 11:06:41 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-02-19 11:06:41 +0000 |
commit | 16646d8d3d66e0a89528f72a28a23023b054417d (patch) | |
tree | 6620abf1d2021486f30e7036324e4de6f0b14321 /drivers/regulator/s2mpa01.c | |
parent | e6fff62ab8ac81fe42c407b1b2cfbffcb50c7d01 (diff) | |
parent | 48593a99a1f6245000fa90606dd9ec5eb96b54a6 (diff) |
Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range
Diffstat (limited to 'drivers/regulator/s2mpa01.c')
-rw-r--r-- | drivers/regulator/s2mpa01.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/s2mpa01.c b/drivers/regulator/s2mpa01.c index 095d25f3d2ea..58a1fe583a6c 100644 --- a/drivers/regulator/s2mpa01.c +++ b/drivers/regulator/s2mpa01.c @@ -298,13 +298,13 @@ static const struct regulator_desc regulators[] = { regulator_desc_ldo(2, STEP_50_MV), regulator_desc_ldo(3, STEP_50_MV), regulator_desc_ldo(4, STEP_50_MV), - regulator_desc_ldo(5, STEP_50_MV), + regulator_desc_ldo(5, STEP_25_MV), regulator_desc_ldo(6, STEP_25_MV), regulator_desc_ldo(7, STEP_50_MV), regulator_desc_ldo(8, STEP_50_MV), regulator_desc_ldo(9, STEP_50_MV), regulator_desc_ldo(10, STEP_50_MV), - regulator_desc_ldo(11, STEP_25_MV), + regulator_desc_ldo(11, STEP_50_MV), regulator_desc_ldo(12, STEP_50_MV), regulator_desc_ldo(13, STEP_50_MV), regulator_desc_ldo(14, STEP_50_MV), @@ -315,11 +315,11 @@ static const struct regulator_desc regulators[] = { regulator_desc_ldo(19, STEP_50_MV), regulator_desc_ldo(20, STEP_50_MV), regulator_desc_ldo(21, STEP_50_MV), - regulator_desc_ldo(22, STEP_25_MV), - regulator_desc_ldo(23, STEP_25_MV), + regulator_desc_ldo(22, STEP_50_MV), + regulator_desc_ldo(23, STEP_50_MV), regulator_desc_ldo(24, STEP_50_MV), regulator_desc_ldo(25, STEP_50_MV), - regulator_desc_ldo(26, STEP_50_MV), + regulator_desc_ldo(26, STEP_25_MV), regulator_desc_buck1_4(1), regulator_desc_buck1_4(2), regulator_desc_buck1_4(3), |