summaryrefslogtreecommitdiffstats
path: root/include/linux/regmap.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-09 14:34:13 +0000
committerMark Brown <broonie@linaro.org>2014-01-09 14:34:13 +0000
commit86776fc174973e556be7d668763f509a81124f8b (patch)
treeca9236497dc70b7dfb5903027488ad92d6d3274b /include/linux/regmap.h
parenteec8ae7a547037b498ba9e9159905090255e0197 (diff)
parentd3233433356aa1965b60b08ee61465b20e50474b (diff)
downloadblackbird-op-linux-86776fc174973e556be7d668763f509a81124f8b.tar.gz
blackbird-op-linux-86776fc174973e556be7d668763f509a81124f8b.zip
Merge remote-tracking branch 'regmap/topic/ack' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r--include/linux/regmap.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 1f6643ce216a..4149f1a9b003 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -497,11 +497,13 @@ struct regmap_irq {
*
* @status_base: Base status register address.
* @mask_base: Base mask register address.
- * @ack_base: Base ack address. If zero then the chip is clear on read.
+ * @ack_base: Base ack address. If zero then the chip is clear on read.
+ * Using zero value is possible with @use_ack bit.
* @wake_base: Base address for wake enables. If zero unsupported.
* @irq_reg_stride: Stride to use for chips where registers are not contiguous.
* @init_ack_masked: Ack all masked interrupts once during initalization.
* @mask_invert: Inverted mask register: cleared bits are masked out.
+ * @use_ack: Use @ack register even if it is zero.
* @wake_invert: Inverted wake register: cleared bits are wake enabled.
* @runtime_pm: Hold a runtime PM lock on the device when accessing it.
*
@@ -520,6 +522,7 @@ struct regmap_irq_chip {
unsigned int irq_reg_stride;
bool init_ack_masked:1;
bool mask_invert:1;
+ bool use_ack:1;
bool wake_invert:1;
bool runtime_pm:1;
OpenPOWER on IntegriCloud