pinctrl: intel: Clear interrupt status in mask/unmask callback

Commit a939bb57cd47 ("pinctrl: intel: implement gpio_irq_enable") was
added because clearing interrupt status bit is required to avoid
unexpected behavior.

Turns out the unmask callback also needs the fix, which can solve weird
IRQ triggering issues on I2C touchpad ELAN1200.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 68950508bfd25d98ccf4c136c168528a75b7ca28..a18d6eefe67264e00e0cf1a2e91008bc068861c5 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -914,35 +914,6 @@ static void intel_gpio_irq_ack(struct irq_data *d)
        }
 }
 
-static void intel_gpio_irq_enable(struct irq_data *d)
-{
-       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-       struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
-       const struct intel_community *community;
-       const struct intel_padgroup *padgrp;
-       int pin;
-
-       pin = intel_gpio_to_pin(pctrl, irqd_to_hwirq(d), &community, &padgrp);
-       if (pin >= 0) {
-               unsigned int gpp, gpp_offset, is_offset;
-               unsigned long flags;
-               u32 value;
-
-               gpp = padgrp->reg_num;
-               gpp_offset = padgroup_offset(padgrp, pin);
-               is_offset = community->is_offset + gpp * 4;
-
-               raw_spin_lock_irqsave(&pctrl->lock, flags);
-               /* Clear interrupt status first to avoid unexpected interrupt */
-               writel(BIT(gpp_offset), community->regs + is_offset);
-
-               value = readl(community->regs + community->ie_offset + gpp * 4);
-               value |= BIT(gpp_offset);
-               writel(value, community->regs + community->ie_offset + gpp * 4);
-               raw_spin_unlock_irqrestore(&pctrl->lock, flags);
-       }
-}
-
 static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
@@ -955,15 +926,20 @@ static void intel_gpio_irq_mask_unmask(struct irq_data *d, bool mask)
        if (pin >= 0) {
                unsigned int gpp, gpp_offset;
                unsigned long flags;
-               void __iomem *reg;
+               void __iomem *reg, *is;
                u32 value;
 
                gpp = padgrp->reg_num;
                gpp_offset = padgroup_offset(padgrp, pin);
 
                reg = community->regs + community->ie_offset + gpp * 4;
+               is = community->regs + community->is_offset + gpp * 4;
 
                raw_spin_lock_irqsave(&pctrl->lock, flags);
+
+               /* Clear interrupt status first to avoid unexpected interrupt */
+               writel(BIT(gpp_offset), is);
+
                value = readl(reg);
                if (mask)
                        value &= ~BIT(gpp_offset);
@@ -1107,7 +1083,6 @@ static irqreturn_t intel_gpio_irq(int irq, void *data)
 
 static struct irq_chip intel_gpio_irqchip = {
        .name = "intel-gpio",
-       .irq_enable = intel_gpio_irq_enable,
        .irq_ack = intel_gpio_irq_ack,
        .irq_mask = intel_gpio_irq_mask,
        .irq_unmask = intel_gpio_irq_unmask,