Commit b203e0df authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

regulator: s2mps11: Fix accidental enable of buck6 ramp delay

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: b96244fa ("regulator: s2mps11: Don't check enable_shift before setting enable ramp rate")
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent de5d0563
...@@ -205,12 +205,17 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) ...@@ -205,12 +205,17 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
if (!ramp_enable) if (!ramp_enable)
goto ramp_disable; goto ramp_disable;
/* 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, ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
1 << enable_shift, 1 << enable_shift); 1 << enable_shift, 1 << enable_shift);
if (ret) { if (ret) {
dev_err(&rdev->dev, "failed to enable ramp rate\n"); dev_err(&rdev->dev, "failed to enable ramp rate\n");
return ret; return ret;
} }
}
ramp_val = get_ramp_delay(ramp_delay); ramp_val = get_ramp_delay(ramp_delay);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment