summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-07-18 15:48:22 -0700
committerKevin Hilman <khilman@ti.com>2011-09-15 11:39:10 -0700
commit4d47506a85a9f2e745dc63215594e9f799aff3dc (patch)
tree38b47aceb74731fbbcb3b8192748a67c704523eb
parentd84adcf46b9c235d1f4975b72a8c2763dbfb0081 (diff)
downloadop-kernel-dev-4d47506a85a9f2e745dc63215594e9f799aff3dc.zip
op-kernel-dev-4d47506a85a9f2e745dc63215594e9f799aff3dc.tar.gz
OMAP2+: voltage: enable VC bypass scale method when VC is initialized
VC is initialized first, set default scaling method to VC bypass. If/when VP is initialized, default scaling method will be changed to VP force-update. Enabling VC bypass as default as soon as VC is initialized allows for VC bypass scaling to work when no VP is configured/initialized for a given voltage domain. Signed-off-by: Kevin Hilman <khilman@ti.com>
-rw-r--r--arch/arm/mach-omap2/voltage.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index c6352e3..e1a22a3 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/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))
OpenPOWER on IntegriCloud