aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/vp44xx_data.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-04-04 16:02:28 -0700
committerKevin Hilman <khilman@ti.com>2011-09-15 12:09:07 -0700
commit0ec3041e91cf365a76c81b224e85d3c2574fec23 (patch)
tree659b8817abe6399b008cdcbd5425d5fce0358204 /arch/arm/mach-omap2/vp44xx_data.c
parent633ef8b7475a224b6be662d7c698cd705157064f (diff)
OMAP3+: VP: struct omap_vp_common: replace shift with __ffs(mask)
In struct omap_vp_common, the shift value can be derived from the mask value by using __ffs(), so remove the shift value for the various VPCONFIG bitfields, and use __ffs() in the code for the shift value. While here, rename field names in kerneldoc comment to match actual field names in structure. Also, cleanup indendentaion for other VP register accesses in omap_vp_init(). No functional changes. Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vp44xx_data.c')
-rw-r--r--arch/arm/mach-omap2/vp44xx_data.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/vp44xx_data.c b/arch/arm/mach-omap2/vp44xx_data.c
index 8f75cd9e7e6..0daf2a47dc2 100644
--- a/arch/arm/mach-omap2/vp44xx_data.c
+++ b/arch/arm/mach-omap2/vp44xx_data.c
@@ -37,10 +37,8 @@ static const struct omap_vp_ops omap4_vp_ops = {
* XXX This stuff presumably belongs in the vp44xx.c or vp.c file.
*/
static const struct omap_vp_common omap4_vp_common = {
- .vpconfig_erroroffset_shift = OMAP4430_ERROROFFSET_SHIFT,
+ .vpconfig_erroroffset_mask = OMAP4430_ERROROFFSET_MASK,
.vpconfig_errorgain_mask = OMAP4430_ERRORGAIN_MASK,
- .vpconfig_errorgain_shift = OMAP4430_ERRORGAIN_SHIFT,
- .vpconfig_initvoltage_shift = OMAP4430_INITVOLTAGE_SHIFT,
.vpconfig_initvoltage_mask = OMAP4430_INITVOLTAGE_MASK,
.vpconfig_timeouten = OMAP4430_TIMEOUTEN_MASK,
.vpconfig_initvdd = OMAP4430_INITVDD_MASK,