From 866cc98a5b6bc621ea79b9444edc826d99ac224e Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 12 Jul 2012 09:39:10 +0800 Subject: [PATCH] --- yaml --- r: 312628 b: refs/heads/master c: c06eed397a174d9762f1c8a72fc88259f3641af2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/s2mps11.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7dfc06d92218..fb6597ef374e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 232b25047515127cdf1a84c09de79570de7e4d78 +refs/heads/master: c06eed397a174d9762f1c8a72fc88259f3641af2 diff --git a/trunk/drivers/regulator/s2mps11.c b/trunk/drivers/regulator/s2mps11.c index b3c27058f2a6..4669dc9ac74a 100644 --- a/trunk/drivers/regulator/s2mps11.c +++ b/trunk/drivers/regulator/s2mps11.c @@ -280,8 +280,7 @@ 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; @@ -289,7 +288,7 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev) 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++) {