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

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)
 
         if (ramp_enable) {
                 if (s2mps11->buck2_ramp)
-                        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)
-                        ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) >> 4;
+                        ramp_reg |= get_ramp_delay(s2mps11->ramp_delay34) << 4;
                 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_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_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);