summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/vc.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-04-05 02:25:07 +0400
committerKevin Hilman <khilman@ti.com>2011-09-15 23:09:07 +0400
commitb7ea803e55769768d1eff3b32e4f99837fa6ddb5 (patch)
treeefe5022fab4248d5f5fe33284d91b4743121115d /arch/arm/mach-omap2/vc.c
parentd7b0de2b46803062148345ae6a976c1e44a457b6 (diff)
downloadlinux-b7ea803e55769768d1eff3b32e4f99837fa6ddb5.tar.xz
OMAP3+: VP: cleanup: move VP instance into voltdm, misc. renames
- move VP instance struct from vdd_info into struct voltage domain - remove _data suffix from structure name - rename vp_ prefix from vp_common field: accesses are now vp->common - move vp_enabled bool from vdd_info into VP instance - remove remaining references to omap_vdd_info No functional changes. Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
-rw-r--r--arch/arm/mach-omap2/vc.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 21ffde86ad83..e872a0369afb 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -107,11 +107,8 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm,
struct omap_vc_channel *vc = voltdm->vc;
struct omap_vdd_info *vdd = voltdm->vdd;
struct omap_volt_data *volt_data;
- const struct omap_vp_common_data *vp_common;
u32 vc_cmdval, vp_errgain_val;
- vp_common = vdd->vp_data->vp_common;
-
/* Check if sufficient pmic info is available for this vdd */
if (!voltdm->pmic) {
pr_err("%s: Insufficient pmic info to scale the vdd_%s\n",
@@ -148,12 +145,12 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm,
/* Setting vp errorgain based on the voltage */
if (volt_data) {
- vp_errgain_val = voltdm->read(vdd->vp_data->vpconfig);
+ vp_errgain_val = voltdm->read(voltdm->vp->vpconfig);
vdd->vp_rt_data.vpconfig_errorgain = volt_data->vp_errgain;
- vp_errgain_val &= ~vp_common->vpconfig_errorgain_mask;
+ vp_errgain_val &= voltdm->vp->common->vpconfig_errorgain_mask;
vp_errgain_val |= vdd->vp_rt_data.vpconfig_errorgain <<
- vp_common->vpconfig_errorgain_shift;
- voltdm->write(vp_errgain_val, vdd->vp_data->vpconfig);
+ voltdm->vp->common->vpconfig_errorgain_shift;
+ voltdm->write(vp_errgain_val, voltdm->vp->vpconfig);
}
return 0;