From patchwork Mon Aug 29 17:35:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1109082 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7THjBVn027247 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 29 Aug 2011 17:45:32 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qy5tH-0001Ra-DN; Mon, 29 Aug 2011 17:44:55 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qy5tG-0005wY-Px; Mon, 29 Aug 2011 17:44:54 +0000 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qy5kd-00056r-4N for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2011 17:36:03 +0000 Received: from mail-pz0-f46.google.com ([209.85.210.46]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKTlvN/iYSOanXK3P4qYCDRWo8KBrow1pc@postini.com; Mon, 29 Aug 2011 10:35:59 PDT Received: by mail-pz0-f46.google.com with SMTP id 32so9682133pzk.19 for ; Mon, 29 Aug 2011 10:35:58 -0700 (PDT) Received: by 10.142.216.20 with SMTP id o20mr2640920wfg.446.1314639357928; Mon, 29 Aug 2011 10:35:57 -0700 (PDT) Received: from localhost.localdomain (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id m1sm19531524pbf.3.2011.08.29.10.35.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Aug 2011 10:35:57 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH 16/22] OMAP2+: voltage: enable VC bypass scale method when VC is initialized Date: Mon, 29 Aug 2011 10:35:49 -0700 Message-Id: <1314639355-12713-17-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1314639355-12713-1-git-send-email-khilman@ti.com> References: <1314639355-12713-1-git-send-email-khilman@ti.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110829_133559_530807_24F0C109 X-CRM114-Status: GOOD ( 11.55 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.71 listed in list.dnswl.org] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 29 Aug 2011 17:45:32 +0000 (UTC) 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 --- arch/arm/mach-omap2/voltage.c | 4 +++- 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))