Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 5e5651be29d8bd08d0cc2bc617c43acff95e2229

Authored by Kevin Hilman
1 parent b666b4767d
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

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>

Showing 4 changed files with 18 additions and 20 deletions Side-by-side Diff

arch/arm/mach-omap2/pm.c
Diff comments   View file @ 5e5651b
... ... @@ -212,7 +212,7 @@
212 212 goto exit;
213 213 }
214 214  
215   - omap_voltage_scale_vdd(voltdm, bootup_volt);
  215 + voltdm_scale(voltdm, bootup_volt);
216 216 return 0;
217 217  
218 218 exit:
arch/arm/mach-omap2/smartreflex-class3.c
Diff comments   View file @ 5e5651b
... ... @@ -32,7 +32,7 @@
32 32 omap_vp_disable(voltdm);
33 33 sr_disable(voltdm);
34 34 if (is_volt_reset)
35   - omap_voltage_reset(voltdm);
  35 + voltdm_reset(voltdm);
36 36  
37 37 return 0;
38 38 }
arch/arm/mach-omap2/voltage.c
Diff comments   View file @ 5e5651b
... ... @@ -94,16 +94,15 @@
94 94 }
95 95  
96 96 /**
97   - * omap_voltage_scale_vdd() - API to scale voltage of a particular
98   - * voltage domain.
99   - * @voltdm: pointer to the VDD which is to be scaled.
100   - * @target_volt: The target voltage of the voltage domain
  97 + * voltdm_scale() - API to scale voltage of a particular voltage domain.
  98 + * @voltdm: pointer to the voltage domain which is to be scaled.
  99 + * @target_volt: The target voltage of the voltage domain
101 100 *
102 101 * This API should be called by the kernel to do the voltage scaling
103   - * for a particular voltage domain during dvfs or any other situation.
  102 + * for a particular voltage domain during DVFS.
104 103 */
105   -int omap_voltage_scale_vdd(struct voltagedomain *voltdm,
106   - unsigned long target_volt)
  104 +int voltdm_scale(struct voltagedomain *voltdm,
  105 + unsigned long target_volt)
107 106 {
108 107 if (!voltdm || IS_ERR(voltdm)) {
109 108 pr_warning("%s: VDD specified does not exist!\n", __func__);
110 109  
111 110  
112 111  
113 112  
... ... @@ -120,31 +119,31 @@
120 119 }
121 120  
122 121 /**
123   - * omap_voltage_reset() - Resets the voltage of a particular voltage domain
124   - * to that of the current OPP.
125   - * @voltdm: pointer to the VDD whose voltage is to be reset.
  122 + * voltdm_reset() - Resets the voltage of a particular voltage domain
  123 + * to that of the current OPP.
  124 + * @voltdm: pointer to the voltage domain whose voltage is to be reset.
126 125 *
127 126 * This API finds out the correct voltage the voltage domain is supposed
128 127 * to be at and resets the voltage to that level. Should be used especially
129 128 * while disabling any voltage compensation modules.
130 129 */
131   -void omap_voltage_reset(struct voltagedomain *voltdm)
  130 +void voltdm_reset(struct voltagedomain *voltdm)
132 131 {
133   - unsigned long target_uvdc;
  132 + unsigned long target_volt;
134 133  
135 134 if (!voltdm || IS_ERR(voltdm)) {
136 135 pr_warning("%s: VDD specified does not exist!\n", __func__);
137 136 return;
138 137 }
139 138  
140   - target_uvdc = omap_voltage_get_nom_volt(voltdm);
141   - if (!target_uvdc) {
  139 + target_volt = omap_voltage_get_nom_volt(voltdm);
  140 + if (!target_volt) {
142 141 pr_err("%s: unable to find current voltage for vdd_%s\n",
143 142 __func__, voltdm->name);
144 143 return;
145 144 }
146 145  
147   - omap_voltage_scale_vdd(voltdm, target_uvdc);
  146 + voltdm_scale(voltdm, target_volt);
148 147 }
149 148  
150 149 /**
arch/arm/mach-omap2/voltage.h
Diff comments   View file @ 5e5651b
... ... @@ -155,9 +155,6 @@
155 155 u32 curr_volt;
156 156 };
157 157  
158   -int omap_voltage_scale_vdd(struct voltagedomain *voltdm,
159   - unsigned long target_volt);
160   -void omap_voltage_reset(struct voltagedomain *voltdm);
161 158 void omap_voltage_get_volttable(struct voltagedomain *voltdm,
162 159 struct omap_volt_data **volt_data);
163 160 struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,
... ... @@ -195,5 +192,7 @@
195 192 int voltdm_for_each_pwrdm(struct voltagedomain *voltdm,
196 193 int (*fn)(struct voltagedomain *voltdm,
197 194 struct powerdomain *pwrdm));
  195 +int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt);
  196 +void voltdm_reset(struct voltagedomain *voltdm);
198 197 #endif