p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/fix/ti-abb' into regulator-linus

This commit is contained in:
Mark Brown 2013-09-30 12:04:32 +01:00
parent 780a0ff76e bf00ca35ce
commit 0f5da28f93
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/regulator/ti-abb-regulator.c
View File

@ -279,8 +279,12 @@ static int ti_abb_set_opp(struct regulator_dev *rdev, struct ti_abb *abb,
ti_abb_rmw(regs->opp_sel_mask, info->opp_sel, regs->control_reg,
abb->base);
/* program LDO VBB vset override if needed */
if (abb->ldo_base)
/*
* program LDO VBB vset override if needed for !bypass mode
* XXX: Do not switch sequence - for !bypass, LDO override reset *must*
* be performed *before* switch to bias mode else VBB glitches.
*/
if (abb->ldo_base && info->opp_sel != TI_ABB_NOMINAL_OPP)
ti_abb_program_ldovbb(dev, abb, info);
/* Initiate ABB ldo change */
@ -295,6 +299,14 @@ static int ti_abb_set_opp(struct regulator_dev *rdev, struct ti_abb *abb,
if (ret)
goto out;
/*
* Reset LDO VBB vset override bypass mode
* XXX: Do not switch sequence - for bypass, LDO override reset *must*
* be performed *after* switch to bypass else VBB glitches.
*/
if (abb->ldo_base && info->opp_sel == TI_ABB_NOMINAL_OPP)
ti_abb_program_ldovbb(dev, abb, info);
out:
return ret;
}