Skip to content

Commit

Permalink
regulator: Fix set and get current limit for wm831x_buckv
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel Lin authored and Mark Brown committed Mar 26, 2012
1 parent 5157913 commit 09bf14b
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/regulator/wm831x-dcdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,8 @@ static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
if (i == ARRAY_SIZE(wm831x_dcdc_ilim))
return -EINVAL;

return wm831x_set_bits(wm831x, reg, WM831X_DC1_HC_THR_MASK, i);
return wm831x_set_bits(wm831x, reg, WM831X_DC1_HC_THR_MASK,
i << WM831X_DC1_HC_THR_SHIFT);
}

static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
Expand All @@ -400,7 +401,8 @@ static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
if (val < 0)
return val;

return wm831x_dcdc_ilim[val & WM831X_DC1_HC_THR_MASK];
val = (val & WM831X_DC1_HC_THR_MASK) >> WM831X_DC1_HC_THR_SHIFT;
return wm831x_dcdc_ilim[val];
}

static struct regulator_ops wm831x_buckv_ops = {
Expand Down

0 comments on commit 09bf14b

Please sign in to comment.