diff mbox series

[v2,3/5] ASoC: rt711-sdca: fix for JD event handling in ClockStop Mode0

Message ID 20230721090711.128247-1-shumingf@realtek.com
State Accepted
Commit 7a8735c1551e489351172d0da96128f6f8b52b2d
Headers show
Series [v2,1/5] ASoC: rt5682-sdw: fix for JD event handling in ClockStop Mode0 | expand

Commit Message

Shuming [θŒƒζ›ΈιŠ˜] July 21, 2023, 9:07 a.m. UTC 
From: Shuming Fan <shumingf@realtek.com>

When the system suspends, peripheral SDCA interrupts are disabled.
When system level resume is invoked, the peripheral SDCA interrupts
should be enabled to handle JD events.
Enable SDCA interrupts in resume sequence when ClockStop Mode0 is applied.

Signed-off-by: Shuming Fan <shumingf@realtek.com>
Reported-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/codecs/rt711-sdca-sdw.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Mark Brown July 25, 2023, 5:54 p.m. UTC | #1 
On Fri, 21 Jul 2023 17:07:11 +0800, shumingf@realtek.com wrote:
> When the system suspends, peripheral SDCA interrupts are disabled.
> When system level resume is invoked, the peripheral SDCA interrupts
> should be enabled to handle JD events.
> Enable SDCA interrupts in resume sequence when ClockStop Mode0 is applied.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[3/5] ASoC: rt711-sdca: fix for JD event handling in ClockStop Mode0
      commit: 23adeb7056acd4fd866969f4afb91441776cc4f5

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c
index 13a5316ba999..a5f4aa0453f5 100644
--- a/sound/soc/codecs/rt711-sdca-sdw.c
+++ b/sound/soc/codecs/rt711-sdca-sdw.c
@@ -442,8 +442,16 @@  static int __maybe_unused rt711_sdca_dev_resume(struct device *dev)
 	if (!rt711->first_hw_init)
 		return 0;
 
-	if (!slave->unattach_request)
+	if (!slave->unattach_request) {
+		if (rt711->disable_irq == true) {
+			mutex_lock(&rt711->disable_irq_lock);
+			sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_0);
+			sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, SDW_SCP_SDCA_INTMASK_SDCA_8);
+			rt711->disable_irq = false;
+			mutex_unlock(&rt711->disable_irq_lock);
+		}
 		goto regmap_sync;
+	}
 
 	time = wait_for_completion_timeout(&slave->initialization_complete,
 				msecs_to_jiffies(RT711_PROBE_TIMEOUT));