ARM: OMAP2/3: GPIO: do not attempt to wake-enable (b3bb4f68) · Commits · 戴 / test

The GPIO IRQ enable/disable path attempts to also enable IRQ wake support for the parent GPIO bank IRQ as well. However, since there is no 'set_wake' hook for the bank IRQs, these calls will always fail. Also, since the enable will fail on the suspend path, the disable on the resume path will trigger unbalanced enable/disable warnings. This was discovered in the suspend/resume path on OMAP3/Beagle using the gpio-keys driver which disables/re-enables GPIO IRQ wakeups in the suspend/resume path. Signed-off-by:

Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/plat-omap/gpio.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -921,13 +921,10 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
		case METHOD_MPUIO:
		case METHOD_GPIO_1610:
		spin_lock_irqsave(&bank->lock, flags);
		if (enable) {
		if (enable)
		bank->suspend_wakeup \|= (1 << gpio);
		enable_irq_wake(bank->irq);
		} else {
		disable_irq_wake(bank->irq);
		else
		bank->suspend_wakeup &= ~(1 << gpio);
		}
		spin_unlock_irqrestore(&bank->lock, flags);
		return 0;
		#endif
		@@ -940,13 +937,10 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
		return -EINVAL;
		}
		spin_lock_irqsave(&bank->lock, flags);
		if (enable) {
		if (enable)
		bank->suspend_wakeup \|= (1 << gpio);
		enable_irq_wake(bank->irq);
		} else {
		disable_irq_wake(bank->irq);
		else
		bank->suspend_wakeup &= ~(1 << gpio);
		}
		spin_unlock_irqrestore(&bank->lock, flags);
		return 0;
		#endif

Admin message