From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH 1/2] Move voltage controller configuration to pm34xx.c Date: Wed, 6 Aug 2008 11:56:31 +0300 Message-ID: <20080806085630.GF19813@atomide.com> References: <1218012068-30107-1-git-send-email-ext-kalle.jokiniemi@nokia.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-bos.mailhop.org ([63.208.196.178]:57838 "EHLO mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765481AbYHFI4e (ORCPT ); Wed, 6 Aug 2008 04:56:34 -0400 Content-Disposition: inline In-Reply-To: <1218012068-30107-1-git-send-email-ext-kalle.jokiniemi@nokia.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Kalle Jokiniemi Cc: linux-omap@vger.kernel.org, peter.de-schrijver@nokia.com * Kalle Jokiniemi [080806 11:39]: > From: ext Peter 'p2' De Schrijver Thanks, pushing both today. Tony > Signed-off-by: Peter 'p2' De Schrijver > Signed-off-by: Kalle Jokiniemi > --- > arch/arm/mach-omap2/pm34xx.c | 57 +++++++++++++++++++++++++++++++++++ > arch/arm/mach-omap2/smartreflex.c | 60 ------------------------------------- > 2 files changed, 57 insertions(+), 60 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index 4d5f619..a6cfc46 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -427,3 +427,60 @@ err2: > } > return ret; > } > + > +static void __init configure_vc(void) > +{ > + prm_write_mod_reg((R_SRI2C_SLAVE_ADDR << OMAP3430_SMPS_SA1_SHIFT) | > + (R_SRI2C_SLAVE_ADDR << OMAP3430_SMPS_SA0_SHIFT), > + OMAP3430_GR_MOD, OMAP3_PRM_VC_SMPS_SA_OFFSET); > + prm_write_mod_reg((R_VDD2_SR_CONTROL << OMAP3430_VOLRA1_SHIFT) | > + (R_VDD1_SR_CONTROL << OMAP3430_VOLRA0_SHIFT), > + OMAP3430_GR_MOD, OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET); > + > + prm_write_mod_reg((OMAP3430_VC_CMD_VAL0_ON << > + OMAP3430_VC_CMD_ON_SHIFT) | > + (OMAP3430_VC_CMD_VAL0_ONLP << OMAP3430_VC_CMD_ONLP_SHIFT) | > + (OMAP3430_VC_CMD_VAL0_RET << OMAP3430_VC_CMD_RET_SHIFT) | > + (OMAP3430_VC_CMD_VAL0_OFF << OMAP3430_VC_CMD_OFF_SHIFT), > + OMAP3430_GR_MOD, OMAP3_PRM_VC_CMD_VAL_0_OFFSET); > + > + prm_write_mod_reg((OMAP3430_VC_CMD_VAL1_ON << > + OMAP3430_VC_CMD_ON_SHIFT) | > + (OMAP3430_VC_CMD_VAL1_ONLP << OMAP3430_VC_CMD_ONLP_SHIFT) | > + (OMAP3430_VC_CMD_VAL1_RET << OMAP3430_VC_CMD_RET_SHIFT) | > + (OMAP3430_VC_CMD_VAL1_OFF << OMAP3430_VC_CMD_OFF_SHIFT), > + OMAP3430_GR_MOD, OMAP3_PRM_VC_CMD_VAL_1_OFFSET); > + > + prm_write_mod_reg(OMAP3430_CMD1 | OMAP3430_RAV1, > + OMAP3430_GR_MOD, > + OMAP3_PRM_VC_CH_CONF_OFFSET); > + > + prm_write_mod_reg(OMAP3430_MCODE_SHIFT | OMAP3430_HSEN | OMAP3430_SREN, > + OMAP3430_GR_MOD, > + OMAP3_PRM_VC_I2C_CFG_OFFSET); > + > + /* Setup voltctrl and other setup times */ > + > +#ifdef CONFIG_OMAP_SYSOFFMODE > + prm_write_mod_reg(OMAP3430_AUTO_OFF | OMAP3430_AUTO_RET | > + OMAP3430_SEL_OFF, OMAP3430_GR_MOD, > + OMAP3_PRM_VOLTCTRL_OFFSET); > + > + prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD, > + OMAP3_PRM_CLKSETUP_OFFSET); > + prm_write_mod_reg((OMAP3430_VOLTSETUP_TIME2 << > + OMAP3430_SETUP_TIME2_SHIFT) | > + (OMAP3430_VOLTSETUP_TIME1 << > + OMAP3430_SETUP_TIME1_SHIFT), > + OMAP3430_GR_MOD, OMAP3_PRM_VOLTSETUP1_OFFSET); > + > + prm_write_mod_reg(OMAP3430_VOLTOFFSET_DURATION, OMAP3430_GR_MOD, > + OMAP3_PRM_VOLTOFFSET_OFFSET); > + prm_write_mod_reg(OMAP3430_VOLTSETUP2_DURATION, OMAP3430_GR_MOD, > + OMAP3_PRM_VOLTSETUP2_OFFSET); > +#else > + prm_set_mod_reg_bits(OMAP3430_AUTO_RET, OMAP3430_GR_MOD, > + OMAP3_PRM_VOLTCTRL_OFFSET); > +#endif > + > +} > diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c > index f460831..5b15d18 100644 > --- a/arch/arm/mach-omap2/smartreflex.c > +++ b/arch/arm/mach-omap2/smartreflex.c > @@ -364,64 +364,6 @@ static void sr_configure_vp(int srid) > } > } > > -static void sr_configure_vc(void) > -{ > - prm_write_mod_reg((R_SRI2C_SLAVE_ADDR << OMAP3430_SMPS_SA1_SHIFT) | > - (R_SRI2C_SLAVE_ADDR << OMAP3430_SMPS_SA0_SHIFT), > - OMAP3430_GR_MOD, OMAP3_PRM_VC_SMPS_SA_OFFSET); > - > - prm_write_mod_reg((R_VDD2_SR_CONTROL << OMAP3430_VOLRA1_SHIFT) | > - (R_VDD1_SR_CONTROL << OMAP3430_VOLRA0_SHIFT), > - OMAP3430_GR_MOD, OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET); > - > - prm_write_mod_reg((OMAP3430_VC_CMD_VAL0_ON << > - OMAP3430_VC_CMD_ON_SHIFT) | > - (OMAP3430_VC_CMD_VAL0_ONLP << OMAP3430_VC_CMD_ONLP_SHIFT) | > - (OMAP3430_VC_CMD_VAL0_RET << OMAP3430_VC_CMD_RET_SHIFT) | > - (OMAP3430_VC_CMD_VAL0_OFF << OMAP3430_VC_CMD_OFF_SHIFT), > - OMAP3430_GR_MOD, OMAP3_PRM_VC_CMD_VAL_0_OFFSET); > - > - prm_write_mod_reg((OMAP3430_VC_CMD_VAL1_ON << > - OMAP3430_VC_CMD_ON_SHIFT) | > - (OMAP3430_VC_CMD_VAL1_ONLP << OMAP3430_VC_CMD_ONLP_SHIFT) | > - (OMAP3430_VC_CMD_VAL1_RET << OMAP3430_VC_CMD_RET_SHIFT) | > - (OMAP3430_VC_CMD_VAL1_OFF << OMAP3430_VC_CMD_OFF_SHIFT), > - OMAP3430_GR_MOD, OMAP3_PRM_VC_CMD_VAL_1_OFFSET); > - > - prm_write_mod_reg(OMAP3430_CMD1 | OMAP3430_RAV1, > - OMAP3430_GR_MOD, > - OMAP3_PRM_VC_CH_CONF_OFFSET); > - > - prm_write_mod_reg(OMAP3430_MCODE_SHIFT | OMAP3430_HSEN | OMAP3430_SREN, > - OMAP3430_GR_MOD, > - OMAP3_PRM_VC_I2C_CFG_OFFSET); > - > - /* Setup voltctrl and other setup times */ > - /* XXX CONFIG_SYSOFFMODE has not been implemented yet */ > -#ifdef CONFIG_SYSOFFMODE > - prm_write_mod_reg(OMAP3430_AUTO_OFF | OMAP3430_AUTO_RET, > - OMAP3430_GR_MOD, > - OMAP3_PRM_VOLTCTRL_OFFSET); > - > - prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD, > - OMAP3_PRM_CLKSETUP_OFFSET); > - prm_write_mod_reg((OMAP3430_VOLTSETUP_TIME2 << > - OMAP3430_VOLTSETUP_TIME2_OFFSET) | > - (OMAP3430_VOLTSETUP_TIME1 << > - OMAP3430_VOLTSETUP_TIME1_OFFSET), > - OMAP3430_GR_MOD, OMAP3_PRM_VOLTSETUP1_OFFSET); > - > - prm_write_mod_reg(OMAP3430_VOLTOFFSET_DURATION, OMAP3430_GR_MOD, > - OMAP3_PRM_VOLTOFFSET_OFFSET); > - prm_write_mod_reg(OMAP3430_VOLTSETUP2_DURATION, OMAP3430_GR_MOD, > - OMAP3_PRM_VOLTSETUP2_OFFSET); > -#else > - prm_set_mod_reg_bits(OMAP3430_AUTO_RET, OMAP3430_GR_MOD, > - OMAP3_PRM_VOLTCTRL_OFFSET); > -#endif > - > -} > - > static void sr_configure(struct omap_sr *sr) > { > u32 sr_config; > @@ -847,8 +789,6 @@ static int __init omap3_sr_init(void) > sr_set_nvalues(&sr2); > sr_configure_vp(SR2); > > - sr_configure_vc(); > - > /* Enable SR on T2 */ > ret = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &RdReg, > R_DCDC_GLOBAL_CFG); > -- > 1.5.4.3 > > -- > 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