Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c06eed39 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: s2mps11: Use sec_reg_write rather than sec_reg_update when mask is 0xff 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarSangbeom Kim <sbkim73@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 232b2504

drivers/regulator/s2mps11.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -280,8 +280,7 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev) 
			ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6;

			ramp_reg |= get_ramp_delay(s2mps11->ramp_delay2) >> 6;

		if (s2mps11->buck3_ramp || s2mps11->buck4_ramp)

		if (s2mps11->buck3_ramp || s2mps11->buck4_ramp)

			ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4;

			ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4;

		sec_reg_update(iodev, S2MPS11_REG_RAMP,

		sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable);

			ramp_reg | ramp_enable, 0xff);

	}

	}





	ramp_reg &= 0x00;

	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_delay16) >> 4;

	ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2;

	ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2;

	ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);

	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++) {

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