Commit c859e0d4 authored by Russell King's avatar Russell King Committed by Linus Walleij
Browse files

gpio: omap: ensure irq is enabled before wakeup 



Documentation states:

  NOTE: There must be a correlation between the wake-up enable and
  interrupt-enable registers. If a GPIO pin has a wake-up configured
  on it, it must also have the corresponding interrupt enabled (on
  one of the two interrupt lines).

Ensure that this condition is always satisfied by enabling the detection
events after enabling the interrupt, and disabling the detection before
disabling the interrupt.  This ensures interrupt/wakeup events can not
happen until both the wakeup and interrupt enables correlate.

If we do any clearing, clear between the interrupt enable/disable and
trigger setting.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 74a36e4a

drivers/gpio/gpio-omap.c

+8 −7
Original line number Diff line number Diff line
@@ -832,9 +832,9 @@ static void omap_gpio_irq_shutdown(struct irq_data *d) 


	raw_spin_lock_irqsave(&bank->lock, flags);

	bank->irq_usage &= ~(BIT(offset));

	omap_set_gpio_irqenable(bank, offset, 0);

	omap_clear_gpio_irqstatus(bank, offset);

	omap_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE);

	omap_clear_gpio_irqstatus(bank, offset);

	omap_set_gpio_irqenable(bank, offset, 0);

	if (!LINE_USED(bank->mod_usage, offset))

		omap_clear_gpio_debounce(bank, offset);

	omap_disable_gpio_module(bank, offset);
@@ -870,8 +870,8 @@ static void omap_gpio_mask_irq(struct irq_data *d) 
	unsigned long flags;



	raw_spin_lock_irqsave(&bank->lock, flags);

	omap_set_gpio_irqenable(bank, offset, 0);

	omap_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE);

	omap_set_gpio_irqenable(bank, offset, 0);

	raw_spin_unlock_irqrestore(&bank->lock, flags);

}
@@ -883,9 +883,6 @@ static void omap_gpio_unmask_irq(struct irq_data *d) 
	unsigned long flags;



	raw_spin_lock_irqsave(&bank->lock, flags);

	if (trigger)

		omap_set_gpio_triggering(bank, offset, trigger);



	omap_set_gpio_irqenable(bank, offset, 1);



	/*
@@ -893,9 +890,13 @@ static void omap_gpio_unmask_irq(struct irq_data *d) 
	 * is cleared, thus after the handler has run. OMAP4 needs this done

	 * after enabing the interrupt to clear the wakeup status.

	 */

	if (bank->level_mask & BIT(offset))

	if (bank->regs->leveldetect0 && bank->regs->wkup_en &&

	    trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))

		omap_clear_gpio_irqstatus(bank, offset);



	if (trigger)

		omap_set_gpio_triggering(bank, offset, trigger);



	raw_spin_unlock_irqrestore(&bank->lock, flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE