regulator: Merge up pending fix

One small fix didn't get sent before the merge window.

diff --cc drivers/regulator/mt6358-regulator.c
index acb82bc85dc981ba07e612cbf7d69cb80d455086,65fbd95f1dbb0c6935f66e32fa61d0664edb562d..e4745f616cea3b461ac3131a3f885536412c1014
--- 1/drivers/regulator/mt6358-regulator.c
--- 2/drivers/regulator/mt6358-regulator.c
+++ b/drivers/regulator/mt6358-regulator.c
@@@ -39,9 -42,8 +39,9 @@@ struct mt6358_regulator_info 
  [MT6358_ID_##vreg] = {        \
        .desc = {       \
                .name = #vreg,  \
 +              .supply_name = supply,          \
                .of_match = of_match_ptr(match),        \
-               .ops = &mt6358_volt_range_ops,  \
+               .ops = &mt6358_buck_ops,        \
                .type = REGULATOR_VOLTAGE,      \
                .id = MT6358_ID_##vreg,         \
                .owner = THIS_MODULE,           \
@@@ -140,9 -138,8 +140,9 @@@
  [MT6366_ID_##vreg] = {        \
        .desc = {       \
                .name = #vreg,  \
 +              .supply_name = "vsys-" match,           \
                .of_match = of_match_ptr(match),        \
-               .ops = &mt6358_volt_range_ops,  \
+               .ops = &mt6358_buck_ops,        \
                .type = REGULATOR_VOLTAGE,      \
                .id = MT6366_ID_##vreg,         \
                .owner = THIS_MODULE,           \
@@@ -463,11 -464,23 +463,23 @@@ static const struct regulator_ops mt635
        .get_mode = mt6358_regulator_get_mode,
  };
  
+ static const struct regulator_ops mt6358_volt_range_ops = {
+       .list_voltage = regulator_list_voltage_linear,
+       .map_voltage = regulator_map_voltage_linear,
+       .set_voltage_sel = regulator_set_voltage_sel_regmap,
+       .get_voltage_sel = mt6358_get_buck_voltage_sel,
+       .set_voltage_time_sel = regulator_set_voltage_time_sel,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
+       .get_status = mt6358_get_status,
+ };
+ 
  static const struct regulator_ops mt6358_volt_table_ops = {
 -      .list_voltage = regulator_list_voltage_table,
 -      .map_voltage = regulator_map_voltage_iterate,
 -      .set_voltage_sel = mt6358_set_voltage_sel,
 -      .get_voltage_sel = mt6358_get_voltage_sel,
 +      .list_voltage = regulator_list_voltage_pickable_linear_range,
 +      .map_voltage = regulator_map_voltage_pickable_linear_range,
 +      .set_voltage_sel = regulator_set_voltage_sel_pickable_regmap,
 +      .get_voltage_sel = regulator_get_voltage_sel_pickable_regmap,
        .set_voltage_time_sel = regulator_set_voltage_time_sel,
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,

diff --cc drivers/regulator/qcom-rpmh-regulator.c
Simple merge