diff options
| author | Todd Poynor <toddpoynor@google.com> | 2011-05-27 19:15:59 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-09-15 12:09:08 -0700 |
| commit | bea30ed65fb2432097f362ce17042e22febcb616 (patch) | |
| tree | b4bb15f0099e1d7e0fbe7ef5920491f6f388f5bd /arch/arm/mach-omap2/vp.c | |
| parent | 0f01565a353e06f1f1d7757b212c51e61c6fea58 (diff) | |
| download | linux-stable-bea30ed65fb2432097f362ce17042e22febcb616.tar.gz linux-stable-bea30ed65fb2432097f362ce17042e22febcb616.tar.bz2 linux-stable-bea30ed65fb2432097f362ce17042e22febcb616.zip | |
OMAP: VP: Explicitly mask VPVOLTAGE field
Reading the VPVOLTAGE field of PRM_VP_*_VOLTAGE registers currently
relies on a u32 -> u8 conversion to mask off the FORCEUPDATEWAIT field
in the upper bits. Make this explicit using the mask symbol
already defined, added as a new field in struct omap_vp_common.
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vp.c')
| -rw-r--r-- | arch/arm/mach-omap2/vp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c index e7d38f67db87..38076205312e 100644 --- a/arch/arm/mach-omap2/vp.c +++ b/arch/arm/mach-omap2/vp.c @@ -227,7 +227,8 @@ unsigned long omap_vp_get_curr_volt(struct voltagedomain *voltdm) return 0; } - curr_vsel = voltdm->read(vp->voltage); + curr_vsel = (voltdm->read(vp->voltage) & vp->common->vpvoltage_mask) + >> __ffs(vp->common->vpvoltage_mask); if (!voltdm->pmic || !voltdm->pmic->vsel_to_uv) { pr_warning("%s: PMIC function to convert vsel to voltage" |