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

["Cousson, Benoit" <b-cousson@ti.com>]

Hi Rajendra,

On 3/4/2011 3:08 PM, Nayak, Rajendra wrote:
> Hi Paul,

[...]

> 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.
>
> ---
>   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

Maybe we should emphasis the temporary need for this commit to avoid 
forgetting it?

> 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,

I was wondering why the previous flags were still there, but it looks 
like the revert was not done.

I'll push it with the revert for the flags.

Where is the Santosh's branch that should be rebased on top of that one?

Benoit