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>

3 files changed, 12 insertions, 12 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
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index 4729007055d8..2822768f2df1 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -340,11 +340,11 @@ static const struct regmap_irq wm5110_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
diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
index 04bc6d5ff285..510da3b52324 100644
--- a/drivers/mfd/wm8997-tables.c
+++ b/drivers/mfd/wm8997-tables.c
@@ -65,11 +65,11 @@ static const struct regmap_irq wm8997_irqs[ARIZONA_NUM_IRQ] = {
         [ARIZONA_IRQ_GP2] = { .reg_offset = 0, .mask = ARIZONA_GP2_EINT1 },
         [ARIZONA_IRQ_GP1] = { .reg_offset = 0, .mask = ARIZONA_GP1_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