aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vc.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
-rw-r--r--arch/arm/mach-omap2/vc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index b62363d9d2b7..1bdbe7c15612 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -115,7 +115,7 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm,
115 vc_valid = vc->common->valid; 115 vc_valid = vc->common->valid;
116 vc_bypass_val_reg = vc->common->bypass_val_reg; 116 vc_bypass_val_reg = vc->common->bypass_val_reg;
117 vc_bypass_value = (target_vsel << vc->common->data_shift) | 117 vc_bypass_value = (target_vsel << vc->common->data_shift) |
118 (vdd->pmic_info->pmic_reg << 118 (vdd->pmic_info->volt_reg_addr <<
119 vc->common->regaddr_shift) | 119 vc->common->regaddr_shift) |
120 (vdd->pmic_info->i2c_slave_addr << 120 (vdd->pmic_info->i2c_slave_addr <<
121 vc->common->slaveaddr_shift); 121 vc->common->slaveaddr_shift);
@@ -264,7 +264,7 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm)
264 vc_val = vdd->read_reg(vc->common->prm_mod, 264 vc_val = vdd->read_reg(vc->common->prm_mod,
265 vc->common->smps_volra_reg); 265 vc->common->smps_volra_reg);
266 vc_val &= ~vc->smps_volra_mask; 266 vc_val &= ~vc->smps_volra_mask;
267 vc_val |= vdd->pmic_info->pmic_reg << vc->smps_volra_shift; 267 vc_val |= vdd->pmic_info->volt_reg_addr << vc->smps_volra_shift;
268 vdd->write_reg(vc_val, vc->common->prm_mod, 268 vdd->write_reg(vc_val, vc->common->prm_mod,
269 vc->common->smps_volra_reg); 269 vc->common->smps_volra_reg);
270 270