UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

SoC: rt5682s: Disable jack detection interrupt during suspend 

The rt5682s driver switches its regmap to cache-only when the
device suspends and back to regular mode on resume. When the
jack detect interrupt fires rt5682s_irq() schedules the jack
detect work. This can result in invalid reads from the regmap
in cache-only mode if the work runs before the device has
resumed:

[   19.672162] rt5682s 2-001a: ASoC: error at soc_component_read_no_lock on rt5682s.2-001a for register: [0x000000f0] -16

Disable the jack detection interrupt during suspend and
re-enable it on resume. The driver already schedules the
jack detection work on resume, so any state change during
suspend is still handled.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Link: https://lore.kernel.org/r/20230209012002.1.Ib4d6481f1d38a6e7b8c9e04913c02ca88c216cf6@changeid
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Matthias Kaehlcke 2023-02-09 01:20:23 +00:00 committed by Mark Brown
parent d227116c0e
commit f7d00a9be1
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/rt5682s.c
View File

@ -2895,6 +2895,9 @@ static int rt5682s_suspend(struct snd_soc_component *component)
{ {
struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component); struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component);
if (rt5682s->irq)
disable_irq(rt5682s->irq);
cancel_delayed_work_sync(&rt5682s->jack_detect_work); cancel_delayed_work_sync(&rt5682s->jack_detect_work);
cancel_delayed_work_sync(&rt5682s->jd_check_work); cancel_delayed_work_sync(&rt5682s->jd_check_work);
@ -2919,6 +2922,9 @@ static int rt5682s_resume(struct snd_soc_component *component)
&rt5682s->jack_detect_work, msecs_to_jiffies(0)); &rt5682s->jack_detect_work, msecs_to_jiffies(0));
} }
if (rt5682s->irq)
enable_irq(rt5682s->irq);
return 0; return 0;
} }
#else #else
@ -3259,7 +3265,9 @@ static int rt5682s_i2c_probe(struct i2c_client *i2c)
ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL, rt5682s_irq, ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL, rt5682s_irq,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"rt5682s", rt5682s); "rt5682s", rt5682s);
if (ret) if (!ret)
rt5682s->irq = i2c->irq;
else
dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret); dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
} }

1
sound/soc/codecs/rt5682s.h
View File

@ -1472,6 +1472,7 @@ struct rt5682s_priv {
int pll_comb; int pll_comb;
int jack_type; int jack_type;
unsigned int irq;
int irq_work_delay_time; int irq_work_delay_time;
int wclk_enabled; int wclk_enabled;
}; };