OMAP2+: VC: more registers are per-channel starting with OMAP5

Starting with OMAP5, the following registers are per-channel and not
common to a all VC channels:

 - SMPS I2C slave address
 - SMPS voltage register address offset
 - SMPS cmd/value register address offset
 - VC channel configuration register

Move these from the channel-common struct into the per-channel struct
to support OMAP5.

Signed-off-by: Kevin Hilman <khilman@ti.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 6e586767a904..031d116fbf10 100644
--- 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;
 }
@@ -319,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;
 
         /*
@@ -327,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;
         }