From patchwork Tue May 18 12:35:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lesly A M X-Patchwork-Id: 100452 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4ICa7id000591 for ; Tue, 18 May 2010 12:36:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757496Ab0ERMgF (ORCPT ); Tue, 18 May 2010 08:36:05 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:54177 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757489Ab0ERMgC (ORCPT ); Tue, 18 May 2010 08:36:02 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o4ICZx0a016690 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 18 May 2010 07:36:01 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o4ICZu5T010402; Tue, 18 May 2010 18:05:56 +0530 (IST) From: Lesly A M To: linux-omap@vger.kernel.org Cc: Lesly A M , Nishanth Menon , David Derrick , Samuel Ortiz Subject: [PATCH v6 4/7] omap3: pm: changing vdd0_/vdd1_ to vdd1_/vdd2_ in VC param structure Date: Tue, 18 May 2010 18:05:39 +0530 Message-Id: <1274186139-23960-1-git-send-email-leslyam@ti.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 18 May 2010 12:36:07 +0000 (UTC) diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index f4069db..1c3f9ed 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -147,14 +147,14 @@ struct __initdata prm_setup_vc omap3430_vc_config = { .voltoffset = 0x32, }, /* VC COMMAND VALUES for VDD1/VDD2 */ - .vdd0_on = 0x30, /* 1.2v */ - .vdd0_onlp = 0x20, /* 1.0v */ - .vdd0_ret = 0x1e, /* 0.975v */ - .vdd0_off = 0x00, /* 0.6v */ - .vdd1_on = 0x2c, /* 1.15v */ + .vdd1_on = 0x30, /* 1.2v */ .vdd1_onlp = 0x20, /* 1.0v */ - .vdd1_ret = 0x1e, /* .975v */ + .vdd1_ret = 0x1e, /* 0.975v */ .vdd1_off = 0x00, /* 0.6v */ + .vdd2_on = 0x2c, /* 1.15v */ + .vdd2_onlp = 0x20, /* 1.0v */ + .vdd2_ret = 0x1e, /* 0.975v */ + .vdd2_off = 0x00, /* 0.6v */ }; /* @@ -178,14 +178,14 @@ struct __initdata prm_setup_vc omap3630_vc_config = { .voltoffset = 0x32, }, /* VC COMMAND VALUES for VDD1/VDD2 */ - .vdd0_on = 0x28, /* 1.1v */ - .vdd0_onlp = 0x20, /* 1.0v */ - .vdd0_ret = 0x13, /* 0.83v */ - .vdd0_off = 0x00, /* 0.6v */ - .vdd1_on = 0x2B, /* 1.1375v */ + .vdd1_on = 0x28, /* 1.1v */ .vdd1_onlp = 0x20, /* 1.0v */ .vdd1_ret = 0x13, /* 0.83v */ .vdd1_off = 0x00, /* 0.6v */ + .vdd2_on = 0x2B, /* 1.1375v */ + .vdd2_onlp = 0x20, /* 1.0v */ + .vdd2_ret = 0x13, /* 0.83v */ + .vdd2_off = 0x00, /* 0.6v */ }; static struct prm_setup_vc vc_config; @@ -279,17 +279,17 @@ static void __init init_voltagecontroller(void) VC_VOLRA0_SHIFT)); voltage_write_reg(vc_reg.cmdval0_reg, - (vc_config.vdd0_on << VC_CMD_ON_SHIFT) | - (vc_config.vdd0_onlp << VC_CMD_ONLP_SHIFT) | - (vc_config.vdd0_ret << VC_CMD_RET_SHIFT) | - (vc_config.vdd0_off << VC_CMD_OFF_SHIFT)); - - voltage_write_reg(vc_reg.cmdval1_reg, (vc_config.vdd1_on << VC_CMD_ON_SHIFT) | (vc_config.vdd1_onlp << VC_CMD_ONLP_SHIFT) | (vc_config.vdd1_ret << VC_CMD_RET_SHIFT) | (vc_config.vdd1_off << VC_CMD_OFF_SHIFT)); + voltage_write_reg(vc_reg.cmdval1_reg, + (vc_config.vdd2_on << VC_CMD_ON_SHIFT) | + (vc_config.vdd2_onlp << VC_CMD_ONLP_SHIFT) | + (vc_config.vdd2_ret << VC_CMD_RET_SHIFT) | + (vc_config.vdd2_off << VC_CMD_OFF_SHIFT)); + voltage_write_reg(vc_ch_conf_reg, VC_CMD1 | VC_RAV1); voltage_write_reg(vc_i2c_cfg_reg, VC_MCODE_SHIFT | VC_HSEN); diff --git a/arch/arm/mach-omap2/voltage.h b/arch/arm/mach-omap2/voltage.h index f8462c3..04c3bdf 100644 --- a/arch/arm/mach-omap2/voltage.h +++ b/arch/arm/mach-omap2/voltage.h @@ -28,15 +28,15 @@ struct prm_setup_vc { /* CLK & VOLT SETUPTIME for OFF */ struct setuptime_vc off; /* PRM_VC_CMD_VAL_0 specific bits */ - u16 vdd0_on; - u16 vdd0_onlp; - u16 vdd0_ret; - u16 vdd0_off; -/* PRM_VC_CMD_VAL_1 specific bits */ u16 vdd1_on; u16 vdd1_onlp; u16 vdd1_ret; u16 vdd1_off; +/* PRM_VC_CMD_VAL_1 specific bits */ + u16 vdd2_on; + u16 vdd2_onlp; + u16 vdd2_ret; + u16 vdd2_off; }; #define VOLTSCALE_VPFORCEUPDATE 1