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

OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix

Browse Source 
Rename voltage scaling related functions to use voltdm_ prefix intead
of omap_voltage_, and cleanup kerneldoc comments in the process.

s/omap_voltage_scale_vdd/voltdm_scale/
s/omap_voltage_reset/voltdm_reset/

Also, in voltdm_reset() s/target_uvdc/target_volt/ to be consistent with
naming throughout the file.

No functional changes.

Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Kevin Hilman
2011-04-05 16:27:21 -07:00
parent b666b4767d
commit 5e5651be29
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/pm.c
View File

@@ -212,7 +212,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,
goto exit; goto exit;
} }
omap_voltage_scale_vdd(voltdm, bootup_volt); voltdm_scale(voltdm, bootup_volt);
return 0; return 0;
exit: exit:

2
arch/arm/mach-omap2/smartreflex-class3.c
View File

@@ -32,7 +32,7 @@ static int sr_class3_disable(struct voltagedomain *voltdm, int is_volt_reset)
omap_vp_disable(voltdm); omap_vp_disable(voltdm);
sr_disable(voltdm); sr_disable(voltdm);
if (is_volt_reset) if (is_volt_reset)
omap_voltage_reset(voltdm); voltdm_reset(voltdm);
return 0; return 0;
} }

29
arch/arm/mach-omap2/voltage.c
View File

@@ -94,16 +94,15 @@ unsigned long omap_voltage_get_nom_volt(struct voltagedomain *voltdm)
} }
/** /**
* omap_voltage_scale_vdd() - API to scale voltage of a particular * voltdm_scale() - API to scale voltage of a particular voltage domain.
* voltage domain. * @voltdm: pointer to the voltage domain which is to be scaled.
* @voltdm: pointer to the VDD which is to be scaled. * @target_volt: The target voltage of the voltage domain
* @target_volt: The target voltage of the voltage domain
* *
* This API should be called by the kernel to do the voltage scaling * This API should be called by the kernel to do the voltage scaling
* for a particular voltage domain during dvfs or any other situation. * for a particular voltage domain during DVFS.
*/ */
int omap_voltage_scale_vdd(struct voltagedomain *voltdm, int voltdm_scale(struct voltagedomain *voltdm,
unsigned long target_volt) unsigned long target_volt)
{ {
if (!voltdm || IS_ERR(voltdm)) { if (!voltdm || IS_ERR(voltdm)) {
pr_warning("%s: VDD specified does not exist!\n", __func__); pr_warning("%s: VDD specified does not exist!\n", __func__);
@@ -120,31 +119,31 @@ int omap_voltage_scale_vdd(struct voltagedomain *voltdm,
} }
/** /**
* omap_voltage_reset() - Resets the voltage of a particular voltage domain * voltdm_reset() - Resets the voltage of a particular voltage domain
* to that of the current OPP. * to that of the current OPP.
* @voltdm: pointer to the VDD whose voltage is to be reset. * @voltdm: pointer to the voltage domain whose voltage is to be reset.
* *
* This API finds out the correct voltage the voltage domain is supposed * This API finds out the correct voltage the voltage domain is supposed
* to be at and resets the voltage to that level. Should be used especially * to be at and resets the voltage to that level. Should be used especially
* while disabling any voltage compensation modules. * while disabling any voltage compensation modules.
*/ */
void omap_voltage_reset(struct voltagedomain *voltdm) void voltdm_reset(struct voltagedomain *voltdm)
{ {
unsigned long target_uvdc; unsigned long target_volt;
if (!voltdm || IS_ERR(voltdm)) { if (!voltdm || IS_ERR(voltdm)) {
pr_warning("%s: VDD specified does not exist!\n", __func__); pr_warning("%s: VDD specified does not exist!\n", __func__);
return; return;
} }
target_uvdc = omap_voltage_get_nom_volt(voltdm); target_volt = omap_voltage_get_nom_volt(voltdm);
if (!target_uvdc) { if (!target_volt) {
pr_err("%s: unable to find current voltage for vdd_%s\n", pr_err("%s: unable to find current voltage for vdd_%s\n",
__func__, voltdm->name); __func__, voltdm->name);
return; return;
} }
omap_voltage_scale_vdd(voltdm, target_uvdc); voltdm_scale(voltdm, target_volt);
} }
/** /**

5
arch/arm/mach-omap2/voltage.h
View File

@@ -155,9 +155,6 @@ struct omap_vdd_info {
u32 curr_volt; u32 curr_volt;
}; };
int omap_voltage_scale_vdd(struct voltagedomain *voltdm,
unsigned long target_volt);
void omap_voltage_reset(struct voltagedomain *voltdm);
void omap_voltage_get_volttable(struct voltagedomain *voltdm, void omap_voltage_get_volttable(struct voltagedomain *voltdm,
struct omap_volt_data **volt_data); struct omap_volt_data **volt_data);
struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm, struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,
@@ -195,4 +192,6 @@ int voltdm_for_each(int (*fn)(struct voltagedomain *voltdm, void *user),
int voltdm_for_each_pwrdm(struct voltagedomain *voltdm, int voltdm_for_each_pwrdm(struct voltagedomain *voltdm,
int (*fn)(struct voltagedomain *voltdm, int (*fn)(struct voltagedomain *voltdm,
struct powerdomain *pwrdm)); struct powerdomain *pwrdm));
int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt);
void voltdm_reset(struct voltagedomain *voltdm);
#endif #endif