Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 86caa905f333ddfb609c55c60e2679d764652181

Authored by Mark Brown
2 parents e6120461e5 f7ebaaeb0b
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Merge remote-tracking branch 'regulator/topic/s2mps11' into regulator-next

Showing 1 changed file Side-by-side Diff

drivers/regulator/s2mps11.c
Diff comments   View file @ 86caa90
... ... @@ -269,16 +269,16 @@
269 269  
270 270 if (ramp_enable) {
271 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 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 275 sec_reg_write(iodev, S2MPS11_REG_RAMP, ramp_reg | ramp_enable);
276 276 }
277 277  
278 278 ramp_reg &= 0x00;
279   - ramp_reg |= get_ramp_delay(s2mps11->ramp_delay5) >> 6;
280   - ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) >> 4;
281   - ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) >> 2;
  279 + ramp_reg |= get_ramp_delay(s2mps11->ramp_delay5) << 6;
  280 + ramp_reg |= get_ramp_delay(s2mps11->ramp_delay16) << 4;
  281 + ramp_reg |= get_ramp_delay(s2mps11->ramp_delay7810) << 2;
282 282 ramp_reg |= get_ramp_delay(s2mps11->ramp_delay9);
283 283 sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);
284 284