public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Tero Kristo <tero.kristo@nokia.com>, linux-omap@vger.kernel.org
Subject: Re: [PATCH] OMAP3: Fixes for suspend / resume GPIO wake-up handling
Date: Wed, 26 Nov 2008 14:37:39 -0800	[thread overview]
Message-ID: <20081126223736.GH11997@atomide.com> (raw)
In-Reply-To: <87bpw2jozi.fsf@deeprootsystems.com>

* Kevin Hilman <khilman@deeprootsystems.com> [081126 10:56]:
> Tero Kristo <tero.kristo@nokia.com> writes:
> 
> > Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
> > ---
> >  arch/arm/plat-omap/gpio.c |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> Thanks, I'll pull this into the next PM branch, and this
> can go straight into linux-omap.
>
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

Pushing to l-o and adding to omap-fixes queue.

Tony


> > diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
> > index f4ec3af..62349fd 100644
> > --- a/arch/arm/plat-omap/gpio.c
> > +++ b/arch/arm/plat-omap/gpio.c
> > @@ -1585,7 +1585,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
> >  #endif
> >  #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
> >  		case METHOD_GPIO_24XX:
> > -			wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA;
> > +			wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
> >  			wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
> >  			wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
> >  			break;
> > @@ -1608,7 +1608,7 @@ static int omap_gpio_resume(struct sys_device *dev)
> >  {
> >  	int i;
> >  
> > -	if (!cpu_is_omap24xx() && !cpu_is_omap16xx())
> > +	if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
> >  		return 0;
> >  
> >  	for (i = 0; i < gpio_bank_count; i++) {
> > -- 
> > 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
> --
> 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

      reply	other threads:[~2008-11-26 22:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-26 11:47 [PATCH] OMAP3: Fixes for suspend / resume GPIO wake-up handling Tero Kristo
2008-11-26 18:56 ` Kevin Hilman
2008-11-26 22:37   ` Tony Lindgren [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081126223736.GH11997@atomide.com \
    --to=tony@atomide.com \
    --cc=khilman@deeprootsystems.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=tero.kristo@nokia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox