* [PATCH 1/2] Move voltage controller configuration to pm34xx.c
@ 2008-08-06 8:41 Kalle Jokiniemi
2008-08-06 8:41 ` [PATCH 2/2] Add early init for voltage controller configuration and off mode polarity Kalle Jokiniemi
2008-08-06 8:56 ` [PATCH 1/2] Move voltage controller configuration to pm34xx.c Tony Lindgren
0 siblings, 2 replies; 6+ messages in thread
From: Kalle Jokiniemi @ 2008-08-06 8:41 UTC (permalink / raw)
To: linux-omap; +Cc: peter.de-schrijver, Kalle Jokiniemi
From: ext Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] Add early init for voltage controller configuration and off mode polarity.
2008-08-06 8:41 [PATCH 1/2] Move voltage controller configuration to pm34xx.c Kalle Jokiniemi
@ 2008-08-06 8:41 ` Kalle Jokiniemi
2008-08-06 8:56 ` [PATCH 1/2] Move voltage controller configuration to pm34xx.c Tony Lindgren
1 sibling, 0 replies; 6+ messages in thread
From: Kalle Jokiniemi @ 2008-08-06 8:41 UTC (permalink / raw)
To: linux-omap; +Cc: peter.de-schrijver, Kalle Jokiniemi
From: ext Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
---
arch/arm/mach-omap2/pm34xx.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index a6cfc46..fc72c11 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -484,3 +484,15 @@ static void __init configure_vc(void)
#endif
}
+
+static int __init omap3_pm_early_init(void)
+{
+ prm_clear_mod_reg_bits(OMAP3430_OFFMODE_POL, OMAP3430_GR_MOD,
+ OMAP3_PRM_POLCTRL_OFFSET);
+
+ configure_vc();
+
+ return 0;
+}
+
+arch_initcall(omap3_pm_early_init);
--
1.5.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] Move voltage controller configuration to pm34xx.c
2008-08-06 8:41 [PATCH 1/2] Move voltage controller configuration to pm34xx.c Kalle Jokiniemi
2008-08-06 8:41 ` [PATCH 2/2] Add early init for voltage controller configuration and off mode polarity Kalle Jokiniemi
@ 2008-08-06 8:56 ` Tony Lindgren
1 sibling, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2008-08-06 8:56 UTC (permalink / raw)
To: Kalle Jokiniemi; +Cc: linux-omap, peter.de-schrijver
* Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com> [080806 11:39]:
> From: ext Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
Thanks, pushing both today.
Tony
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
> ---
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/2] Add PM early init
@ 2008-07-31 13:37 Peter 'p2' De Schrijver
2008-07-31 13:37 ` [PATCH 1/2] Move voltage controller configuration to pm34xx.c Peter 'p2' De Schrijver
0 siblings, 1 reply; 6+ messages in thread
From: Peter 'p2' De Schrijver @ 2008-07-31 13:37 UTC (permalink / raw)
To: linux-omap; +Cc: Peter 'p2' De Schrijver
This patchset add an early init function to initialize the voltage controller
and the off mode polarity before the drivers depending on these features are
enabled.
Peter 'p2' De Schrijver (2):
Move voltage controller configuration to pm34xx.c
Add early init for voltage controller configuration and off mode
polarity.
arch/arm/mach-omap2/pm34xx.c | 71 +++++++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/smartreflex.c | 60 -------------------------------
2 files changed, 71 insertions(+), 60 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] Move voltage controller configuration to pm34xx.c
2008-07-31 13:37 [PATCH 0/2] Add PM early init Peter 'p2' De Schrijver
@ 2008-07-31 13:37 ` Peter 'p2' De Schrijver
2008-08-05 10:55 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Peter 'p2' De Schrijver @ 2008-07-31 13:37 UTC (permalink / raw)
To: linux-omap; +Cc: Peter 'p2' De Schrijver
Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
---
arch/arm/mach-omap2/smartreflex.c | 60 -------------------------------------
1 files changed, 0 insertions(+), 60 deletions(-)
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index b41fe96..7e4f9a4 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -362,64 +362,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_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
-
-}
-
static void sr_configure(struct omap_sr *sr)
{
u32 sr_config;
@@ -845,8 +787,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.6.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] Move voltage controller configuration to pm34xx.c
2008-07-31 13:37 ` [PATCH 1/2] Move voltage controller configuration to pm34xx.c Peter 'p2' De Schrijver
@ 2008-08-05 10:55 ` Tony Lindgren
2008-08-06 8:35 ` Kalle Jokiniemi
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2008-08-05 10:55 UTC (permalink / raw)
To: Peter 'p2' De Schrijver; +Cc: linux-omap
* Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com> [080731 16:39]:
>
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> ---
> arch/arm/mach-omap2/smartreflex.c | 60 -------------------------------------
> 1 files changed, 0 insertions(+), 60 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
> index b41fe96..7e4f9a4 100644
> --- a/arch/arm/mach-omap2/smartreflex.c
> +++ b/arch/arm/mach-omap2/smartreflex.c
> @@ -362,64 +362,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_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
> -
> -}
> -
> static void sr_configure(struct omap_sr *sr)
> {
> u32 sr_config;
> @@ -845,8 +787,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);
This patch does not seem to move code, it just removes it. Can you do
the patches where the first patch just moves the existing code, then
the second patch adds the new changes? That way it's easier to read.
Thanks,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] Move voltage controller configuration to pm34xx.c
2008-08-05 10:55 ` Tony Lindgren
@ 2008-08-06 8:35 ` Kalle Jokiniemi
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Jokiniemi @ 2008-08-06 8:35 UTC (permalink / raw)
To: ext Tony Lindgren; +Cc: Peter 'p2' De Schrijver, linux-omap
On ti, 2008-08-05 at 13:55 +0300, ext Tony Lindgren wrote:
> * Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com> [080731 16:39]:
> >
> > Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> > ---
> > arch/arm/mach-omap2/smartreflex.c | 60 -------------------------------------
> > 1 files changed, 0 insertions(+), 60 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
> > index b41fe96..7e4f9a4 100644
> > --- a/arch/arm/mach-omap2/smartreflex.c
> > +++ b/arch/arm/mach-omap2/smartreflex.c
> > @@ -362,64 +362,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_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
> > -
> > -}
> > -
> > static void sr_configure(struct omap_sr *sr)
> > {
> > u32 sr_config;
> > @@ -845,8 +787,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);
>
> This patch does not seem to move code, it just removes it. Can you do
> the patches where the first patch just moves the existing code, then
> the second patch adds the new changes? That way it's easier to read.
Peter is on vacation, but I have made the changes you asked. I'll send
the updated patches shortly.
Br,
Kalle
>
> Thanks,
>
> Tony
> --
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-08-06 8:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-06 8:41 [PATCH 1/2] Move voltage controller configuration to pm34xx.c Kalle Jokiniemi
2008-08-06 8:41 ` [PATCH 2/2] Add early init for voltage controller configuration and off mode polarity Kalle Jokiniemi
2008-08-06 8:56 ` [PATCH 1/2] Move voltage controller configuration to pm34xx.c Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2008-07-31 13:37 [PATCH 0/2] Add PM early init Peter 'p2' De Schrijver
2008-07-31 13:37 ` [PATCH 1/2] Move voltage controller configuration to pm34xx.c Peter 'p2' De Schrijver
2008-08-05 10:55 ` Tony Lindgren
2008-08-06 8:35 ` Kalle Jokiniemi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox