lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OMAP3+: VP: cleanup: move VP instance into voltdm, misc. renames

Browse Source 
- 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>
This commit is contained in:
Kevin Hilman
2011-04-04 15:25:07 -07:00
parent d7b0de2b46
commit b7ea803e55
9 changed files with 84 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-omap2/vc.c
View File

@@ -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;