| From 7f094caba6e5240e68a4f175885091c799fc8838 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 13 Jan 2021 02:11:23 +0800 |
| Subject: ASoC: SOF: Intel: hda: Resume codec to do jack detection |
| |
| From: Kai-Heng Feng <kai.heng.feng@canonical.com> |
| |
| [ Upstream commit bcd7059abc19e6ec5b2260dff6a008fb99c4eef9 ] |
| |
| Instead of queueing jackpoll_work, runtime resume the codec to let it |
| use different jack detection methods based on jackpoll_interval. |
| |
| This partially matches SOF driver's behavior with commit a6e7d0a4bdb0 |
| ("ALSA: hda: fix jack detection with Realtek codecs when in D3"), the |
| difference is SOF unconditionally resumes the codec. |
| |
| Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> |
| Link: https://lore.kernel.org/r/20210112181128.1229827-1-kai.heng.feng@canonical.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/sof/intel/hda-codec.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c |
| index 8b0ddc4b8227b..8d65004c917a1 100644 |
| --- a/sound/soc/sof/intel/hda-codec.c |
| +++ b/sound/soc/sof/intel/hda-codec.c |
| @@ -93,8 +93,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) |
| * has been recorded in STATESTS |
| */ |
| if (codec->jacktbl.used) |
| - schedule_delayed_work(&codec->jackpoll_work, |
| - codec->jackpoll_interval); |
| + pm_request_resume(&codec->core.dev); |
| } |
| #else |
| void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} |
| -- |
| 2.27.0 |
| |