diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-03-22 16:14:57 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-09-15 11:39:10 -0700 |
| commit | d84adcf46b9c235d1f4975b72a8c2763dbfb0081 (patch) | |
| tree | 76f5d8877a3c99540267fc9fb63cae7e63f61236 /arch/arm/mach-omap2/voltage.c | |
| parent | ccd5ca7787df8f1bd267b90f03a09c31c160ffe2 (diff) | |
OMAP2+: voltage: move VC into struct voltagedomain, misc. renames
Move the VC instance struct from omap_vdd_info into struct voltagedomain.
While moving, perform some misc. renames for readability.
No functional changes.
Summary of renames:
- rename omap_vc_instance to omap_vc_channel, since there is only
one instance of the VC IP and this actually represents channels
using TRM terminology.
- rename 'vc_common' field of VC channel which led to:
s/vc->vc_common/vc->common/
- remove redundant '_data' suffix
- OMAP3: vc1 --> vc_mpu, vc2 --> vc_core
- omap_vc_bypass_scale_voltage() -> omap_vc_bypass_scale()
Signed-off-by: Kevin Hilman <khilman@ti.com>
merge
Diffstat (limited to 'arch/arm/mach-omap2/voltage.c')
| -rw-r--r-- | arch/arm/mach-omap2/voltage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index 6ba6e493c757..c6352e3230b7 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -769,7 +769,7 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm, vdd->volt_scale = vp_forceupdate_scale_voltage; return; case VOLTSCALE_VCBYPASS: - vdd->volt_scale = omap_vc_bypass_scale_voltage; + vdd->volt_scale = omap_vc_bypass_scale; return; default: pr_warning("%s: Trying to change the method of voltage scaling" @@ -802,10 +802,12 @@ int __init omap_voltage_late_init(void) if (!voltdm->scalable) continue; + if (voltdm->vc) + omap_vc_init_channel(voltdm); + if (voltdm->vdd) { if (omap_vdd_data_configure(voltdm)) continue; - omap_vc_init_channel(voltdm); vp_init(voltdm); vdd_debugfs_init(voltdm); } |