* Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> [081126 10:56]:
> Tero Kristo <tero.kristo@xxxxxxxxx> writes:
>
> > Signed-off-by: Tero Kristo <tero.kristo@xxxxxxxxx>
> > ---
> > 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@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
> > 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@xxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
