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>

diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 5d5f9e52f89fb6cf4da8651d133f5cd0afbc977c..d72b787a0d832f2eb7d00372be0ae9635889e74f 100644 (file)
--- 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);