Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 723fdb78 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling 



Use the correct wake-up enable register, and make it
work with 34xx also.

Signed-off-by: default avatarTero Kristo <tero.kristo@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 147dcf54

arch/arm/plat-omap/gpio.c

+3 −2
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#define OMAP24XX_GPIO_IRQSTATUS2	0x0028

#define OMAP24XX_GPIO_IRQENABLE2	0x002c

#define OMAP24XX_GPIO_IRQENABLE1	0x001c

#define OMAP24XX_GPIO_WAKE_EN		0x0020

#define OMAP24XX_GPIO_CTRL		0x0030

#define OMAP24XX_GPIO_OE		0x0034

#define OMAP24XX_GPIO_DATAIN		0x0038
@@ -1551,7 +1552,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;
@@ -1574,7 +1575,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++) {