From 8a51ec9038dd61983a2a6f0e345093bd76ad1e5c Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Mon, 18 Jul 2011 15:48:22 -0700
Subject: [PATCH] --- yaml --- r: 272724 b: refs/heads/master c:
 4d47506a85a9f2e745dc63215594e9f799aff3dc h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-omap2/voltage.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8411ae768f24..482846dd0939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d84adcf46b9c235d1f4975b72a8c2763dbfb0081
+refs/heads/master: 4d47506a85a9f2e745dc63215594e9f799aff3dc
diff --git a/trunk/arch/arm/mach-omap2/voltage.c b/trunk/arch/arm/mach-omap2/voltage.c
index c6352e3230b7..e1a22a3d2f03 100644
--- a/trunk/arch/arm/mach-omap2/voltage.c
+++ b/trunk/arch/arm/mach-omap2/voltage.c
@@ -802,8 +802,10 @@ int __init omap_voltage_late_init(void)
 		if (!voltdm->scalable)
 			continue;
 
-		if (voltdm->vc)
+		if (voltdm->vc) {
+			voltdm->vdd->volt_scale = omap_vc_bypass_scale;
 			omap_vc_init_channel(voltdm);
+		}
 
 		if (voltdm->vdd) {
 			if (omap_vdd_data_configure(voltdm))