Merge tag 'regmap-irq-unmask' into regmap-next

regmap: Support for split mask and unmask interrupt registers

This branch adds an interface for supporting devices which have separate
mask and unmask registers.

# gpg: Signature made Thu 17 Sep 2015 11:52:20 BST using RSA key ID 5D5487D0
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: key 00000000 occurs more than once in the trustdb
# gpg: key 16005C11: no public key for trusted key - skipped
# gpg: key 16005C11 marked as ultimately trusted
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"

1 files changed, 38 insertions, 5 deletions

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 38d1f72d869c..8d16db533527 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -63,6 +63,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
         struct regmap *map = d->map;
         int i, ret;
         u32 reg;
+        u32 unmask_offset;
 
         if (d->chip->runtime_pm) {
                 ret = pm_runtime_get_sync(map->dev);
@@ -79,12 +80,28 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
         for (i = 0; i < d->chip->num_regs; i++) {
                 reg = d->chip->mask_base +
                         (i * map->reg_stride * d->irq_reg_stride);
-                if (d->chip->mask_invert)
+                if (d->chip->mask_invert) {
                         ret = regmap_update_bits(d->map, reg,
                                          d->mask_buf_def[i], ~d->mask_buf[i]);
-                else
+                } else if (d->chip->unmask_base) {
+                        /* set mask with mask_base register */
+                        ret = regmap_update_bits(d->map, reg,
+                                        d->mask_buf_def[i], ~d->mask_buf[i]);
+                        if (ret < 0)
+                                dev_err(d->map->dev,
+                                        "Failed to sync unmasks in %x\n",
+                                        reg);
+                        unmask_offset = d->chip->unmask_base -
+                                                        d->chip->mask_base;
+                        /* clear mask with unmask_base register */
+                        ret = regmap_update_bits(d->map,
+                                        reg + unmask_offset,
+                                        d->mask_buf_def[i],
+                                        d->mask_buf[i]);
+                } else {
                         ret = regmap_update_bits(d->map, reg,
                                          d->mask_buf_def[i], d->mask_buf[i]);
+                }
                 if (ret != 0)
                         dev_err(d->map->dev, "Failed to sync masks in %x\n",
                                 reg);
@@ -116,7 +133,11 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
                 if (d->mask_buf[i] && (d->chip->ack_base || d->chip->use_ack)) {
                         reg = d->chip->ack_base +
                                 (i * map->reg_stride * d->irq_reg_stride);
-                        ret = regmap_write(map, reg, d->mask_buf[i]);
+                        /* some chips ack by write 0 */
+                        if (d->chip->ack_invert)
+                                ret = regmap_write(map, reg, ~d->mask_buf[i]);
+                        else
+                                ret = regmap_write(map, reg, d->mask_buf[i]);
                         if (ret != 0)
                                 dev_err(d->map->dev, "Failed to ack 0x%x: %d\n",
                                         reg, ret);
@@ -339,6 +360,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
         int i;
         int ret = -ENOMEM;
         u32 reg;
+        u32 unmask_offset;
 
         if (chip->num_regs <= 0)
                 return -EINVAL;
@@ -420,7 +442,14 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
                 if (chip->mask_invert)
                         ret = regmap_update_bits(map, reg,
                                          d->mask_buf[i], ~d->mask_buf[i]);
-                else
+                else if (d->chip->unmask_base) {
+                        unmask_offset = d->chip->unmask_base -
+                                        d->chip->mask_base;
+                        ret = regmap_update_bits(d->map,
+                                        reg + unmask_offset,
+                                        d->mask_buf[i],
+                                        d->mask_buf[i]);
+                } else
                         ret = regmap_update_bits(map, reg,
                                          d->mask_buf[i], d->mask_buf[i]);
                 if (ret != 0) {
@@ -445,7 +474,11 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
                 if (d->status_buf[i] && (chip->ack_base || chip->use_ack)) {
                         reg = chip->ack_base +
                                 (i * map->reg_stride * d->irq_reg_stride);
-                        ret = regmap_write(map, reg,
+                        if (chip->ack_invert)
+                                ret = regmap_write(map, reg,
+                                        ~(d->status_buf[i] & d->mask_buf[i]));
+                        else
+                                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",