Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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: Tero Kristo <tero.kristo@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
authored by Tero Kristo and committed by Tony Lindgren 723fdb78 147dcf54
+3
-2
arch/arm/plat-omap/gpio.c
+3
-2
arch/arm/plat-omap/gpio.c
···
101
101
#define OMAP24XX_GPIO_IRQSTATUS2 0x0028
102
102
#define OMAP24XX_GPIO_IRQENABLE2 0x002c
103
103
#define OMAP24XX_GPIO_IRQENABLE1 0x001c
104
+
#define OMAP24XX_GPIO_WAKE_EN 0x0020
104
105
#define OMAP24XX_GPIO_CTRL 0x0030
105
106
#define OMAP24XX_GPIO_OE 0x0034
106
107
#define OMAP24XX_GPIO_DATAIN 0x0038
···
1552
1551
#endif
1553
1552
#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
1554
1553
case METHOD_GPIO_24XX:
1555
-
wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA;
1554
+
wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
1556
1555
wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
1557
1556
wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
1558
1557
break;
···
1575
1574
{
1576
1575
int i;
1577
1576
1578
-
if (!cpu_is_omap24xx() && !cpu_is_omap16xx())
1577
+
if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
1579
1578
return 0;
1580
1579
1581
1580
for (i = 0; i < gpio_bank_count; i++) {