Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge remote-tracking branch 'regmap/topic/ack' into regmap-next

+7 -4
+3 -3
drivers/base/regmap/regmap-irq.c
··· 113 113 * OR if there is masked interrupt which hasn't been Acked, 114 114 * it'll be ignored in irq handler, then may introduce irq storm 115 115 */ 116 - if (d->mask_buf[i] && d->chip->ack_base) { 116 + if (d->mask_buf[i] && (d->chip->ack_base || d->chip->use_ack)) { 117 117 reg = d->chip->ack_base + 118 118 (i * map->reg_stride * d->irq_reg_stride); 119 119 ret = regmap_write(map, reg, d->mask_buf[i]); ··· 271 271 for (i = 0; i < data->chip->num_regs; i++) { 272 272 data->status_buf[i] &= ~data->mask_buf[i]; 273 273 274 - if (data->status_buf[i] && chip->ack_base) { 274 + if (data->status_buf[i] && (chip->ack_base || chip->use_ack)) { 275 275 reg = chip->ack_base + 276 276 (i * map->reg_stride * data->irq_reg_stride); 277 277 ret = regmap_write(map, reg, data->status_buf[i]); ··· 448 448 goto err_alloc; 449 449 } 450 450 451 - if (d->status_buf[i] && chip->ack_base) { 451 + if (d->status_buf[i] && (chip->ack_base || chip->use_ack)) { 452 452 reg = chip->ack_base + 453 453 (i * map->reg_stride * d->irq_reg_stride); 454 454 ret = regmap_write(map, reg,
+4 -1
include/linux/regmap.h
··· 497 497 * 498 498 * @status_base: Base status register address. 499 499 * @mask_base: Base mask register address. 500 - * @ack_base: Base ack address. If zero then the chip is clear on read. 500 + * @ack_base: Base ack address. If zero then the chip is clear on read. 501 + * Using zero value is possible with @use_ack bit. 501 502 * @wake_base: Base address for wake enables. If zero unsupported. 502 503 * @irq_reg_stride: Stride to use for chips where registers are not contiguous. 503 504 * @init_ack_masked: Ack all masked interrupts once during initalization. 504 505 * @mask_invert: Inverted mask register: cleared bits are masked out. 506 + * @use_ack: Use @ack register even if it is zero. 505 507 * @wake_invert: Inverted wake register: cleared bits are wake enabled. 506 508 * @runtime_pm: Hold a runtime PM lock on the device when accessing it. 507 509 * ··· 522 520 unsigned int irq_reg_stride; 523 521 bool init_ack_masked:1; 524 522 bool mask_invert:1; 523 + bool use_ack:1; 525 524 bool wake_invert:1; 526 525 bool runtime_pm:1; 527 526