forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2013-08-31 19:25:12 +01:00
commit 1801ceaf07
2 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/linux/regmap.h
View file

@ -471,6 +471,9 @@ struct regmap_irq {
* @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.
* @init_ack_masked: Ack all masked interrupts once during initalization.
* @mask_invert: Inverted mask register: cleared bits are masked out.
* @wake_invert: Inverted wake register: cleared bits are wake enabled.
* @runtime_pm: Hold a runtime PM lock on the device when accessing it.
*
* @num_regs: Number of registers in each control bank.
@ -486,9 +489,10 @@ struct regmap_irq_chip {
unsigned int ack_base;
unsigned int wake_base;
unsigned int irq_reg_stride;
unsigned int mask_invert;
unsigned int wake_invert;
bool runtime_pm;
bool init_ack_masked:1;
bool mask_invert:1;
bool wake_invert:1;
bool runtime_pm:1;
int num_regs;