regmap: irq: Fix sync of wake statuses to hardware
Subsystems (4)
PATCH 1/4 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 <[email protected]>
--- drivers/base/regmap/regmap-irq.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/base/regmap/regmap-irq.c +11 -0
@@ -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)
Signature · 1 line
1.7.10.4
PATCH 2/4 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 <[email protected]>
--- drivers/base/regmap/regmap-irq.c | 21 +++++++++++++++++---- include/linux/regmap.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/base/regmap/regmap-irq.c +17 -4
@@ -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",
@@ -417,8 +423,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);
include/linux/regmap.h +1 -0
@@ -382,6 +382,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;
Signature · 1 line
1.7.10.4
PATCH 3/4 mfd: wm5110: Mark wakes as inverted
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
---
Seems sensible to merge this via regmap given that it uses the new feature?
drivers/mfd/wm5110-tables.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/wm5110-tables.c +1 -0
@@ -255,6 +255,7 @@ const struct regmap_irq_chip wm5110_aod = { .mask_base = ARIZONA_AOD_IRQ_MASK_IRQ1, .ack_base = ARIZONA_AOD_IRQ1, .wake_base = ARIZONA_WAKE_CONTROL, + .wake_invert = 1, .num_regs = 1, .irqs = wm5110_aod_irqs, .num_irqs = ARRAY_SIZE(wm5110_aod_irqs),
Signature · 1 line
1.7.10.4
Re: [PATCH 3/4] mfd: wm5110: Mark wakes as inverted
Hi Mark,
Quoted 5 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>---
Seems sensible to merge this via regmap given that it uses the new feature?
Definitely:
Acked-by Samuel Ortiz <[email protected]>
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH 4/4 mfd: wm5102: Mark wakes as inverted
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
---
Seems sensible to merge this via regmap given that it uses the new feature?
drivers/mfd/wm5102-tables.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/wm5102-tables.c +1 -0
@@ -103,6 +103,7 @@ const struct regmap_irq_chip wm5102_aod = { .mask_base = ARIZONA_AOD_IRQ_MASK_IRQ1, .ack_base = ARIZONA_AOD_IRQ1, .wake_base = ARIZONA_WAKE_CONTROL, + .wake_invert = 1, .num_regs = 1, .irqs = wm5102_aod_irqs, .num_irqs = ARRAY_SIZE(wm5102_aod_irqs),
Signature · 1 line
1.7.10.4