diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:19 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:19 -0500 |
| commit | 86caa905f333ddfb609c55c60e2679d764652181 (patch) | |
| tree | 386b8f6381e594c49870fd6e561c4a5dd4b29364 /drivers/regulator | |
| parent | e6120461e57700312648037be06adee3a764fd62 (diff) | |
| parent | f7ebaaeb0b4b97b20c1816f11884e7bfe610a2fa (diff) | |
Merge remote-tracking branch 'regulator/topic/s2mps11' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/s2mps11.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index 85fc086c1319..bd062a2ffbe2 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c | |||
| @@ -269,16 +269,16 @@ static 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 | ||