regmap: irq: Support wake IRQ mask inversion

Support devices which have an enable rather than mask register for wake
sources.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index be5579964be06ecb852badebb9481e26b046d25a..4706c63d0bc63fdc8d9bdba1e96d3e1cb543a806 100644 (file)
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -92,8 +92,14 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
                reg = d->chip->wake_base +
                        (i * map->reg_stride * d->irq_reg_stride);
                if (d->wake_buf) {
-                       ret = regmap_update_bits(d->map, reg,
-                                        d->mask_buf_def[i], d->wake_buf[i]);
+                       if (d->chip->wake_invert)
+                               ret = regmap_update_bits(d->map, reg,
+                                                        d->mask_buf_def[i],
+                                                        ~d->wake_buf[i]);
+                       else
+                               ret = regmap_update_bits(d->map, reg,
+                                                        d->mask_buf_def[i],
+                                                        d->wake_buf[i]);
                        if (ret != 0)
                                dev_err(d->map->dev,
                                        "Failed to sync wakes in %x: %d\n",
@@ -419,8 +425,15 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
                        d->wake_buf[i] = d->mask_buf_def[i];
                        reg = chip->wake_base +
                                (i * map->reg_stride * d->irq_reg_stride);
-                       ret = regmap_update_bits(map, reg, d->wake_buf[i],
-                                                d->wake_buf[i]);
+
+                       if (chip->wake_invert)
+                               ret = regmap_update_bits(map, reg,
+                                                        d->mask_buf_def[i],
+                                                        0);
+                       else
+                               ret = regmap_update_bits(map, reg,
+                                                        d->mask_buf_def[i],
+                                                        d->wake_buf[i]);
                        if (ret != 0) {
                                dev_err(map->dev, "Failed to set masks in 0x%x: %d\n",
                                        reg, ret);

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index b7e95bf942c9ce8936f61c61efb0261f9c09ad37..8c0b50df3d593aa5dde9672084e95f5b6d8869c8 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -381,6 +381,7 @@ struct regmap_irq_chip {
        unsigned int wake_base;
        unsigned int irq_reg_stride;
        unsigned int mask_invert;
+       unsigned int wake_invert;
        bool runtime_pm;
 
        int num_regs;