Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312628
b: refs/heads/master
c: c06eed3
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed Jul 12, 2012
1 parent 95a2135 commit 866cc98
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 232b25047515127cdf1a84c09de79570de7e4d78
refs/heads/master: c06eed397a174d9762f1c8a72fc88259f3641af2
5 changes: 2 additions & 3 deletions trunk/drivers/regulator/s2mps11.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,16 +280,15 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6;
if (s2mps11->buck3_ramp || s2mps11->buck4_ramp)
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4;
sec_reg_update(iodev, S2MPS11_REG_RAMP,
ramp_reg | ramp_enable, 0xff);
sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable);
}

ramp_reg &= 0x00;
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay5) >> 6;
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) >> 4;
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2;
ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);
sec_reg_update(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg, 0xff);
sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);

for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {

Expand Down

0 comments on commit 866cc98

Please sign in to comment.