Skip to content

Commit a236805

Browse files
jwrdegoedeandy-shev
authored andcommitted
pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins
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 <[email protected]> Acked-by: Mika Westerberg <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent f068275 commit a236805

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/pinctrl/intel/pinctrl-baytrail.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,13 @@ static void byt_gpio_clear_triggering(struct intel_pinctrl *vg, unsigned int off
742742

743743
raw_spin_lock_irqsave(&byt_lock, flags);
744744
value = readl(reg);
745-
value &= ~(BYT_TRIG_POS | BYT_TRIG_NEG | BYT_TRIG_LVL);
745+
746+
/* Do not clear direct-irq enabled IRQs (from gpio_disable_free) */
747+
if (value & BYT_DIRECT_IRQ_EN)
748+
/* nothing to do */ ;
749+
else
750+
value &= ~(BYT_TRIG_POS | BYT_TRIG_NEG | BYT_TRIG_LVL);
751+
746752
writel(value, reg);
747753
raw_spin_unlock_irqrestore(&byt_lock, flags);
748754
}

0 commit comments

Comments
 (0)