aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/s2mps11.c
diff options
context:
space:
mode:
authorSangbeom Kim <sbkim73@samsung.com>2012-11-23 21:13:28 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-27 15:24:15 -0500
commitf7ebaaeb0b4b97b20c1816f11884e7bfe610a2fa (patch)
tree93a7c08d8c56771c326092fe291470171da21dd3 /drivers/regulator/s2mps11.c
parent9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff)
regulator: s2mps11: Fix ramp delay value shift operation
This patch fix the abnormal ramp delay setting. The shift operation was wrong. Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/regulator/s2mps11.c')
-rw-r--r--drivers/regulator/s2mps11.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 926f9c8f2fac..3fd1b889d579 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -269,16 +269,16 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
269 269
270 if (ramp_enable) { 270 if (ramp_enable) {
271 if (s2mps11->buck2_ramp) 271 if (s2mps11->buck2_ramp)
272 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6; 272 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) << 6;
273 if (s2mps11->buck3_ramp || s2mps11->buck4_ramp) 273 if (s2mps11->buck3_ramp || s2mps11->buck4_ramp)
274 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4; 274 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) << 4;
275 sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable); 275 sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable);
276 } 276 }
277 277
278 ramp_reg &= 0x00; 278 ramp_reg &= 0x00;
279 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay5) >> 6; 279 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay5) << 6;
280 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) >> 4; 280 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) << 4;
281 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2; 281 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) << 2;
282 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9); 282 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);
283 sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg); 283 sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);
284 284