regulator: s2mps11: Fix accidental enable of buck6 ramp delay

commit b203e0dfe1a2b0ae5e2681e9285056e4ae8560af upstream.

S2MPS11 supports enabling/disabling ramp delay only for buck[2346].
Other bucks have ramp delay enabled always.

However the bit shift for enabling buck6 ramp delay in register is equal
to 0. When ramp delay was set for the bucks unsupporting enable/disable
(buck[15789] and buck10), the ramp delay for buck6 was also enabled.

Fixes: b96244fad953 ("regulator: s2mps11: Don't check enable_shift before setting enable ramp rate")
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index e713c162fbd41bd1e3ff7d52782a813d42e70986..aaca37e1424f19ef633f2c36abd245f8586891fd 100644 (file)
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -202,11 +202,16 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
        if (!ramp_enable)
                goto ramp_disable;
 
-       ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
-                                1 << enable_shift, 1 << enable_shift);
-       if (ret) {
-               dev_err(&rdev->dev, "failed to enable ramp rate\n");
-               return ret;
+       /* Ramp delay can be enabled/disabled only for buck[2346] */
+       if ((rdev_get_id(rdev) >= S2MPS11_BUCK2 &&
+                       rdev_get_id(rdev) <= S2MPS11_BUCK4) ||
+                       rdev_get_id(rdev) == S2MPS11_BUCK6)  {
+               ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
+                                        1 << enable_shift, 1 << enable_shift);
+               if (ret) {
+                       dev_err(&rdev->dev, "failed to enable ramp rate\n");
+                       return ret;
+               }
        }
 
        ramp_val = get_ramp_delay(ramp_delay);