OMAP2+: voltage: move VC into struct voltagedomain, misc. renames

[mv-sheeva.git] / arch / arm / mach-omap2 / voltage.c

diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index 6ba6e493c757dc2b6a9981884060ddf017edcd48..c6352e3230b7a942c090c7ffb69d050b1c3e48d6 100644 (file)
--- 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);
                }