From patchwork Fri Apr 3 16:09:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 16178 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n33GBAmh014755 for ; Fri, 3 Apr 2009 16:11:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935207AbZDCQJS (ORCPT ); Fri, 3 Apr 2009 12:09:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935858AbZDCQJS (ORCPT ); Fri, 3 Apr 2009 12:09:18 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:41333 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936081AbZDCQJQ convert rfc822-to-8bit (ORCPT ); Fri, 3 Apr 2009 12:09:16 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n33G98ZR001353 for ; Fri, 3 Apr 2009 11:09:14 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id n33G97IF014924 for ; Fri, 3 Apr 2009 21:39:07 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Fri, 3 Apr 2009 21:39:07 +0530 From: "Nayak, Rajendra" To: "linux-omap@vger.kernel.org" Date: Fri, 3 Apr 2009 21:39:05 +0530 Subject: [PATCH 06/10] OMAP3: SR: Reset voltage level on SR disable Thread-Topic: [PATCH 06/10] OMAP3: SR: Reset voltage level on SR disable Thread-Index: Acm0doNf08zfOxWEQceg3J05fQ/qsw== Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02FB102C22@dbde02.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Rajendra Nayak This patch resets the voltage level for each OPP on SR disable. Signed-off-by: Rajendra Nayak Signed-off-by: Jouni Hogander --- arch/arm/mach-omap2/smartreflex.c | 49 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+) To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-omap-pm/arch/arm/mach-omap2/smartreflex.c =================================================================== --- linux-omap-pm.orig/arch/arm/mach-omap2/smartreflex.c +++ linux-omap-pm/arch/arm/mach-omap2/smartreflex.c @@ -378,6 +378,51 @@ static void sr_configure(struct omap_sr sr->is_sr_reset = 0; } +static int sr_reset_voltage(int srid) +{ + u32 target_opp_no, vsel = 0; + u32 reg_addr = 0; + u32 loop_cnt = 0, retries_cnt = 0; + u32 vc_bypass_value; + + if (srid == SR1) { + target_opp_no = omap_pm_vdd1_get_opp(); + vsel = mpu_opps[target_opp_no].vsel; + reg_addr = R_VDD1_SR_CONTROL; + } else if (srid == SR2) { + target_opp_no = omap_pm_vdd2_get_opp(); + vsel = l3_opps[target_opp_no].vsel; + reg_addr = R_VDD2_SR_CONTROL; + } + + vc_bypass_value = (vsel << OMAP3430_DATA_SHIFT) | + (reg_addr << OMAP3430_REGADDR_SHIFT) | + (R_SRI2C_SLAVE_ADDR << OMAP3430_SLAVEADDR_SHIFT); + + prm_write_mod_reg(vc_bypass_value, OMAP3430_GR_MOD, + OMAP3_PRM_VC_BYPASS_VAL_OFFSET); + + vc_bypass_value = prm_set_mod_reg_bits(OMAP3430_VALID, OMAP3430_GR_MOD, + OMAP3_PRM_VC_BYPASS_VAL_OFFSET); + + while ((vc_bypass_value & OMAP3430_VALID) != 0x0) { + loop_cnt++; + if (retries_cnt > 10) { + printk(KERN_INFO "Loop count exceeded in check SR I2C" + "write\n"); + return SR_FAIL; + } + if (loop_cnt > 50) { + retries_cnt++; + loop_cnt = 0; + udelay(10); + } + vc_bypass_value = prm_read_mod_reg(OMAP3430_GR_MOD, + OMAP3_PRM_VC_BYPASS_VAL_OFFSET); + } + return SR_PASS; +} + static int sr_enable(struct omap_sr *sr, u32 target_opp_no) { u32 nvalue_reciprocal, v; @@ -543,6 +588,8 @@ int sr_stop_vddautocomap(int srid) sr_disable(sr); sr_clk_disable(sr); sr->is_autocomp_active = 0; + /* Reset the volatage for current OPP */ + sr_reset_voltage(srid); return SR_TRUE; } else { printk(KERN_WARNING "SR%d: VDD autocomp is not active\n", @@ -611,6 +658,8 @@ void disable_smartreflex(int srid) OMAP3430_GR_MOD, OMAP3_PRM_VP2_CONFIG_OFFSET); } + /* Reset the volatage for current OPP */ + sr_reset_voltage(srid); } } }--