summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vp.h
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2011-05-28 04:15:59 +0200
committerKevin Hilman <khilman@ti.com>2011-09-15 21:09:08 +0200
commitbea30ed65fb2432097f362ce17042e22febcb616 (patch)
treeb4bb15f0099e1d7e0fbe7ef5920491f6f388f5bd /arch/arm/mach-omap2/vp.h
parentOMAP3+: VP: move voltage scale function pointer into struct voltagedomain (diff)
downloadlinux-bea30ed65fb2432097f362ce17042e22febcb616.tar.xz
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/vp.h')
-rw-r--r--arch/arm/mach-omap2/vp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/vp.h b/arch/arm/mach-omap2/vp.h
index 96bbb23d2de2..7dc5cb3cd60c 100644
--- a/arch/arm/mach-omap2/vp.h
+++ b/arch/arm/mach-omap2/vp.h
@@ -63,6 +63,7 @@ struct omap_vp_ops {
* @vlimitto_vddmin_shift: VDDMIN field shift in PRM_VP*_VLIMITTO reg
* @vlimitto_vddmax_shift: VDDMAX field shift in PRM_VP*_VLIMITTO reg
* @vlimitto_timeout_shift: TIMEOUT field shift in PRM_VP*_VLIMITTO reg
+ * @vpvoltage_mask: VPVOLTAGE field mask in PRM_VP*_VOLTAGE reg
*/
struct omap_vp_common {
u32 vpconfig_erroroffset_mask;
@@ -79,6 +80,7 @@ struct omap_vp_common {
u8 vlimitto_vddmin_shift;
u8 vlimitto_vddmax_shift;
u8 vlimitto_timeout_shift;
+ u8 vpvoltage_mask;
const struct omap_vp_ops *ops;
};