Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...

Conflicts:
	drivers/regulator/tps51632-regulator.c

diff --cc drivers/regulator/tps51632-regulator.c
index dce5eb3fa706b40706a8d5988bb8e4857c5f8a47,e88bfe48303ae8825674284b34cbd9e475392a8d..7c4e8a6e1d5da1f6eb37c4fe8301099eadf46386
--- 1/drivers/regulator/tps51632-regulator.c
--- 2/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@@ -119,10 -124,11 +119,10 @@@ static int tps51632_dcdc_set_voltage_se
        if (tps->enable_pwm_dvfs)
                reg = TPS51632_VOLTAGE_BASE_REG;
  
 -      vsel = selector + TPS51632_MIN_VSEL;
 -      if (vsel > TPS51632_MAX_VSEL)
 +      if (selector > TPS51632_MAX_VSEL)
                return -EINVAL;
  
-       ret = regmap_write(tps->regmap, TPS51632_VOLTAGE_SELECT_REG, selector);
 -      ret = regmap_write(tps->regmap, reg, vsel);
++      ret = regmap_write(tps->regmap, reg, selector);
        if (ret < 0)
                dev_err(tps->dev, "reg write failed, err %d\n", ret);
        return ret;