Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2753e6f8207355ab72574d48287cec187272a151

Authored by Philipp Zabel
Committed by Mark Brown
1 parent 3b2f64d00c
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 27 additions and 0 deletions Side-by-side Diff

drivers/base/regmap/regmap-irq.c
Diff comments   View file @ 2753e6f
... ... @@ -418,6 +418,31 @@
418 418 reg, ret);
419 419 goto err_alloc;
420 420 }
  421 +
  422 + if (!chip->init_ack_masked)
  423 + continue;
  424 +
  425 + /* Ack masked but set interrupts */
  426 + reg = chip->status_base +
  427 + (i * map->reg_stride * d->irq_reg_stride);
  428 + ret = regmap_read(map, reg, &d->status_buf[i]);
  429 + if (ret != 0) {
  430 + dev_err(map->dev, "Failed to read IRQ status: %d\n",
  431 + ret);
  432 + goto err_alloc;
  433 + }
  434 +
  435 + if (d->status_buf[i] && chip->ack_base) {
  436 + reg = chip->ack_base +
  437 + (i * map->reg_stride * d->irq_reg_stride);
  438 + ret = regmap_write(map, reg,
  439 + d->status_buf[i] & d->mask_buf[i]);
  440 + if (ret != 0) {
  441 + dev_err(map->dev, "Failed to ack 0x%x: %d\n",
  442 + reg, ret);
  443 + goto err_alloc;
  444 + }
  445 + }
421 446 }
422 447  
423 448 /* Wake is disabled by default */
include/linux/regmap.h
Diff comments   View file @ 2753e6f
... ... @@ -470,6 +470,7 @@
470 470 * @ack_base: Base ack address. If zero then the chip is clear on read.
471 471 * @wake_base: Base address for wake enables. If zero unsupported.
472 472 * @irq_reg_stride: Stride to use for chips where registers are not contiguous.
  473 + * @init_ack_masked: Ack all masked interrupts once during initalization.
473 474 * @runtime_pm: Hold a runtime PM lock on the device when accessing it.
474 475 *
475 476 * @num_regs: Number of registers in each control bank.
... ... @@ -485,6 +486,7 @@
485 486 unsigned int ack_base;
486 487 unsigned int wake_base;
487 488 unsigned int irq_reg_stride;
  489 + bool init_ack_masked;
488 490 unsigned int mask_invert;
489 491 unsigned int wake_invert;
490 492 bool runtime_pm;