aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r--include/linux/regmap.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index e55907804d39..4149f1a9b003 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -122,9 +122,9 @@ typedef void (*regmap_unlock)(void *);
122 * volatile_table (see below) is not, the check is performed on 122 * volatile_table (see below) is not, the check is performed on
123 * such table (a register is volatile if it belongs to one of 123 * such table (a register is volatile if it belongs to one of
124 * the ranges specified by volatile_table). 124 * the ranges specified by volatile_table).
125 * @precious_reg: Optional callback returning true if the rgister 125 * @precious_reg: Optional callback returning true if the register
126 * should not be read outside of a call from the driver 126 * should not be read outside of a call from the driver
127 * (eg, a clear on read interrupt status register). If this 127 * (e.g., a clear on read interrupt status register). If this
128 * field is NULL but precious_table (see below) is not, the 128 * field is NULL but precious_table (see below) is not, the
129 * check is performed on such table (a register is precious if 129 * check is performed on such table (a register is precious if
130 * it belongs to one of the ranges specified by precious_table). 130 * it belongs to one of the ranges specified by precious_table).
@@ -136,9 +136,9 @@ typedef void (*regmap_unlock)(void *);
136 * are not overridden). 136 * are not overridden).
137 * @reg_read: Optional callback that if filled will be used to perform 137 * @reg_read: Optional callback that if filled will be used to perform
138 * all the reads from the registers. Should only be provided for 138 * all the reads from the registers. Should only be provided for
139 * devices whos read operation cannot be represented as a simple read 139 * devices whose read operation cannot be represented as a simple
140 * operation on a bus such as SPI, I2C, etc. Most of the devices do 140 * read operation on a bus such as SPI, I2C, etc. Most of the
141 * not need this. 141 * devices do not need this.
142 * @reg_write: Same as above for writing. 142 * @reg_write: Same as above for writing.
143 * @fast_io: Register IO is fast. Use a spinlock instead of a mutex 143 * @fast_io: Register IO is fast. Use a spinlock instead of a mutex
144 * to perform locking. This field is ignored if custom lock/unlock 144 * to perform locking. This field is ignored if custom lock/unlock
@@ -497,11 +497,13 @@ struct regmap_irq {
497 * 497 *
498 * @status_base: Base status register address. 498 * @status_base: Base status register address.
499 * @mask_base: Base mask register address. 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 * @wake_base: Base address for wake enables. If zero unsupported. 502 * @wake_base: Base address for wake enables. If zero unsupported.
502 * @irq_reg_stride: Stride to use for chips where registers are not contiguous. 503 * @irq_reg_stride: Stride to use for chips where registers are not contiguous.
503 * @init_ack_masked: Ack all masked interrupts once during initalization. 504 * @init_ack_masked: Ack all masked interrupts once during initalization.
504 * @mask_invert: Inverted mask register: cleared bits are masked out. 505 * @mask_invert: Inverted mask register: cleared bits are masked out.
506 * @use_ack: Use @ack register even if it is zero.
505 * @wake_invert: Inverted wake register: cleared bits are wake enabled. 507 * @wake_invert: Inverted wake register: cleared bits are wake enabled.
506 * @runtime_pm: Hold a runtime PM lock on the device when accessing it. 508 * @runtime_pm: Hold a runtime PM lock on the device when accessing it.
507 * 509 *
@@ -520,6 +522,7 @@ struct regmap_irq_chip {
520 unsigned int irq_reg_stride; 522 unsigned int irq_reg_stride;
521 bool init_ack_masked:1; 523 bool init_ack_masked:1;
522 bool mask_invert:1; 524 bool mask_invert:1;
525 bool use_ack:1;
523 bool wake_invert:1; 526 bool wake_invert:1;
524 bool runtime_pm:1; 527 bool runtime_pm:1;
525 528