diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 12:11:08 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 12:11:08 -0500 |
| commit | 5dea215028686a67e815c32a54dc89fb3467ab05 (patch) | |
| tree | a00295f8c31e2c2b3ecfe397a3a792177e957cba /drivers/mfd | |
| parent | 7798b582d31e92227ca457f93db320ad9654dada (diff) | |
| parent | 378e8ee2f842ccf5a14516741119468fc55b17f0 (diff) | |
Merge remote-tracking branch 'regmap/topic/irq' into regmap-next
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/wm5102-tables.c | 1 | ||||
| -rw-r--r-- | drivers/mfd/wm5110-tables.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c index 1133a64c2dc9..f6fcb87b3504 100644 --- a/drivers/mfd/wm5102-tables.c +++ b/drivers/mfd/wm5102-tables.c | |||
| @@ -96,6 +96,7 @@ const struct regmap_irq_chip wm5102_aod = { | |||
| 96 | .mask_base = ARIZONA_AOD_IRQ_MASK_IRQ1, | 96 | .mask_base = ARIZONA_AOD_IRQ_MASK_IRQ1, |
| 97 | .ack_base = ARIZONA_AOD_IRQ1, | 97 | .ack_base = ARIZONA_AOD_IRQ1, |
| 98 | .wake_base = ARIZONA_WAKE_CONTROL, | 98 | .wake_base = ARIZONA_WAKE_CONTROL, |
| 99 | .wake_invert = 1, | ||
| 99 | .num_regs = 1, | 100 | .num_regs = 1, |
| 100 | .irqs = wm5102_aod_irqs, | 101 | .irqs = wm5102_aod_irqs, |
| 101 | .num_irqs = ARRAY_SIZE(wm5102_aod_irqs), | 102 | .num_irqs = ARRAY_SIZE(wm5102_aod_irqs), |
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c index adda6b10b90d..c41599815299 100644 --- a/drivers/mfd/wm5110-tables.c +++ b/drivers/mfd/wm5110-tables.c | |||
| @@ -255,6 +255,7 @@ const struct regmap_irq_chip wm5110_aod = { | |||
| 255 | .mask_base = ARIZONA_AOD_IRQ_MASK_IRQ1, | 255 | .mask_base = ARIZONA_AOD_IRQ_MASK_IRQ1, |
| 256 | .ack_base = ARIZONA_AOD_IRQ1, | 256 | .ack_base = ARIZONA_AOD_IRQ1, |
| 257 | .wake_base = ARIZONA_WAKE_CONTROL, | 257 | .wake_base = ARIZONA_WAKE_CONTROL, |
| 258 | .wake_invert = 1, | ||
| 258 | .num_regs = 1, | 259 | .num_regs = 1, |
| 259 | .irqs = wm5110_aod_irqs, | 260 | .irqs = wm5110_aod_irqs, |
| 260 | .num_irqs = ARRAY_SIZE(wm5110_aod_irqs), | 261 | .num_irqs = ARRAY_SIZE(wm5110_aod_irqs), |