UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage 

Use preferred voltdm_ naming for getting current nominal voltage.

No functional changes.

Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Kevin Hilman 2011-07-15 16:05:12 -07:00
parent e327788049
commit d5c128289f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
static int sr_class3_enable(struct voltagedomain *voltdm) static int sr_class3_enable(struct voltagedomain *voltdm)
{ {
unsigned long volt = omap_voltage_get_nom_volt(voltdm); unsigned long volt = voltdm_get_voltage(voltdm);
if (!volt) { if (!volt) {
pr_warning("%s: Curr voltage unknown. Cannot enable sr_%s\n", pr_warning("%s: Curr voltage unknown. Cannot enable sr_%s\n",

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

@ -45,13 +45,13 @@ static LIST_HEAD(voltdm_list);
/* Public functions */ /* Public functions */
/** /**
* omap_voltage_get_nom_volt() - Gets the current non-auto-compensated voltage * voltdm_get_voltage() - Gets the current non-auto-compensated voltage
* @voltdm: pointer to the VDD for which current voltage info is needed * @voltdm: pointer to the voltdm for which current voltage info is needed
* *
* API to get the current non-auto-compensated voltage for a VDD. * API to get the current non-auto-compensated voltage for a voltage domain.
* Returns 0 in case of error else returns the current voltage for the VDD. * Returns 0 in case of error else returns the current voltage.
*/ */
unsigned long omap_voltage_get_nom_volt(struct voltagedomain *voltdm) unsigned long voltdm_get_voltage(struct voltagedomain *voltdm)
{ {
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__);
@ -72,6 +72,8 @@ unsigned long omap_voltage_get_nom_volt(struct voltagedomain *voltdm)
int voltdm_scale(struct voltagedomain *voltdm, int voltdm_scale(struct voltagedomain *voltdm,
unsigned long target_volt) unsigned long target_volt)
{ {
int ret;
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 -EINVAL; return -EINVAL;
@ -104,7 +106,7 @@ void voltdm_reset(struct voltagedomain *voltdm)
return; return;
} }
target_volt = omap_voltage_get_nom_volt(voltdm); target_volt = voltdm_get_voltage(voltdm);
if (!target_volt) { 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);

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

@ -148,7 +148,6 @@ 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,
unsigned long volt); unsigned long volt);
unsigned long omap_voltage_get_nom_volt(struct voltagedomain *voltdm);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int omap_voltage_register_pmic(struct voltagedomain *voltdm, int omap_voltage_register_pmic(struct voltagedomain *voltdm,
struct omap_voltdm_pmic *pmic); struct omap_voltdm_pmic *pmic);
@ -183,4 +182,5 @@ int voltdm_for_each_pwrdm(struct voltagedomain *voltdm,
struct powerdomain *pwrdm)); struct powerdomain *pwrdm));
int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt); int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt);
void voltdm_reset(struct voltagedomain *voltdm); void voltdm_reset(struct voltagedomain *voltdm);
unsigned long voltdm_get_voltage(struct voltagedomain *voltdm);
#endif #endif