From 5c7210a0abf9a8fbe242c4a78f468de76687b6f3 Mon Sep 17 00:00:00 2001 From: Tero Kristo Date: Tue, 25 Sep 2012 19:33:47 +0300 Subject: [PATCH] --- yaml --- r: 342429 b: refs/heads/master c: 2ceec7b25c3cde53c68e49d64950f2ad1cab307d h: refs/heads/master i: 342427: 57f013050e8a0620ce0a264f5d64bbea4d5cc142 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/vc.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4793209e3544..9801143bf7b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3965191a4d28fa6eb875c06e5cfaffa5a8aef29 +refs/heads/master: 2ceec7b25c3cde53c68e49d64950f2ad1cab307d diff --git a/trunk/arch/arm/mach-omap2/vc.c b/trunk/arch/arm/mach-omap2/vc.c index 5d5f9e52f89f..d72b787a0d83 100644 --- a/trunk/arch/arm/mach-omap2/vc.c +++ b/trunk/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);