diff options
| author | Charles Keepax | 2014-07-15 12:21:47 +0200 |
|---|---|---|
| committer | Lee Jones | 2014-07-28 09:10:47 +0200 |
| commit | c0fe2c5b3f730e3d56d37f7b731a5b1191a4e8bf (patch) | |
| tree | 56d6f6206e0b046d947dd3a8d7b3a1bb87f36760 /drivers/mfd/wm5102-tables.c | |
| parent | mfd: wm5110: Add in the output done interrupts (diff) | |
| download | kernel-qcow2-linux-c0fe2c5b3f730e3d56d37f7b731a5b1191a4e8bf.tar.gz kernel-qcow2-linux-c0fe2c5b3f730e3d56d37f7b731a5b1191a4e8bf.tar.xz kernel-qcow2-linux-c0fe2c5b3f730e3d56d37f7b731a5b1191a4e8bf.zip | |
mfd: arizona: Rename thermal shutdown interrupt
Newer versions of the IP introduce short circuit protection which will
also shutdown the speaker. Rename the interrupt and associated register
bits associated with thermal events to better fit the function and avoid
conflict with future interrupt additions.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/wm5102-tables.c')
| -rw-r--r-- | drivers/mfd/wm5102-tables.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c index c8a993bd17ae..fb4d4bb0f47d 100644 --- a/drivers/mfd/wm5102-tables.c +++ b/drivers/mfd/wm5102-tables.c @@ -138,11 +138,11 @@ static const struct regmap_irq wm5102_irqs[ARIZONA_NUM_IRQ] = { .reg_offset = 1, .mask = ARIZONA_DSP_IRQ1_EINT1 }, - [ARIZONA_IRQ_SPK_SHUTDOWN_WARN] = { - .reg_offset = 2, .mask = ARIZONA_SPK_SHUTDOWN_WARN_EINT1 + [ARIZONA_IRQ_SPK_OVERHEAT_WARN] = { + .reg_offset = 2, .mask = ARIZONA_SPK_OVERHEAT_WARN_EINT1 }, - [ARIZONA_IRQ_SPK_SHUTDOWN] = { - .reg_offset = 2, .mask = ARIZONA_SPK_SHUTDOWN_EINT1 + [ARIZONA_IRQ_SPK_OVERHEAT] = { + .reg_offset = 2, .mask = ARIZONA_SPK_OVERHEAT_EINT1 }, [ARIZONA_IRQ_HPDET] = { .reg_offset = 2, .mask = ARIZONA_HPDET_EINT1 |