gpio: tegra: Fix wake interrupt
Subsystems (2)
PATCH 1/2 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.
--- drivers/gpio/gpio-tegra.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/gpio/gpio-tegra.c +13 -3
@@ -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
Signature · 1 line
2.29.2
PATCH 2/2 gpio: tegra: Add dependency on GPIOLIB_IRQCHIP
Add dependency on GPIOLIB_IRQCHIP in order to fix driver compilation.
--- drivers/gpio/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/Kconfig +1 -0
@@ -597,6 +597,7 @@ config GPIO_TEGRA default ARCH_TEGRA depends on ARCH_TEGRA || COMPILE_TEST depends on OF_GPIO + select GPIOLIB_IRQCHIP help Say yes here to support GPIO pins on NVIDIA Tegra SoCs.
Signature · 1 line
2.29.2
Re: [PATCH v1 2/2] gpio: tegra: Add dependency on GPIOLIB_IRQCHIP
Quoted 5 lines · Dmitry Osipenko
Add dependency on
GPIOLIB_IRQCHIPin order to fix driver compilation.Fixes efcdca286eef ("gpio: tegra: Convert to gpio_irq_chip")Reported-by Matt Merhar <[email protected]>Signed-off-by Dmitry Osipenko <[email protected]>
Yours,
Linus Walleij
Bartosz Golaszewski
AppliedRe: [PATCH v1 2/2] gpio: tegra: Add dependency on GPIOLIB_IRQCHIP
In reply to Dmitry OsipenkoQuoted 23 lines · Dmitry Osipenko
Add dependency on
GPIOLIB_IRQCHIPin order to fix driver compilation.Fixes efcdca286eef ("gpio: tegra: Convert to gpio_irq_chip")Reported-by Matt Merhar <[email protected]>Signed-off-by Dmitry Osipenko <[email protected]>--- drivers/gpio/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/gpio/Kconfig +1
-1@@ -597,6 +597,7 @@ config GPIO_TEGRA default ARCH_TEGRA depends on ARCH_TEGRA || COMPILE_TEST depends on OF_GPIO + select GPIOLIB_IRQCHIP help Say yes here to support GPIO pins on NVIDIA Tegra SoCs. --
Quoted 2 lines
2.29.2
Applied, thanks!
Bartosz
Quoted 8 lines · Dmitry Osipenko
The GPIO bank wake interrupt setting was erroneously removed after conversion to
gpio_irq_chip, thus the wake interrupt programming is broken now. Secondly, thewake_enbof 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 Dmitry Osipenko <[email protected]>
Yours,
Linus Walleij
Bartosz Golaszewski
AppliedQuoted 53 lines · Dmitry Osipenko
The GPIO bank wake interrupt setting was erroneously removed after conversion to
gpio_irq_chip, thus the wake interrupt programming is broken now. Secondly, thewake_enbof 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 Dmitry Osipenko <[email protected]>--- drivers/gpio/gpio-tegra.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)drivers/gpio/gpio-tegra.c +13
-4@@ -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 --
Quoted 2 lines
2.29.2
Applied, thanks!
Bartosz