aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-07-11 21:39:10 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-12 13:07:11 -0400
commitc06eed397a174d9762f1c8a72fc88259f3641af2 (patch)
treec1af9673de0d2a69469a1cb038aee8ddc901a49c /drivers/regulator
parent232b25047515127cdf1a84c09de79570de7e4d78 (diff)
regulator: s2mps11: Use sec_reg_write rather than sec_reg_update when mask is 0xff
Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/s2mps11.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index b3c27058f2a..4669dc9ac74 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -280,8 +280,7 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
280 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6; 280 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6;
281 if (s2mps11->buck3_ramp || s2mps11->buck4_ramp) 281 if (s2mps11->buck3_ramp || s2mps11->buck4_ramp)
282 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4; 282 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4;
283 sec_reg_update(iodev, S2MPS11_REG_RAMP, 283 sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable);
284 ramp_reg | ramp_enable, 0xff);
285 } 284 }
286 285
287 ramp_reg &= 0x00; 286 ramp_reg &= 0x00;
@@ -289,7 +288,7 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
289 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) >> 4; 288 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) >> 4;
290 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2; 289 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2;
291 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9); 290 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);
292 sec_reg_update(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg, 0xff); 291 sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);
293 292
294 for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) { 293 for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
295 294