Re: Integration branch base switchover to Tony's omap-for-linus branch

[Paul Walmsley <paul@pwsan.com>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2320 bytes --]

Hi Rajendra, Santosh,

On Fri, 4 Mar 2011, Rajendra Nayak wrote:

> On Thursday 03 March 2011 06:00 PM, Rajendra Nayak wrote:
>  
> > Also some more testing showed up a lockup in suspend on OMAP4 which I
> > could narrow down to a similar case with GPT1. Either keeping the
> > staticdep between MPU and L4_WKUP _or_ forcing GPT1 to use software
> > idle control seems to help.
> 
> This however is still not rootcaused and is not the same as the issue
> seen with i2c as the WE for GPT1 is already programmed for enabling
> wakeup.
> 
> The one way to fix this for now is to put GPT1 block in software
> controlled idle as was done by your test patch for i2c.

OK, thanks for the update.

Benoît, do you have any more OMAP4 hwmod patches for 2.6.39?  If not, want 
to send an Acked-by:, and either Tony or I will take this one?


- Paul

> ---
> From fde94c22bb2db233b0b0cc4c2024d6f4e9f95257 Mon Sep 17 00:00:00 2001
> From: Rajendra Nayak <rnayak@ti.com>
> Date: Fri, 4 Mar 2011 19:33:45 +0530
> Subject: [PATCH] OMAP4: hwmod: Disable hardware-controlled idle for GPT1
> 
> Some issues seen (which cause lockups in suspend) with GPT1
> after the MPU<->L4_WKUP static dependency was cleared can be
> Worked-around for now by forcing GPT1 in software
> controlled idle.
> 
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> ---
>  arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index 2c58827..9317a05 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -3989,7 +3989,7 @@ static struct omap_hwmod_ocp_if
> *omap44xx_timer1_slaves[] = {
>  static struct omap_hwmod omap44xx_timer1_hwmod = {
>         .name           = "timer1",
>         .class          = &omap44xx_timer_1ms_hwmod_class,
> -       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
> +       .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |
> HWMOD_SWSUP_SIDLE,
>         .mpu_irqs       = omap44xx_timer1_irqs,
>         .mpu_irqs_cnt   = ARRAY_SIZE(omap44xx_timer1_irqs),
>         .main_clk       = "timer1_fck",
> -- 
> 1.7.0.4


- Paul