Commit ab5201e2 authored by David Rau's avatar David Rau Committed by Mark Brown

ASoC: da7219: Improve system suspend and resume handling

When DA7219 is suspended, prevent the AAD IRQ handler is unexpectedly
executed and cause the I2C driver "Transfer while suspended" failure.
Signed-off-by: default avatarDavid Rau <David.Rau.opensource@dm.renesas.com>
Link: https://lore.kernel.org/r/20231101022507.6226-1-David.Rau.opensource@dm.renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ed2232d4
...@@ -927,10 +927,15 @@ void da7219_aad_suspend(struct snd_soc_component *component) ...@@ -927,10 +927,15 @@ void da7219_aad_suspend(struct snd_soc_component *component)
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
u8 micbias_ctrl; u8 micbias_ctrl;
disable_irq(da7219_aad->irq);
if (da7219_aad->jack) { if (da7219_aad->jack) {
/* Disable jack detection during suspend */ /* Disable jack detection during suspend */
snd_soc_component_update_bits(component, DA7219_ACCDET_CONFIG_1, snd_soc_component_update_bits(component, DA7219_ACCDET_CONFIG_1,
DA7219_ACCDET_EN_MASK, 0); DA7219_ACCDET_EN_MASK, 0);
cancel_delayed_work_sync(&da7219_aad->jack_det_work);
/* Disable ground switch */
snd_soc_component_update_bits(component, 0xFB, 0x01, 0x00);
/* /*
* If we have a 4-pole jack inserted, then micbias will be * If we have a 4-pole jack inserted, then micbias will be
...@@ -947,8 +952,6 @@ void da7219_aad_suspend(struct snd_soc_component *component) ...@@ -947,8 +952,6 @@ void da7219_aad_suspend(struct snd_soc_component *component)
} }
} }
} }
synchronize_irq(da7219_aad->irq);
} }
void da7219_aad_resume(struct snd_soc_component *component) void da7219_aad_resume(struct snd_soc_component *component)
...@@ -971,6 +974,8 @@ void da7219_aad_resume(struct snd_soc_component *component) ...@@ -971,6 +974,8 @@ void da7219_aad_resume(struct snd_soc_component *component)
DA7219_ACCDET_EN_MASK, DA7219_ACCDET_EN_MASK,
DA7219_ACCDET_EN_MASK); DA7219_ACCDET_EN_MASK);
} }
enable_irq(da7219_aad->irq);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment