* [PATCH] OMAP3: Remove CONFIG_OMAP_SYSOFFMODE flag
@ 2008-10-17 6:46 Kalle Jokiniemi
2008-10-24 10:50 ` Kalle Jokiniemi
0 siblings, 1 reply; 5+ messages in thread
From: Kalle Jokiniemi @ 2008-10-17 6:46 UTC (permalink / raw)
To: linux-omap; +Cc: tony, Kalle Jokiniemi
Remove CONFIG_OMAP_SYSOFFMODE flag and do the full initialization of voltage
controller . Enabling automatic sending of OFF command and selecting wether
SYS_OFF_MODE signal is used should be determined dynamically. Hence they are
now not set in the initialization.
The sleep voltage for OFF mode is changed to default 1,2V for VDD1 and
1,15V for VDD2. Using the 0,9V setting causes hangup.
Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
---
arch/arm/mach-omap2/pm34xx.c | 10 +---------
arch/arm/mach-omap2/prm-regbits-34xx.h | 4 ++--
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index a828db6..457639f 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -622,10 +622,7 @@ static void __init configure_vc(void)
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,
+ prm_write_mod_reg(OMAP3430_AUTO_RET, OMAP3430_GR_MOD,
OMAP3_PRM_VOLTCTRL_OFFSET);
prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD,
@@ -640,11 +637,6 @@ static void __init configure_vc(void)
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 int __init omap3_pm_early_init(void)
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
index f82b5a7..d73eee8 100644
--- a/arch/arm/mach-omap2/prm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
@@ -466,13 +466,13 @@
#define OMAP3430_VC_CMD_VAL0_ON (0x3 << 4)
#define OMAP3430_VC_CMD_VAL0_ONLP (0x3 << 3)
#define OMAP3430_VC_CMD_VAL0_RET (0x3 << 3)
-#define OMAP3430_VC_CMD_VAL0_OFF (0x3 << 3)
+#define OMAP3430_VC_CMD_VAL0_OFF (0x3 << 4)
/* PRM_VC_CMD_VAL_1 specific bits */
#define OMAP3430_VC_CMD_VAL1_ON (0xB << 2)
#define OMAP3430_VC_CMD_VAL1_ONLP (0x3 << 3)
#define OMAP3430_VC_CMD_VAL1_RET (0x3 << 3)
-#define OMAP3430_VC_CMD_VAL1_OFF (0x3 << 3)
+#define OMAP3430_VC_CMD_VAL1_OFF (0xB << 2)
/* PRM_VC_CH_CONF */
#define OMAP3430_CMD1 (1 << 20)
--
1.5.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] OMAP3: Remove CONFIG_OMAP_SYSOFFMODE flag
2008-10-17 6:46 [PATCH] OMAP3: Remove CONFIG_OMAP_SYSOFFMODE flag Kalle Jokiniemi
@ 2008-10-24 10:50 ` Kalle Jokiniemi
2008-10-24 19:22 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Kalle Jokiniemi @ 2008-10-24 10:50 UTC (permalink / raw)
To: tony; +Cc: linux-omap, Kevin Hilman
Hi Tony,
On pe, 2008-10-17 at 09:46 +0300, Kalle Jokiniemi wrote:
> Remove CONFIG_OMAP_SYSOFFMODE flag and do the full initialization of voltage
> controller . Enabling automatic sending of OFF command and selecting wether
> SYS_OFF_MODE signal is used should be determined dynamically. Hence they are
> now not set in the initialization.
Any chance getting this in?
It's currently in the pm-branch, but it does not really depend on any of
the pathces there. So I think it could be moved away from the pm-branch
and into the linux-omap master.
regards,
Kalle
>
> The sleep voltage for OFF mode is changed to default 1,2V for VDD1 and
> 1,15V for VDD2. Using the 0,9V setting causes hangup.
>
> Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
> ---
> arch/arm/mach-omap2/pm34xx.c | 10 +---------
> arch/arm/mach-omap2/prm-regbits-34xx.h | 4 ++--
> 2 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> index a828db6..457639f 100644
> --- a/arch/arm/mach-omap2/pm34xx.c
> +++ b/arch/arm/mach-omap2/pm34xx.c
> @@ -622,10 +622,7 @@ static void __init configure_vc(void)
> 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,
> + prm_write_mod_reg(OMAP3430_AUTO_RET, OMAP3430_GR_MOD,
> OMAP3_PRM_VOLTCTRL_OFFSET);
>
> prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD,
> @@ -640,11 +637,6 @@ static void __init configure_vc(void)
> 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 int __init omap3_pm_early_init(void)
> diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
> index f82b5a7..d73eee8 100644
> --- a/arch/arm/mach-omap2/prm-regbits-34xx.h
> +++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
> @@ -466,13 +466,13 @@
> #define OMAP3430_VC_CMD_VAL0_ON (0x3 << 4)
> #define OMAP3430_VC_CMD_VAL0_ONLP (0x3 << 3)
> #define OMAP3430_VC_CMD_VAL0_RET (0x3 << 3)
> -#define OMAP3430_VC_CMD_VAL0_OFF (0x3 << 3)
> +#define OMAP3430_VC_CMD_VAL0_OFF (0x3 << 4)
>
> /* PRM_VC_CMD_VAL_1 specific bits */
> #define OMAP3430_VC_CMD_VAL1_ON (0xB << 2)
> #define OMAP3430_VC_CMD_VAL1_ONLP (0x3 << 3)
> #define OMAP3430_VC_CMD_VAL1_RET (0x3 << 3)
> -#define OMAP3430_VC_CMD_VAL1_OFF (0x3 << 3)
> +#define OMAP3430_VC_CMD_VAL1_OFF (0xB << 2)
>
> /* PRM_VC_CH_CONF */
> #define OMAP3430_CMD1 (1 << 20)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] OMAP3: Remove CONFIG_OMAP_SYSOFFMODE flag
2008-10-24 10:50 ` Kalle Jokiniemi
@ 2008-10-24 19:22 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2008-10-24 19:22 UTC (permalink / raw)
To: Kalle Jokiniemi; +Cc: linux-omap, Kevin Hilman
* Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com> [081024 03:50]:
> Hi Tony,
>
> On pe, 2008-10-17 at 09:46 +0300, Kalle Jokiniemi wrote:
> > Remove CONFIG_OMAP_SYSOFFMODE flag and do the full initialization of voltage
> > controller . Enabling automatic sending of OFF command and selecting wether
> > SYS_OFF_MODE signal is used should be determined dynamically. Hence they are
> > now not set in the initialization.
>
> Any chance getting this in?
>
> It's currently in the pm-branch, but it does not really depend on any of
> the pathces there. So I think it could be moved away from the pm-branch
> and into the linux-omap master.
Well I was kind of waiting for Kevin and Paul to ack this. But looks
like this fix is safe to apply, so pushing today.
Tony
>
> regards,
> Kalle
>
> >
> > The sleep voltage for OFF mode is changed to default 1,2V for VDD1 and
> > 1,15V for VDD2. Using the 0,9V setting causes hangup.
> >
> > Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
> > ---
> > arch/arm/mach-omap2/pm34xx.c | 10 +---------
> > arch/arm/mach-omap2/prm-regbits-34xx.h | 4 ++--
> > 2 files changed, 3 insertions(+), 11 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> > index a828db6..457639f 100644
> > --- a/arch/arm/mach-omap2/pm34xx.c
> > +++ b/arch/arm/mach-omap2/pm34xx.c
> > @@ -622,10 +622,7 @@ static void __init configure_vc(void)
> > 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,
> > + prm_write_mod_reg(OMAP3430_AUTO_RET, OMAP3430_GR_MOD,
> > OMAP3_PRM_VOLTCTRL_OFFSET);
> >
> > prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD,
> > @@ -640,11 +637,6 @@ static void __init configure_vc(void)
> > 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 int __init omap3_pm_early_init(void)
> > diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
> > index f82b5a7..d73eee8 100644
> > --- a/arch/arm/mach-omap2/prm-regbits-34xx.h
> > +++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
> > @@ -466,13 +466,13 @@
> > #define OMAP3430_VC_CMD_VAL0_ON (0x3 << 4)
> > #define OMAP3430_VC_CMD_VAL0_ONLP (0x3 << 3)
> > #define OMAP3430_VC_CMD_VAL0_RET (0x3 << 3)
> > -#define OMAP3430_VC_CMD_VAL0_OFF (0x3 << 3)
> > +#define OMAP3430_VC_CMD_VAL0_OFF (0x3 << 4)
> >
> > /* PRM_VC_CMD_VAL_1 specific bits */
> > #define OMAP3430_VC_CMD_VAL1_ON (0xB << 2)
> > #define OMAP3430_VC_CMD_VAL1_ONLP (0x3 << 3)
> > #define OMAP3430_VC_CMD_VAL1_RET (0x3 << 3)
> > -#define OMAP3430_VC_CMD_VAL1_OFF (0x3 << 3)
> > +#define OMAP3430_VC_CMD_VAL1_OFF (0xB << 2)
> >
> > /* PRM_VC_CH_CONF */
> > #define OMAP3430_CMD1 (1 << 20)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] OMAP3: Remove CONFIG_OMAP_SYSOFFMODE flag
@ 2008-08-26 13:00 Kalle Jokiniemi
2008-08-28 13:09 ` Kalle Jokiniemi
0 siblings, 1 reply; 5+ messages in thread
From: Kalle Jokiniemi @ 2008-08-26 13:00 UTC (permalink / raw)
To: linux-omap; +Cc: Kalle Jokiniemi
Remove CONFIG_OMAP_SYSOFFMODE flag and do the full initialization of voltage
controller . Enabling automatic sending of OFF command and selecting wether
SYS_OFF_MODE signal is used should be determined dynamically. Hence they are
now not set in the initialization.
Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
---
arch/arm/mach-omap2/pm34xx.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index a16eb33..5633753 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -623,10 +623,7 @@ static void __init configure_vc(void)
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,
+ prm_write_mod_reg(OMAP3430_AUTO_RET, OMAP3430_GR_MOD,
OMAP3_PRM_VOLTCTRL_OFFSET);
prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD,
@@ -641,11 +638,6 @@ static void __init configure_vc(void)
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 int __init omap3_pm_early_init(void)
--
1.5.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] OMAP3: Remove CONFIG_OMAP_SYSOFFMODE flag
2008-08-26 13:00 Kalle Jokiniemi
@ 2008-08-28 13:09 ` Kalle Jokiniemi
0 siblings, 0 replies; 5+ messages in thread
From: Kalle Jokiniemi @ 2008-08-28 13:09 UTC (permalink / raw)
To: linux-omap
On ti, 2008-08-26 at 16:00 +0300, Kalle Jokiniemi wrote:
> Remove CONFIG_OMAP_SYSOFFMODE flag and do the full initialization of voltage
> controller . Enabling automatic sending of OFF command and selecting wether
> SYS_OFF_MODE signal is used should be determined dynamically. Hence they are
> now not set in the initialization.
This patch needs to be added with safer off-mode sleep voltage settings.
Please disregard, whis one. I'll send a new one with couple of other
patches soon.
regards,
Kalle
>
> Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
> ---
> arch/arm/mach-omap2/pm34xx.c | 10 +---------
> 1 files changed, 1 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> index a16eb33..5633753 100644
> --- a/arch/arm/mach-omap2/pm34xx.c
> +++ b/arch/arm/mach-omap2/pm34xx.c
> @@ -623,10 +623,7 @@ static void __init configure_vc(void)
> 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,
> + prm_write_mod_reg(OMAP3430_AUTO_RET, OMAP3430_GR_MOD,
> OMAP3_PRM_VOLTCTRL_OFFSET);
>
> prm_write_mod_reg(OMAP3430_CLKSETUP_DURATION, OMAP3430_GR_MOD,
> @@ -641,11 +638,6 @@ static void __init configure_vc(void)
> 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 int __init omap3_pm_early_init(void)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-10-24 19:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-17 6:46 [PATCH] OMAP3: Remove CONFIG_OMAP_SYSOFFMODE flag Kalle Jokiniemi
2008-10-24 10:50 ` Kalle Jokiniemi
2008-10-24 19:22 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2008-08-26 13:00 Kalle Jokiniemi
2008-08-28 13:09 ` Kalle Jokiniemi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox