blob: 10c3e4baa71cb16bc0342bcec686f621b6bec1e5 [file] [log] [blame]
From 5942d982902a3ca91b8f284e67d3db4e4a7e1834 Mon Sep 17 00:00:00 2001
From: Hans de Goede <>
Date: Sat, 28 Dec 2019 00:04:47 +0100
Subject: [PATCH] pinctrl: baytrail: Do not clear IRQ flags on direct-irq
enabled pins
commit a23680594da7a9e2696dbcf4f023e9273e2fa40b upstream.
Suspending Goodix touchscreens requires changing the interrupt pin to
output before sending them a power-down command. Followed by wiggling
the interrupt pin to wake the device up, after which it is put back
in input mode.
On Bay Trail devices with a Goodix touchscreen direct-irq mode is used
in combination with listing the pin as a normal GpioIo resource.
This works fine, until the goodix driver gets rmmod-ed and then insmod-ed
again. In this case byt_gpio_disable_free() calls
byt_gpio_clear_triggering() which clears the IRQ flags and after that the
(direct) IRQ no longer triggers.
This commit fixes this by adding a check for the BYT_DIRECT_IRQ_EN flag
to byt_gpio_clear_triggering().
Note that byt_gpio_clear_triggering() only gets called from
byt_gpio_disable_free() for direct-irq enabled pins, as these are excluded
from the irq_valid mask by byt_init_irq_valid_mask().
Signed-off-by: Hans de Goede <>
Acked-by: Mika Westerberg <>
Reviewed-by: Linus Walleij <>
Signed-off-by: Andy Shevchenko <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index e1cd1d44fdde..69061ec8bdea 100644
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -951,7 +951,13 @@ static void byt_gpio_clear_triggering(struct byt_gpio *vg, unsigned int offset)
raw_spin_lock_irqsave(&byt_lock, flags);
value = readl(reg);
+ /* Do not clear direct-irq enabled IRQs (from gpio_disable_free) */
+ if (value & BYT_DIRECT_IRQ_EN)
+ /* nothing to do */ ;
+ else
writel(value, reg);
raw_spin_unlock_irqrestore(&byt_lock, flags);