regmap: irq: Allow to acknowledge masked interrupts during initialization

In case the hardware interrupt mask register does not prevent the chip level
irq from being asserted by the corresponding interrupt status bit, already
set interrupt bits should to be cleared once after masking them during
initialization. Add a flag to let drivers enable this behavior.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 1643e889bafc7ad7ef3f7ce1d60f60e8be930d79..d10456ffd811f5acc7da0dcd23979b1408d736a9 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -418,6 +418,31 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
                                reg, ret);
                        goto err_alloc;
                }
+
+               if (!chip->init_ack_masked)
+                       continue;
+
+               /* Ack masked but set interrupts */
+               reg = chip->status_base +
+                       (i * map->reg_stride * d->irq_reg_stride);
+               ret = regmap_read(map, reg, &d->status_buf[i]);
+               if (ret != 0) {
+                       dev_err(map->dev, "Failed to read IRQ status: %d\n",
+                               ret);
+                       goto err_alloc;
+               }
+
+               if (d->status_buf[i] && chip->ack_base) {
+                       reg = chip->ack_base +
+                               (i * map->reg_stride * d->irq_reg_stride);
+                       ret = regmap_write(map, reg,
+                                       d->status_buf[i] & d->mask_buf[i]);
+                       if (ret != 0) {
+                               dev_err(map->dev, "Failed to ack 0x%x: %d\n",
+                                       reg, ret);
+                               goto err_alloc;
+                       }
+               }
        }
 
        /* Wake is disabled by default */

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 75981d0b57dccd4b6a3b5e9833557973f33d9404..34ebe7778033c0ece0ccc11a67c5c003adfa8f7c 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -470,6 +470,7 @@ struct regmap_irq {
  * @ack_base:    Base ack address.  If zero then the chip is clear on read.
  * @wake_base:   Base address for wake enables.  If zero unsupported.
  * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.
+ * @init_ack_masked: Ack all masked interrupts once during initalization.
  * @runtime_pm:  Hold a runtime PM lock on the device when accessing it.
  *
  * @num_regs:    Number of registers in each control bank.
@@ -485,6 +486,7 @@ struct regmap_irq_chip {
        unsigned int ack_base;
        unsigned int wake_base;
        unsigned int irq_reg_stride;
+       bool init_ack_masked;
        unsigned int mask_invert;
        unsigned int wake_invert;
        bool runtime_pm;