summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-04 16:32:54 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-04 20:53:43 +0000
commit33be49324f7f3e9dff10d3d07a5c78ee82f8d54e (patch)
tree81bcda95ea2a86cb02a8004095ecf5d19c727f28 /drivers/base
parenta7440eaa90cf2659920b9b28973cc1a13a2b331f (diff)
downloadop-kernel-dev-33be49324f7f3e9dff10d3d07a5c78ee82f8d54e.zip
op-kernel-dev-33be49324f7f3e9dff10d3d07a5c78ee82f8d54e.tar.gz
regmap: irq: Fix sync of wake statuses to hardware
This wasn't implemented but happened to work on test systems due to lack of wake mask inversion support. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap-irq.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index aaf599a..be55799 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -88,6 +88,17 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
if (ret != 0)
dev_err(d->map->dev, "Failed to sync masks in %x\n",
reg);
+
+ 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 (ret != 0)
+ dev_err(d->map->dev,
+ "Failed to sync wakes in %x: %d\n",
+ reg, ret);
+ }
}
if (d->chip->runtime_pm)
OpenPOWER on IntegriCloud