Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...

[~andy/linux] / arch / arm / mach-omap2 / vc.c

diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index d9e69944f0c9919d3a3839f387fb4ae97c70c2de..031d116fbf103fff322a4e13bb16ae4221b28d02 100644 (file)
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -94,7 +94,7 @@ static int omap_vc_config_channel(struct voltagedomain *voltdm)
 
        voltdm->rmw(CFG_CHANNEL_MASK << vc->cfg_channel_sa_shift,
                    vc->cfg_channel << vc->cfg_channel_sa_shift,
-                   vc->common->cfg_channel_reg);
+                   vc->cfg_channel_reg);
 
        return 0;
 }
@@ -152,8 +152,6 @@ void omap_vc_post_scale(struct voltagedomain *voltdm,
        smps_delay = ((smps_steps * voltdm->pmic->step_size) /
                        voltdm->pmic->slew_rate) + 2;
        udelay(smps_delay);
-
-       voltdm->nominal_volt = target_volt;
 }
 
 /* vc_bypass_scale - VC bypass method of voltage scaling */
@@ -321,7 +319,7 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm)
        /* Configure the i2c slave address for this VC */
        voltdm->rmw(vc->smps_sa_mask,
                    vc->i2c_slave_addr << __ffs(vc->smps_sa_mask),
-                   vc->common->smps_sa_reg);
+                   vc->smps_sa_reg);
        vc->cfg_channel |= vc_cfg_bits->sa;
 
        /*
@@ -329,13 +327,13 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm)
         */
        voltdm->rmw(vc->smps_volra_mask,
                    vc->volt_reg_addr << __ffs(vc->smps_volra_mask),
-                   vc->common->smps_volra_reg);
+                   vc->smps_volra_reg);
        vc->cfg_channel |= vc_cfg_bits->rav;
 
        if (vc->cmd_reg_addr) {
                voltdm->rmw(vc->smps_cmdra_mask,
                            vc->cmd_reg_addr << __ffs(vc->smps_cmdra_mask),
-                           vc->common->smps_cmdra_reg);
+                           vc->smps_cmdra_reg);
                vc->cfg_channel |= vc_cfg_bits->rac | vc_cfg_bits->racen;
        }