aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-03-15 03:53:05 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-26 13:31:34 -0400
commit09bf14b901f2c1908b6a72fe934457acdd1fa430 (patch)
treeba2e96e91db5f0859d5e8642c83544813579383f /drivers/regulator
parent51579137c500362018b5341f5dca47807ed558aa (diff)
regulator: Fix set and get current limit for wm831x_buckv
WM831X_DC1_HC_THR_MASK is 0x0070. We need to do proper shift for setting and getting current limit. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/wm831x-dcdc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 4904a40b0d46..3044001f3cf6 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -386,7 +386,8 @@ static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
386 if (i == ARRAY_SIZE(wm831x_dcdc_ilim)) 386 if (i == ARRAY_SIZE(wm831x_dcdc_ilim))
387 return -EINVAL; 387 return -EINVAL;
388 388
389 return wm831x_set_bits(wm831x, reg, WM831X_DC1_HC_THR_MASK, i); 389 return wm831x_set_bits(wm831x, reg, WM831X_DC1_HC_THR_MASK,
390 i << WM831X_DC1_HC_THR_SHIFT);
390} 391}
391 392
392static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev) 393static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
@@ -400,7 +401,8 @@ static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
400 if (val < 0) 401 if (val < 0)
401 return val; 402 return val;
402 403
403 return wm831x_dcdc_ilim[val & WM831X_DC1_HC_THR_MASK]; 404 val = (val & WM831X_DC1_HC_THR_MASK) >> WM831X_DC1_HC_THR_SHIFT;
405 return wm831x_dcdc_ilim[val];
404} 406}
405 407
406static struct regulator_ops wm831x_buckv_ops = { 408static struct regulator_ops wm831x_buckv_ops = {