gpio: rockchip: Reset int_bothedge when changing trigger

[ Upstream commit 7920af5c826cb4a7ada1ae26fdd317642805adc2 ]

With v2 hardware, an IRQ can be configured to trigger on both edges via
a bit in the int_bothedge register. Currently, the driver sets this bit
when changing the trigger type to IRQ_TYPE_EDGE_BOTH, but fails to reset
this bit if the trigger type is later changed to something else. This
causes spurious IRQs, and when using gpio-keys with wakeup-event-action
set to EV_ACT_(DE)ASSERTED, those IRQs translate into spurious wakeups.

Fixes: 3bcbd1a85b68 ("gpio/rockchip: support next version gpio controller")
Reported-by: Guillaume Savaton <guillaume@baierouge.fr>
Tested-by: Guillaume Savaton <guillaume@baierouge.fr>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
index ce63cbd14d69a0444b277f638d70c9303ad58523..24155c038f6d0f3ee8cce556451ea86a65641786 100644 (file)
--- a/drivers/gpio/gpio-rockchip.c
+++ b/drivers/gpio/gpio-rockchip.c
@@ -410,10 +410,8 @@ static int rockchip_irq_set_type(struct irq_data *d, unsigned int type)
        level = rockchip_gpio_readl(bank, bank->gpio_regs->int_type);
        polarity = rockchip_gpio_readl(bank, bank->gpio_regs->int_polarity);
 
-       switch (type) {
-       case IRQ_TYPE_EDGE_BOTH:
+       if (type == IRQ_TYPE_EDGE_BOTH) {
                if (bank->gpio_type == GPIO_TYPE_V2) {
-                       bank->toggle_edge_mode &= ~mask;
                        rockchip_gpio_writel_bit(bank, d->hwirq, 1,
                                                 bank->gpio_regs->int_bothedge);
                        goto out;
@@ -431,30 +429,34 @@ static int rockchip_irq_set_type(struct irq_data *d, unsigned int type)
                        else
                                polarity |= mask;
                }
-               break;
-       case IRQ_TYPE_EDGE_RISING:
-               bank->toggle_edge_mode &= ~mask;
-               level |= mask;
-               polarity |= mask;
-               break;
-       case IRQ_TYPE_EDGE_FALLING:
-               bank->toggle_edge_mode &= ~mask;
-               level |= mask;
-               polarity &= ~mask;
-               break;
-       case IRQ_TYPE_LEVEL_HIGH:
-               bank->toggle_edge_mode &= ~mask;
-               level &= ~mask;
-               polarity |= mask;
-               break;
-       case IRQ_TYPE_LEVEL_LOW:
-               bank->toggle_edge_mode &= ~mask;
-               level &= ~mask;
-               polarity &= ~mask;
-               break;
-       default:
-               ret = -EINVAL;
-               goto out;
+       } else {
+               if (bank->gpio_type == GPIO_TYPE_V2) {
+                       rockchip_gpio_writel_bit(bank, d->hwirq, 0,
+                                                bank->gpio_regs->int_bothedge);
+               } else {
+                       bank->toggle_edge_mode &= ~mask;
+               }
+               switch (type) {
+               case IRQ_TYPE_EDGE_RISING:
+                       level |= mask;
+                       polarity |= mask;
+                       break;
+               case IRQ_TYPE_EDGE_FALLING:
+                       level |= mask;
+                       polarity &= ~mask;
+                       break;
+               case IRQ_TYPE_LEVEL_HIGH:
+                       level &= ~mask;
+                       polarity |= mask;
+                       break;
+               case IRQ_TYPE_LEVEL_LOW:
+                       level &= ~mask;
+                       polarity &= ~mask;
+                       break;
+               default:
+                       ret = -EINVAL;
+                       goto out;
+               }
        }
 
        rockchip_gpio_writel(bank, level, bank->gpio_regs->int_type);