summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vp3xxx_data.c
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2011-05-27 19:15:59 -0700
committerKevin Hilman <khilman@ti.com>2011-09-15 12:09:08 -0700
commitbea30ed65fb2432097f362ce17042e22febcb616 (patch)
treeb4bb15f0099e1d7e0fbe7ef5920491f6f388f5bd /arch/arm/mach-omap2/vp3xxx_data.c
parent0f01565a353e06f1f1d7757b212c51e61c6fea58 (diff)
downloadlinux-bea30ed65fb2432097f362ce17042e22febcb616.tar.gz
linux-bea30ed65fb2432097f362ce17042e22febcb616.tar.bz2
linux-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/vp3xxx_data.c')
-rw-r--r--arch/arm/mach-omap2/vp3xxx_data.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/vp3xxx_data.c b/arch/arm/mach-omap2/vp3xxx_data.c
index d429c447eef0..260c554b1547 100644
--- a/arch/arm/mach-omap2/vp3xxx_data.c
+++ b/arch/arm/mach-omap2/vp3xxx_data.c
@@ -51,6 +51,8 @@ static const struct omap_vp_common omap3_vp_common = {
.vlimitto_vddmin_shift = OMAP3430_VDDMIN_SHIFT,
.vlimitto_vddmax_shift = OMAP3430_VDDMAX_SHIFT,
.vlimitto_timeout_shift = OMAP3430_TIMEOUT_SHIFT,
+ .vpvoltage_mask = OMAP3430_VPVOLTAGE_MASK,
+
.ops = &omap3_vp_ops,
};