Commit 27f8feea authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Bartosz Golaszewski
Browse files

gpio: tegra: Fix wake interrupt 



The GPIO bank wake interrupt setting was erroneously removed after
conversion to gpio_irq_chip, thus the wake interrupt programming is
broken now. Secondly, the wake_enb of the GPIO driver should be changed
only after the successful toggling of the IRQ wake-state. Restore the wake
interrupt setting and the programming order.

Fixes: efcdca286eef ("gpio: tegra: Convert to gpio_irq_chip")
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 9067b301

drivers/gpio/gpio-tegra.c

+13 −3
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ static int tegra_gpio_irq_set_wake(struct irq_data *d, unsigned int enable) 
	struct tegra_gpio_bank *bank;

	unsigned int gpio = d->hwirq;

	u32 port, bit, mask;

	int err;



	bank = &tgi->bank_info[GPIO_BANK(d->hwirq)];
@@ -548,14 +549,23 @@ static int tegra_gpio_irq_set_wake(struct irq_data *d, unsigned int enable) 
	bit = GPIO_BIT(gpio);

	mask = BIT(bit);



	err = irq_set_irq_wake(tgi->irqs[bank->bank], enable);

	if (err)

		return err;



	if (d->parent_data) {

		err = irq_chip_set_wake_parent(d, enable);

		if (err) {

			irq_set_irq_wake(tgi->irqs[bank->bank], !enable);

			return err;

		}

	}



	if (enable)

		bank->wake_enb[port] |= mask;

	else

		bank->wake_enb[port] &= ~mask;



	if (d->parent_data)

		return irq_chip_set_wake_parent(d, enable);



	return 0;

}

#endif