Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range

diff --cc drivers/regulator/axp20x-regulator.c
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/regulator/lochnagar-regulator.c
Simple merge

diff --cc drivers/regulator/stpmic1_regulator.c
index 0668d61,a1f88e9..f090614
--- 1/drivers/regulator/stpmic1_regulator.c
--- 2/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),