regulator: ltc3676: Assure PGOOD mask is set before changing voltage

Make sure the DVBxB bit 5, PGOOD mask, is set before changing voltage
on the buck converters. If the PGOOD mask bit is not set, the PMIC may
deassert the PGOOD signal during the voltage transition.

On systems that use the PGOOD signal as a power OK indication for the
board or SoC, which should be the case on correct designs, deasserting
the PGOOD signal will lead to system reset or shutdown, which is not
the expected behavior when changing PMIC buck converter voltage.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/ltc3676.c b/drivers/regulator/ltc3676.c
index 662ee05ea44d7c0cea7d0abf69c9503d887f3529..9dec1609ff666c1047403ace5976b7487275b7c0 100644 (file)
--- a/drivers/regulator/ltc3676.c
+++ b/drivers/regulator/ltc3676.c
@@ -52,6 +52,7 @@
 #define LTC3676_CLIRQ     0x1F
 
 #define LTC3676_DVBxA_REF_SELECT       BIT(5)
+#define LTC3676_DVBxB_PGOOD_MASK       BIT(5)
 
 #define LTC3676_IRQSTAT_PGOOD_TIMEOUT  BIT(3)
 #define LTC3676_IRQSTAT_UNDERVOLT_WARN BIT(4)
@@ -123,6 +124,23 @@ static int ltc3676_set_suspend_mode(struct regulator_dev *rdev,
                                  mask, val);
 }
 
+static int ltc3676_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
+{
+       struct ltc3676 *ltc3676 = rdev_get_drvdata(rdev);
+       struct device *dev = ltc3676->dev;
+       int ret, dcdc = rdev_get_id(rdev);
+
+       dev_dbg(dev, "%s id=%d selector=%d\n", __func__, dcdc, selector);
+
+       ret = regmap_update_bits(ltc3676->regmap, rdev->desc->vsel_reg + 1,
+                                LTC3676_DVBxB_PGOOD_MASK,
+                                LTC3676_DVBxB_PGOOD_MASK);
+       if (ret)
+               return ret;
+
+       return regulator_set_voltage_sel_regmap(rdev, selector);
+}
+
 static inline unsigned int ltc3676_scale(unsigned int uV, u32 r1, u32 r2)
 {
        uint64_t tmp;
@@ -166,7 +184,7 @@ static const struct regulator_ops ltc3676_linear_regulator_ops = {
        .disable = regulator_disable_regmap,
        .is_enabled = regulator_is_enabled_regmap,
        .list_voltage = regulator_list_voltage_linear,
-       .set_voltage_sel = regulator_set_voltage_sel_regmap,
+       .set_voltage_sel = ltc3676_set_voltage_sel,
        .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .set_suspend_voltage = ltc3676_set_suspend_voltage,
        .set_suspend_mode = ltc3676_set_suspend_mode,