iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: Fix get_mode() for WM835x DCDCs

Browse Source 
The WM835x regulators need a different register checking for force
mode on each DCDC. Previously the force mode status for DCDC1 was
checked.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Mark Brown 2009-02-26 19:24:20 +00:00 committed by Liam Girdwood
parent a308466c24
commit 33f301af0c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/regulator/wm8350-regulator.c
View File

@ -1031,18 +1031,30 @@ static unsigned int wm8350_dcdc_get_mode(struct regulator_dev *rdev)
int dcdc = rdev_get_id(rdev); int dcdc = rdev_get_id(rdev);
u16 mask, sleep, active, force; u16 mask, sleep, active, force;
int mode = REGULATOR_MODE_NORMAL; int mode = REGULATOR_MODE_NORMAL;
int reg;
if (dcdc < WM8350_DCDC_1 || dcdc > WM8350_DCDC_6) switch (dcdc) {
return -EINVAL; case WM8350_DCDC_1:
reg = WM8350_DCDC1_FORCE_PWM;
if (dcdc == WM8350_DCDC_2 || dcdc == WM8350_DCDC_5) break;
case WM8350_DCDC_3:
reg = WM8350_DCDC3_FORCE_PWM;
break;
case WM8350_DCDC_4:
reg = WM8350_DCDC4_FORCE_PWM;
break;
case WM8350_DCDC_6:
reg = WM8350_DCDC6_FORCE_PWM;
break;
default:
return -EINVAL; return -EINVAL;
}
mask = 1 << (dcdc - WM8350_DCDC_1); mask = 1 << (dcdc - WM8350_DCDC_1);
active = wm8350_reg_read(wm8350, WM8350_DCDC_ACTIVE_OPTIONS) & mask; active = wm8350_reg_read(wm8350, WM8350_DCDC_ACTIVE_OPTIONS) & mask;
force = wm8350_reg_read(wm8350, reg) & WM8350_DCDC1_FORCE_PWM_ENA;
sleep = wm8350_reg_read(wm8350, WM8350_DCDC_SLEEP_OPTIONS) & mask; sleep = wm8350_reg_read(wm8350, WM8350_DCDC_SLEEP_OPTIONS) & mask;
force = wm8350_reg_read(wm8350, WM8350_DCDC1_FORCE_PWM)
& WM8350_DCDC1_FORCE_PWM_ENA;
dev_dbg(wm8350->dev, "mask %x active %x sleep %x force %x", dev_dbg(wm8350->dev, "mask %x active %x sleep %x force %x",
mask, active, sleep, force); mask, active, sleep, force);