summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/vc.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2012-09-25 20:33:47 +0400
committerKevin Hilman <khilman@ti.com>2012-11-06 03:29:46 +0400
commit2ceec7b25c3cde53c68e49d64950f2ad1cab307d (patch)
tree6b16e346a61cc02d49f459bddf1e602417ddf990 /arch/arm/mach-omap2/vc.c
parentd3965191a4d28fa6eb875c06e5cfaffa5a8aef29 (diff)
downloadlinux-2ceec7b25c3cde53c68e49d64950f2ad1cab307d.tar.xz
ARM: OMAP4: vc: fix channel configuration
RACEN bit should only be set if the voltage and command register addresses are the same. Signed-off-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
-rw-r--r--arch/arm/mach-omap2/vc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 5d5f9e52f89f..d72b787a0d83 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -592,9 +592,12 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm)
voltdm->rmw(vc->smps_cmdra_mask,
vc->cmd_reg_addr << __ffs(vc->smps_cmdra_mask),
vc->smps_cmdra_reg);
- vc->cfg_channel |= vc_cfg_bits->rac | vc_cfg_bits->racen;
+ vc->cfg_channel |= vc_cfg_bits->rac;
}
+ if (vc->cmd_reg_addr == vc->volt_reg_addr)
+ vc->cfg_channel |= vc_cfg_bits->racen;
+
/* Set up the on, inactive, retention and off voltage */
on_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->on);
onlp_vsel = omap_vc_calc_vsel(voltdm, voltdm->vc_param->onlp);