diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-23 12:30:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-23 12:30:48 +0100 |
| commit | 2118794a785756a1c544362e591f08cdd83e164f (patch) | |
| tree | 6c4e6ffcf72d9546d7544c17a45c37537a290295 /include | |
| parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (diff) | |
| parent | a43fd50dc99a5f65505f174eca5a421707d73b4c (diff) | |
Merge branch 'topic/irq' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into wm5102
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 56af22ec9aba..58ec0cba0ae6 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -219,6 +219,7 @@ 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. + * @wake_base: Base address for wake enables. If zero unsupported. * @irq_reg_stride: Stride to use for chips where registers are not contiguous. * * @num_regs: Number of registers in each control bank. @@ -232,6 +233,7 @@ struct regmap_irq_chip { unsigned int status_base; unsigned int mask_base; unsigned int ack_base; + unsigned int wake_base; unsigned int irq_reg_stride; int num_regs; |