aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vc.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-04-04 18:25:07 -0400
committerKevin Hilman <khilman@ti.com>2011-09-15 15:09:07 -0400
commitb7ea803e55769768d1eff3b32e4f99837fa6ddb5 (patch)
treeefe5022fab4248d5f5fe33284d91b4743121115d /arch/arm/mach-omap2/vc.c
parentd7b0de2b46803062148345ae6a976c1e44a457b6 (diff)
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,
107 struct omap_vc_channel *vc = voltdm->vc; 107 struct omap_vc_channel *vc = voltdm->vc;
108 struct omap_vdd_info *vdd = voltdm->vdd; 108 struct omap_vdd_info *vdd = voltdm->vdd;
109 struct omap_volt_data *volt_data; 109 struct omap_volt_data *volt_data;
110 const struct omap_vp_common_data *vp_common;
111 u32 vc_cmdval, vp_errgain_val; 110 u32 vc_cmdval, vp_errgain_val;
112 111
113 vp_common = vdd->vp_data->vp_common;
114
115 /* Check if sufficient pmic info is available for this vdd */ 112 /* Check if sufficient pmic info is available for this vdd */
116 if (!voltdm->pmic) { 113 if (!voltdm->pmic) {
117 pr_err("%s: Insufficient pmic info to scale the vdd_%s\n", 114 pr_err("%s: Insufficient pmic info to scale the vdd_%s\n",
@@ -148,12 +145,12 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm,
148 145
149 /* Setting vp errorgain based on the voltage */ 146 /* Setting vp errorgain based on the voltage */
150 if (volt_data) { 147 if (volt_data) {
151 vp_errgain_val = voltdm->read(vdd->vp_data->vpconfig); 148 vp_errgain_val = voltdm->read(voltdm->vp->vpconfig);
152 vdd->vp_rt_data.vpconfig_errorgain = volt_data->vp_errgain; 149 vdd->vp_rt_data.vpconfig_errorgain = volt_data->vp_errgain;
153 vp_errgain_val &= ~vp_common->vpconfig_errorgain_mask; 150 vp_errgain_val &= voltdm->vp->common->vpconfig_errorgain_mask;
154 vp_errgain_val |= vdd->vp_rt_data.vpconfig_errorgain << 151 vp_errgain_val |= vdd->vp_rt_data.vpconfig_errorgain <<
155 vp_common->vpconfig_errorgain_shift; 152 voltdm->vp->common->vpconfig_errorgain_shift;
156 voltdm->write(vp_errgain_val, vdd->vp_data->vpconfig); 153 voltdm->write(vp_errgain_val, voltdm->vp->vpconfig);
157 } 154 }
158 155
159 return 0; 156 return 0;