diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/arizona.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 2f2e91ac690f..bd41ee4da078 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
@@ -107,7 +107,7 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, | |||
107 | break; | 107 | break; |
108 | case SND_SOC_DAPM_POST_PMU: | 108 | case SND_SOC_DAPM_POST_PMU: |
109 | val = snd_soc_read(codec, ARIZONA_INTERRUPT_RAW_STATUS_3); | 109 | val = snd_soc_read(codec, ARIZONA_INTERRUPT_RAW_STATUS_3); |
110 | if (val & ARIZONA_SPK_SHUTDOWN_STS) { | 110 | if (val & ARIZONA_SPK_OVERHEAT_STS) { |
111 | dev_crit(arizona->dev, | 111 | dev_crit(arizona->dev, |
112 | "Speaker not enabled due to temperature\n"); | 112 | "Speaker not enabled due to temperature\n"); |
113 | return -EBUSY; | 113 | return -EBUSY; |
@@ -159,7 +159,7 @@ static irqreturn_t arizona_thermal_warn(int irq, void *data) | |||
159 | if (ret != 0) { | 159 | if (ret != 0) { |
160 | dev_err(arizona->dev, "Failed to read thermal status: %d\n", | 160 | dev_err(arizona->dev, "Failed to read thermal status: %d\n", |
161 | ret); | 161 | ret); |
162 | } else if (val & ARIZONA_SPK_SHUTDOWN_WARN_STS) { | 162 | } else if (val & ARIZONA_SPK_OVERHEAT_WARN_STS) { |
163 | dev_crit(arizona->dev, "Thermal warning\n"); | 163 | dev_crit(arizona->dev, "Thermal warning\n"); |
164 | } | 164 | } |
165 | 165 | ||
@@ -177,7 +177,7 @@ static irqreturn_t arizona_thermal_shutdown(int irq, void *data) | |||
177 | if (ret != 0) { | 177 | if (ret != 0) { |
178 | dev_err(arizona->dev, "Failed to read thermal status: %d\n", | 178 | dev_err(arizona->dev, "Failed to read thermal status: %d\n", |
179 | ret); | 179 | ret); |
180 | } else if (val & ARIZONA_SPK_SHUTDOWN_STS) { | 180 | } else if (val & ARIZONA_SPK_OVERHEAT_STS) { |
181 | dev_crit(arizona->dev, "Thermal shutdown\n"); | 181 | dev_crit(arizona->dev, "Thermal shutdown\n"); |
182 | ret = regmap_update_bits(arizona->regmap, | 182 | ret = regmap_update_bits(arizona->regmap, |
183 | ARIZONA_OUTPUT_ENABLES_1, | 183 | ARIZONA_OUTPUT_ENABLES_1, |
@@ -223,7 +223,7 @@ int arizona_init_spk(struct snd_soc_codec *codec) | |||
223 | break; | 223 | break; |
224 | } | 224 | } |
225 | 225 | ||
226 | ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN_WARN, | 226 | ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT_WARN, |
227 | "Thermal warning", arizona_thermal_warn, | 227 | "Thermal warning", arizona_thermal_warn, |
228 | arizona); | 228 | arizona); |
229 | if (ret != 0) | 229 | if (ret != 0) |
@@ -231,7 +231,7 @@ int arizona_init_spk(struct snd_soc_codec *codec) | |||
231 | "Failed to get thermal warning IRQ: %d\n", | 231 | "Failed to get thermal warning IRQ: %d\n", |
232 | ret); | 232 | ret); |
233 | 233 | ||
234 | ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_SHUTDOWN, | 234 | ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT, |
235 | "Thermal shutdown", arizona_thermal_shutdown, | 235 | "Thermal shutdown", arizona_thermal_shutdown, |
236 | arizona); | 236 | arizona); |
237 | if (ret != 0) | 237 | if (ret != 0) |