From: Mark Brown Date: Tue, 19 Feb 2019 11:06:41 +0000 (+0000) Subject: Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=16646d8d3d66e0a89528f72a28a23023b054417d;p=linux.git Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range --- 16646d8d3d66e0a89528f72a28a23023b054417d diff --cc drivers/regulator/stpmic1_regulator.c index 0668d61df7d46,a1f88e996cae5..f09061473613c --- a/drivers/regulator/stpmic1_regulator.c +++ b/drivers/regulator/stpmic1_regulator.c @@@ -55,12 -72,16 +55,13 @@@ enum /* Enable time worst case is 5000mV/(2250uV/uS) */ #define PMIC_ENABLE_TIME_US 2200 -#define STPMIC1_BUCK_MODE_NORMAL 0 -#define STPMIC1_BUCK_MODE_LP BUCK_HPLP_ENABLE_MASK - 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), }; -struct regulator_linear_range buck2_ranges[] = { +static const struct regulator_linear_range buck2_ranges[] = { REGULATOR_LINEAR_RANGE(1000000, 0, 17, 0), REGULATOR_LINEAR_RANGE(1050000, 18, 19, 0), REGULATOR_LINEAR_RANGE(1100000, 20, 21, 0),