12 files changed, 79 insertions, 111 deletions

diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 1bdbe7c1561..f1c73cbe3cb 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -46,7 +46,7 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm,
                 return -ENODATA;
         }
 
-        if (!vdd->read_reg || !vdd->write_reg) {
+        if (!voltdm->read || !voltdm->write) {
                 pr_err("%s: No read/write API for accessing vdd_%s regs\n",
                         __func__, voltdm->name);
                 return -EINVAL;
@@ -58,24 +58,22 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm,
                 volt_data = NULL;
 
         *target_vsel = vdd->pmic_info->uv_to_vsel(target_volt);
-        *current_vsel = vdd->read_reg(vdd->vp_data->vp_common->prm_mod, vdd->vp_data->voltage);
+        *current_vsel = voltdm->read(vdd->vp_data->voltage);
 
         /* Setting the ON voltage to the new target voltage */
-        vc_cmdval = vdd->read_reg(vc->common->prm_mod, vc->cmdval_reg);
+        vc_cmdval = voltdm->read(vc->cmdval_reg);
         vc_cmdval &= ~vc->common->cmd_on_mask;
         vc_cmdval |= (*target_vsel << vc->common->cmd_on_shift);
-        vdd->write_reg(vc_cmdval, vc->common->prm_mod, vc->cmdval_reg);
+        voltdm->write(vc_cmdval, vc->cmdval_reg);
 
         /* Setting vp errorgain based on the voltage */
         if (volt_data) {
-                vp_errgain_val = vdd->read_reg(vdd->vp_data->vp_common->prm_mod,
-                                               vdd->vp_data->vpconfig);
+                vp_errgain_val = voltdm->read(vdd->vp_data->vpconfig);
                 vdd->vp_rt_data.vpconfig_errorgain = volt_data->vp_errgain;
                 vp_errgain_val &= ~vp_common->vpconfig_errorgain_mask;
                 vp_errgain_val |= vdd->vp_rt_data.vpconfig_errorgain <<
                         vp_common->vpconfig_errorgain_shift;
-                vdd->write_reg(vp_errgain_val, vdd->vp_data->vp_common->prm_mod,
-                               vdd->vp_data->vpconfig);
+                voltdm->write(vp_errgain_val, vdd->vp_data->vpconfig);
         }
 
         return 0;
@@ -120,11 +118,10 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm,
                         (vdd->pmic_info->i2c_slave_addr <<
                         vc->common->slaveaddr_shift);
 
-        vdd->write_reg(vc_bypass_value, vc->common->prm_mod, vc_bypass_val_reg);
-        vdd->write_reg(vc_bypass_value | vc_valid, vc->common->prm_mod,
-                       vc_bypass_val_reg);
+        voltdm->write(vc_bypass_value, vc_bypass_val_reg);
+        voltdm->write(vc_bypass_value | vc_valid, vc_bypass_val_reg);
 
-        vc_bypass_value = vdd->read_reg(vc->common->prm_mod, vc_bypass_val_reg);
+        vc_bypass_value = voltdm->read(vc_bypass_val_reg);
         /*
          * Loop till the bypass command is acknowledged from the SMPS.
          * NOTE: This is legacy code. The loop count and retry count needs
@@ -143,8 +140,7 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm,
                         loop_cnt = 0;
                         udelay(10);
                 }
-                vc_bypass_value = vdd->read_reg(vc->common->prm_mod,
-                                                vc_bypass_val_reg);
+                vc_bypass_value = voltdm->read(vc_bypass_val_reg);
         }
 
         omap_vc_post_scale(voltdm, target_volt, target_vsel, current_vsel);
@@ -153,18 +149,13 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm,
 
 static void __init omap3_vfsm_init(struct voltagedomain *voltdm)
 {
-        struct omap_vc_channel *vc = voltdm->vc;
-        struct omap_vdd_info *vdd = voltdm->vdd;
-
         /*
          * Voltage Manager FSM parameters init
          * XXX This data should be passed in from the board file
          */
-        vdd->write_reg(OMAP3_CLKSETUP, vc->common->prm_mod, OMAP3_PRM_CLKSETUP_OFFSET);
-        vdd->write_reg(OMAP3_VOLTOFFSET, vc->common->prm_mod,
-                       OMAP3_PRM_VOLTOFFSET_OFFSET);
-        vdd->write_reg(OMAP3_VOLTSETUP2, vc->common->prm_mod,
-                       OMAP3_PRM_VOLTSETUP2_OFFSET);
+        voltdm->write(OMAP3_CLKSETUP, OMAP3_PRM_CLKSETUP_OFFSET);
+        voltdm->write(OMAP3_VOLTOFFSET, OMAP3_PRM_VOLTOFFSET_OFFSET);
+        voltdm->write(OMAP3_VOLTSETUP2, OMAP3_PRM_VOLTSETUP2_OFFSET);
 }
 
 static void __init omap3_vc_init_channel(struct voltagedomain *voltdm)
@@ -187,16 +178,16 @@ static void __init omap3_vc_init_channel(struct voltagedomain *voltdm)
                 (onlp_vsel << vc->common->cmd_onlp_shift) |
                 (ret_vsel << vc->common->cmd_ret_shift) |
                 (off_vsel << vc->common->cmd_off_shift));
-        vdd->write_reg(vc_val, vc->common->prm_mod, vc->cmdval_reg);
+        voltdm->write(vc_val, vc->cmdval_reg);
 
         /*
          * Generic VC parameters init
          * XXX This data should be abstracted out
          */
-        vdd->write_reg(OMAP3430_CMD1_MASK | OMAP3430_RAV1_MASK, vc->common->prm_mod,
-                        OMAP3_PRM_VC_CH_CONF_OFFSET);
-        vdd->write_reg(OMAP3430_MCODE_SHIFT | OMAP3430_HSEN_MASK, vc->common->prm_mod,
-                        OMAP3_PRM_VC_I2C_CFG_OFFSET);
+        voltdm->write(OMAP3430_CMD1_MASK | OMAP3430_RAV1_MASK,
+                       OMAP3_PRM_VC_CH_CONF_OFFSET);
+        voltdm->write(OMAP3430_MCODE_SHIFT | OMAP3430_HSEN_MASK,
+                       OMAP3_PRM_VC_I2C_CFG_OFFSET);
 
         omap3_vfsm_init(voltdm);
 
@@ -207,8 +198,6 @@ static void __init omap3_vc_init_channel(struct voltagedomain *voltdm)
 /* OMAP4 specific voltage init functions */
 static void __init omap4_vc_init_channel(struct voltagedomain *voltdm)
 {
-        struct omap_vc_channel *vc = voltdm->vc;
-        struct omap_vdd_info *vdd = voltdm->vdd;
         static bool is_initialized;
         u32 vc_val;
 
@@ -224,11 +213,11 @@ static void __init omap4_vc_init_channel(struct voltagedomain *voltdm)
         vc_val = (OMAP4430_RAV_VDD_MPU_L_MASK | OMAP4430_CMD_VDD_MPU_L_MASK |
                   OMAP4430_RAV_VDD_IVA_L_MASK | OMAP4430_CMD_VDD_IVA_L_MASK |
                   OMAP4430_RAV_VDD_CORE_L_MASK | OMAP4430_CMD_VDD_CORE_L_MASK);
-        vdd->write_reg(vc_val, vc->common->prm_mod, OMAP4_PRM_VC_CFG_CHANNEL_OFFSET);
+        voltdm->write(vc_val, OMAP4_PRM_VC_CFG_CHANNEL_OFFSET);
 
         /* XXX These are magic numbers and do not belong! */
         vc_val = (0x60 << OMAP4430_SCLL_SHIFT | 0x26 << OMAP4430_SCLH_SHIFT);
-        vdd->write_reg(vc_val, vc->common->prm_mod, OMAP4_PRM_VC_CFG_I2C_CLK_OFFSET);
+        voltdm->write(vc_val, OMAP4_PRM_VC_CFG_I2C_CLK_OFFSET);
 
         is_initialized = true;
 }
@@ -246,34 +235,30 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm)
                 return;
         }
 
-        if (!vdd->read_reg || !vdd->write_reg) {
+        if (!voltdm->read || !voltdm->write) {
                 pr_err("%s: No read/write API for accessing vdd_%s regs\n",
                         __func__, voltdm->name);
                 return;
         }
 
         /* Set up the SMPS_SA(i2c slave address in VC */
-        vc_val = vdd->read_reg(vc->common->prm_mod,
-                               vc->common->smps_sa_reg);
+        vc_val = voltdm->read(vc->common->smps_sa_reg);
         vc_val &= ~vc->smps_sa_mask;
         vc_val |= vdd->pmic_info->i2c_slave_addr << vc->smps_sa_shift;
-        vdd->write_reg(vc_val, vc->common->prm_mod,
-                       vc->common->smps_sa_reg);
+        voltdm->write(vc_val, vc->common->smps_sa_reg);
 
         /* Setup the VOLRA(pmic reg addr) in VC */
-        vc_val = vdd->read_reg(vc->common->prm_mod,
-                               vc->common->smps_volra_reg);
+        vc_val = voltdm->read(vc->common->smps_volra_reg);
         vc_val &= ~vc->smps_volra_mask;
         vc_val |= vdd->pmic_info->volt_reg_addr << vc->smps_volra_shift;
-        vdd->write_reg(vc_val, vc->common->prm_mod,
-                       vc->common->smps_volra_reg);
+        voltdm->write(vc_val, vc->common->smps_volra_reg);
 
         /* Configure the setup times */
-        vc_val = vdd->read_reg(vc->common->prm_mod, vdd->vfsm->voltsetup_reg);
+        vc_val = voltdm->read(vdd->vfsm->voltsetup_reg);
         vc_val &= ~vdd->vfsm->voltsetup_mask;
         vc_val |= vdd->pmic_info->volt_setup_time <<
                         vdd->vfsm->voltsetup_shift;
-        vdd->write_reg(vc_val, vc->common->prm_mod, vdd->vfsm->voltsetup_reg);
+        voltdm->write(vc_val, vdd->vfsm->voltsetup_reg);
 
         if (cpu_is_omap34xx())
                 omap3_vc_init_channel(voltdm);
diff --git a/arch/arm/mach-omap2/vc.h b/arch/arm/mach-omap2/vc.h
index 51d36a80b13..d0050f0ee6d 100644
--- a/arch/arm/mach-omap2/vc.h
+++ b/arch/arm/mach-omap2/vc.h
@@ -25,7 +25,6 @@ struct voltagedomain;
  * struct omap_vc_common - per-VC register/bitfield data
  * @cmd_on_mask: ON bitmask in PRM_VC_CMD_VAL* register
  * @valid: VALID bitmask in PRM_VC_BYPASS_VAL register
- * @prm_mod: PRM module id used for PRM register access
  * @smps_sa_reg: Offset of PRM_VC_SMPS_SA reg from PRM start
  * @smps_volra_reg: Offset of PRM_VC_SMPS_VOL_RA reg from PRM start
  * @bypass_val_reg: Offset of PRM_VC_BYPASS_VAL reg from PRM start
@@ -43,7 +42,6 @@ struct voltagedomain;
 struct omap_vc_common {
         u32 cmd_on_mask;
         u32 valid;
-        s16 prm_mod;
         u8 smps_sa_reg;
         u8 smps_volra_reg;
         u8 bypass_val_reg;
diff --git a/arch/arm/mach-omap2/vc3xxx_data.c b/arch/arm/mach-omap2/vc3xxx_data.c
index 1a17ed459cc..6b672030134 100644
--- a/arch/arm/mach-omap2/vc3xxx_data.c
+++ b/arch/arm/mach-omap2/vc3xxx_data.c
@@ -30,7 +30,6 @@
  * XXX This stuff presumably belongs in the vc3xxx.c or vc.c file.
  */
 static struct omap_vc_common omap3_vc_common = {
-        .prm_mod         = OMAP3430_GR_MOD,
         .smps_sa_reg     = OMAP3_PRM_VC_SMPS_SA_OFFSET,
         .smps_volra_reg  = OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET,
         .bypass_val_reg  = OMAP3_PRM_VC_BYPASS_VAL_OFFSET,
diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c
index 56f3f4a3787..e3125a370fa 100644
--- a/arch/arm/mach-omap2/vc44xx_data.c
+++ b/arch/arm/mach-omap2/vc44xx_data.c
@@ -31,7 +31,6 @@
  * XXX This stuff presumably belongs in the vc3xxx.c or vc.c file.
  */
 static const struct omap_vc_common omap4_vc_common = {
-        .prm_mod = OMAP4430_PRM_DEVICE_INST,
         .smps_sa_reg = OMAP4_PRM_VC_SMPS_SA_OFFSET,
         .smps_volra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_VOL_OFFSET,
         .bypass_val_reg = OMAP4_PRM_VC_VAL_BYPASS_OFFSET,
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index 9b9f01973d1..9f9f01465f6 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -46,27 +46,6 @@ static LIST_HEAD(voltdm_list);
 #define VOLTAGE_DIR_SIZE        16
 static struct dentry *voltage_dir;
 
-static u32 omap3_voltage_read_reg(u16 mod, u8 offset)
-{
-        return omap2_prm_read_mod_reg(mod, offset);
-}
-
-static void omap3_voltage_write_reg(u32 val, u16 mod, u8 offset)
-{
-        omap2_prm_write_mod_reg(val, mod, offset);
-}
-
-static u32 omap4_voltage_read_reg(u16 mod, u8 offset)
-{
-        return omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
-                                        mod, offset);
-}
-
-static void omap4_voltage_write_reg(u32 val, u16 mod, u8 offset)
-{
-        omap4_prminst_write_inst_reg(val, OMAP4430_PRM_PARTITION, mod, offset);
-}
-
 static int __init _config_common_vdd_data(struct voltagedomain *voltdm)
 {
         char *sys_ck_name;
@@ -183,15 +162,7 @@ static int __init omap_vdd_data_configure(struct voltagedomain *voltdm)
         if (IS_ERR_VALUE(_config_common_vdd_data(voltdm)))
                 goto ovdc_out;
 
-        if (cpu_is_omap34xx()) {
-                vdd->read_reg = omap3_voltage_read_reg;
-                vdd->write_reg = omap3_voltage_write_reg;
-                ret = 0;
-        } else if (cpu_is_omap44xx()) {
-                vdd->read_reg = omap4_voltage_read_reg;
-                vdd->write_reg = omap4_voltage_write_reg;
-                ret = 0;
-        }
+        ret = 0;
 
 ovdc_out:
         return ret;
diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h
index 04e06266dbd..6a19cf39118 100644
--- a/arch/arm/mach-omap2/voltage.h
+++ b/arch/arm/mach-omap2/voltage.h
@@ -59,6 +59,9 @@ struct omap_vfsm_instance_data {
  * @node: list_head linking all voltage domains
  * @pwrdm_list: list_head linking all powerdomains in this voltagedomain
  * @vc: pointer to VC channel associated with this voltagedomain
+ * @read: read a VC/VP register
+ * @write: write a VC/VP register
+ * @read: read-modify-write a VC/VP register
  * @vdd: to be removed
  */
 struct voltagedomain {
@@ -68,6 +71,11 @@ struct voltagedomain {
         struct list_head pwrdm_list;
         struct omap_vc_channel *vc;
 
+        /* VC/VP register access functions: SoC specific */
+        u32 (*read) (u8 offset);
+        void (*write) (u32 val, u8 offset);
+        u32 (*rmw)(u32 mask, u32 bits, u8 offset);
+
         struct omap_vdd_info *vdd;
 };
 
@@ -146,8 +154,6 @@ struct omap_vdd_info {
         u32 curr_volt;
         bool vp_enabled;
 
-        u32 (*read_reg) (u16 mod, u8 offset);
-        void (*write_reg) (u32 val, u16 mod, u8 offset);
         int (*volt_scale) (struct voltagedomain *voltdm,
                 unsigned long target_volt);
 };
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index ad8f05b6a88..1d667490bc9 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -56,6 +56,9 @@ static struct omap_vdd_info omap3_vdd2_info = {
 static struct voltagedomain omap3_voltdm_mpu = {
         .name = "mpu_iva",
         .scalable = true,
+        .read = omap3_prm_vcvp_read,
+        .write = omap3_prm_vcvp_write,
+        .rmw = omap3_prm_vcvp_rmw,
         .vc = &omap3_vc_mpu,
         .vdd = &omap3_vdd1_info,
 };
@@ -63,6 +66,9 @@ static struct voltagedomain omap3_voltdm_mpu = {
 static struct voltagedomain omap3_voltdm_core = {
         .name = "core",
         .scalable = true,
+        .read = omap3_prm_vcvp_read,
+        .write = omap3_prm_vcvp_write,
+        .rmw = omap3_prm_vcvp_rmw,
         .vc = &omap3_vc_core,
         .vdd = &omap3_vdd2_info,
 };
diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c
index 43e1d381724..e435795d61b 100644
--- a/arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
@@ -62,6 +62,9 @@ static struct omap_vdd_info omap4_vdd_core_info = {
 static struct voltagedomain omap4_voltdm_mpu = {
         .name = "mpu",
         .scalable = true,
+        .read = omap4_prm_vcvp_read,
+        .write = omap4_prm_vcvp_write,
+        .rmw = omap4_prm_vcvp_rmw,
         .vc = &omap4_vc_mpu,
         .vdd = &omap4_vdd_mpu_info,
 };
@@ -69,6 +72,9 @@ static struct voltagedomain omap4_voltdm_mpu = {
 static struct voltagedomain omap4_voltdm_iva = {
         .name = "iva",
         .scalable = true,
+        .read = omap4_prm_vcvp_read,
+        .write = omap4_prm_vcvp_write,
+        .rmw = omap4_prm_vcvp_rmw,
         .vc = &omap4_vc_iva,
         .vdd = &omap4_vdd_iva_info,
 };
@@ -76,6 +82,9 @@ static struct voltagedomain omap4_voltdm_iva = {
 static struct voltagedomain omap4_voltdm_core = {
         .name = "core",
         .scalable = true,
+        .read = omap4_prm_vcvp_read,
+        .write = omap4_prm_vcvp_write,
+        .rmw = omap4_prm_vcvp_rmw,
         .vc = &omap4_vc_core,
         .vdd = &omap4_vdd_core_info,
 };
diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c
index 113c839f6e2..88ac742a38c 100644
--- a/arch/arm/mach-omap2/vp.c
+++ b/arch/arm/mach-omap2/vp.c
@@ -35,19 +35,19 @@ static void vp_latch_vsel(struct voltagedomain *voltdm)
 
         vsel = vdd->pmic_info->uv_to_vsel(uvdc);
 
-        vpconfig = vdd->read_reg(vp->vp_common->prm_mod, vp->vpconfig);
+        vpconfig = voltdm->read(vp->vpconfig);
         vpconfig &= ~(vp->vp_common->vpconfig_initvoltage_mask |
                         vp->vp_common->vpconfig_initvdd);
         vpconfig |= vsel << vp->vp_common->vpconfig_initvoltage_shift;
 
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
 
         /* Trigger initVDD value copy to voltage processor */
-        vdd->write_reg((vpconfig | vp->vp_common->vpconfig_initvdd),
-                       vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write((vpconfig | vp->vp_common->vpconfig_initvdd),
+                       vp->vpconfig);
 
         /* Clear initVDD copy trigger bit */
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
 }
 
 /* Generic voltage init functions */
@@ -57,7 +57,7 @@ void __init omap_vp_init(struct voltagedomain *voltdm)
         struct omap_vdd_info *vdd = voltdm->vdd;
         u32 vp_val;
 
-        if (!vdd->read_reg || !vdd->write_reg) {
+        if (!voltdm->read || !voltdm->write) {
                 pr_err("%s: No read/write API for accessing vdd_%s regs\n",
                         __func__, voltdm->name);
                 return;
@@ -67,19 +67,19 @@ void __init omap_vp_init(struct voltagedomain *voltdm)
                 (vdd->vp_rt_data.vpconfig_errorgain <<
                 vp->vp_common->vpconfig_errorgain_shift) |
                 vp->vp_common->vpconfig_timeouten;
-        vdd->write_reg(vp_val, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vp_val, vp->vpconfig);
 
         vp_val = ((vdd->vp_rt_data.vstepmin_smpswaittimemin <<
                 vp->vp_common->vstepmin_smpswaittimemin_shift) |
                 (vdd->vp_rt_data.vstepmin_stepmin <<
                 vp->vp_common->vstepmin_stepmin_shift));
-        vdd->write_reg(vp_val, vp->vp_common->prm_mod, vp->vstepmin);
+        voltdm->write(vp_val, vp->vstepmin);
 
         vp_val = ((vdd->vp_rt_data.vstepmax_smpswaittimemax <<
                 vp->vp_common->vstepmax_smpswaittimemax_shift) |
                 (vdd->vp_rt_data.vstepmax_stepmax <<
                 vp->vp_common->vstepmax_stepmax_shift));
-        vdd->write_reg(vp_val, vp->vp_common->prm_mod, vp->vstepmax);
+        voltdm->write(vp_val, vp->vstepmax);
 
         vp_val = ((vdd->vp_rt_data.vlimitto_vddmax <<
                 vp->vp_common->vlimitto_vddmax_shift) |
@@ -87,7 +87,7 @@ void __init omap_vp_init(struct voltagedomain *voltdm)
                 vp->vp_common->vlimitto_vddmin_shift) |
                 (vdd->vp_rt_data.vlimitto_timeout <<
                 vp->vp_common->vlimitto_timeout_shift));
-        vdd->write_reg(vp_val, vp->vp_common->prm_mod, vp->vlimitto);
+        voltdm->write(vp_val, vp->vlimitto);
 
         vp_debugfs_init(voltdm);
 }
@@ -97,7 +97,6 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
                               unsigned long target_volt)
 {
         struct omap_vp_instance_data *vp = voltdm->vdd->vp_data;
-        struct omap_vdd_info *vdd = voltdm->vdd;
         u32 vpconfig;
         u8 target_vsel, current_vsel;
         int ret, timeout = 0;
@@ -123,21 +122,21 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
         }
 
         /* Configure for VP-Force Update */
-        vpconfig = vdd->read_reg(vp->vp_common->prm_mod, vp->vpconfig);
+        vpconfig = voltdm->read(vp->vpconfig);
         vpconfig &= ~(vp->vp_common->vpconfig_initvdd |
                         vp->vp_common->vpconfig_forceupdate |
                         vp->vp_common->vpconfig_initvoltage_mask);
         vpconfig |= ((target_vsel <<
                         vp->vp_common->vpconfig_initvoltage_shift));
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
 
         /* Trigger initVDD value copy to voltage processor */
         vpconfig |= vp->vp_common->vpconfig_initvdd;
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
 
         /* Force update of voltage */
         vpconfig |= vp->vp_common->vpconfig_forceupdate;
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
 
         /*
          * Wait for TransactionDone. Typical latency is <200us.
@@ -170,13 +169,13 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
                         "to clear the TRANXDONE status\n",
                         __func__, voltdm->name);
 
-        vpconfig = vdd->read_reg(vp->vp_common->prm_mod, vp->vpconfig);
+        vpconfig = voltdm->read(vp->vpconfig);
         /* Clear initVDD copy trigger bit */
         vpconfig &= ~vp->vp_common->vpconfig_initvdd;
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
         /* Clear force bit */
         vpconfig &= ~vp->vp_common->vpconfig_forceupdate;
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
 
         return 0;
 }
@@ -199,13 +198,13 @@ unsigned long omap_vp_get_curr_volt(struct voltagedomain *voltdm)
         }
 
         vdd = voltdm->vdd;
-        if (!vdd->read_reg) {
+        if (!voltdm->read) {
                 pr_err("%s: No read API for reading vdd_%s regs\n",
                         __func__, voltdm->name);
                 return 0;
         }
 
-        curr_vsel = vdd->read_reg(vp->vp_common->prm_mod, vp->voltage);
+        curr_vsel = voltdm->read(vp->voltage);
 
         if (!vdd->pmic_info || !vdd->pmic_info->vsel_to_uv) {
                 pr_warning("%s: PMIC function to convert vsel to voltage"
@@ -236,7 +235,7 @@ void omap_vp_enable(struct voltagedomain *voltdm)
 
         vdd = voltdm->vdd;
         vp = voltdm->vdd->vp_data;
-        if (!vdd->read_reg || !vdd->write_reg) {
+        if (!voltdm->read || !voltdm->write) {
                 pr_err("%s: No read/write API for accessing vdd_%s regs\n",
                         __func__, voltdm->name);
                 return;
@@ -249,9 +248,9 @@ void omap_vp_enable(struct voltagedomain *voltdm)
         vp_latch_vsel(voltdm);
 
         /* Enable VP */
-        vpconfig = vdd->read_reg(vp->vp_common->prm_mod, vp->vpconfig);
+        vpconfig = voltdm->read(vp->vpconfig);
         vpconfig |= vp->vp_common->vpconfig_vpenable;
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
         vdd->vp_enabled = true;
 }
 
@@ -276,7 +275,7 @@ void omap_vp_disable(struct voltagedomain *voltdm)
 
         vdd = voltdm->vdd;
         vp = voltdm->vdd->vp_data;
-        if (!vdd->read_reg || !vdd->write_reg) {
+        if (!voltdm->read || !voltdm->write) {
                 pr_err("%s: No read/write API for accessing vdd_%s regs\n",
                         __func__, voltdm->name);
                 return;
@@ -290,15 +289,15 @@ void omap_vp_disable(struct voltagedomain *voltdm)
         }
 
         /* Disable VP */
-        vpconfig = vdd->read_reg(vp->vp_common->prm_mod, vp->vpconfig);
+        vpconfig = voltdm->read(vp->vpconfig);
         vpconfig &= ~vp->vp_common->vpconfig_vpenable;
-        vdd->write_reg(vpconfig, vp->vp_common->prm_mod, vp->vpconfig);
+        voltdm->write(vpconfig, vp->vpconfig);
 
         /*
          * Wait for VP idle Typical latency is <2us. Maximum latency is ~100us
          */
-        omap_test_timeout((vdd->read_reg(vp->vp_common->prm_mod, vp->vstatus)),
-                                VP_IDLE_TIMEOUT, timeout);
+        omap_test_timeout((voltdm->read(vp->vstatus)),
+                          VP_IDLE_TIMEOUT, timeout);
 
         if (timeout >= VP_IDLE_TIMEOUT)
                 pr_warning("%s: vdd_%s idle timedout\n",
@@ -322,7 +321,7 @@ static int vp_volt_debug_get(void *data, u64 *val)
                 return -EINVAL;
         }
 
-        vsel = vdd->read_reg(vp->vp_common->prm_mod, vp->voltage);
+        vsel = voltdm->read(vp->voltage);
 
         if (!vdd->pmic_info->vsel_to_uv) {
                 pr_warning("PMIC function to convert vsel to voltage"
diff --git a/arch/arm/mach-omap2/vp.h b/arch/arm/mach-omap2/vp.h
index 1ccf7419a36..382fef13dbc 100644
--- a/arch/arm/mach-omap2/vp.h
+++ b/arch/arm/mach-omap2/vp.h
@@ -62,7 +62,6 @@ struct omap_vp_ops {
  * @vpconfig_vlimitto_vddmin_shift: VDDMIN field shift in PRM_VP*_VLIMITTO reg
  * @vpconfig_vlimitto_vddmax_shift: VDDMAX field shift in PRM_VP*_VLIMITTO reg
  * @vpconfig_vlimitto_timeout_shift: TIMEOUT field shift in PRM_VP*_VLIMITTO reg
- * @prm_mod: PRM module id used for PRM register access
  *
  * XXX It it not necessary to have both a mask and a shift for the same
  *     bitfield - remove one
@@ -75,7 +74,6 @@ struct omap_vp_common_data {
         u32 vpconfig_initvdd;
         u32 vpconfig_forceupdate;
         u32 vpconfig_vpenable;
-        s16 prm_mod;
         u8 vpconfig_erroroffset_shift;
         u8 vpconfig_errorgain_shift;
         u8 vpconfig_initvoltage_shift;
diff --git a/arch/arm/mach-omap2/vp3xxx_data.c b/arch/arm/mach-omap2/vp3xxx_data.c
index 0372c1ab567..b01d33325d5 100644
--- a/arch/arm/mach-omap2/vp3xxx_data.c
+++ b/arch/arm/mach-omap2/vp3xxx_data.c
@@ -37,7 +37,6 @@ static const struct omap_vp_ops omap3_vp_ops = {
  * XXX This stuff presumably belongs in the vp3xxx.c or vp.c file.
  */
 static const struct omap_vp_common_data omap3_vp_common = {
-        .prm_mod = OMAP3430_GR_MOD,
         .vpconfig_erroroffset_shift = OMAP3430_ERROROFFSET_SHIFT,
         .vpconfig_errorgain_mask = OMAP3430_ERRORGAIN_MASK,
         .vpconfig_errorgain_shift = OMAP3430_ERRORGAIN_SHIFT,
diff --git a/arch/arm/mach-omap2/vp44xx_data.c b/arch/arm/mach-omap2/vp44xx_data.c
index 738ba04f5cf..9704c7ba9e9 100644
--- a/arch/arm/mach-omap2/vp44xx_data.c
+++ b/arch/arm/mach-omap2/vp44xx_data.c
@@ -37,7 +37,6 @@ static const struct omap_vp_ops omap4_vp_ops = {
  * XXX This stuff presumably belongs in the vp44xx.c or vp.c file.
  */
 static const struct omap_vp_common_data omap4_vp_common = {
-        .prm_mod = OMAP4430_PRM_DEVICE_INST,
         .vpconfig_erroroffset_shift = OMAP4430_ERROROFFSET_SHIFT,
         .vpconfig_errorgain_mask = OMAP4430_ERRORGAIN_MASK,
         .vpconfig_errorgain_shift = OMAP4430_ERRORGAIN_SHIFT,