ASoC: rt721: fix prepare clock stop failed

[ Upstream commit d914ec6f07548f7c13a231a4f526e043e736e82e ]

This patch adds settings to prevent the 'prepare clock stop failed' error.

Signed-off-by: Shuming Fan <shumingf@realtek.com>
Link: https://patch.msgid.link/20251027103333.38353-1-shumingf@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/rt721-sdca.c b/sound/soc/codecs/rt721-sdca.c
index a4bd29d7220b8914618bf1d1e646d5adb32aa75c..5f7b505d541479ff1ff4ff73ce8a52a1f06a094a 100644 (file)
--- a/sound/soc/codecs/rt721-sdca.c
+++ b/sound/soc/codecs/rt721-sdca.c
@@ -281,6 +281,10 @@ static void rt721_sdca_jack_preset(struct rt721_sdca_priv *rt721)
        rt_sdca_index_write(rt721->mbq_regmap, RT721_BOOST_CTRL,
                RT721_BST_4CH_TOP_GATING_CTRL1, 0x002a);
        regmap_write(rt721->regmap, 0x2f58, 0x07);
+
+       regmap_write(rt721->regmap, 0x2f51, 0x00);
+       rt_sdca_index_write(rt721->mbq_regmap, RT721_HDA_SDCA_FLOAT,
+               RT721_MISC_CTL, 0x0004);
 }
 
 static void rt721_sdca_jack_init(struct rt721_sdca_priv *rt721)

diff --git a/sound/soc/codecs/rt721-sdca.h b/sound/soc/codecs/rt721-sdca.h
index 71fac9cd87394ef19eaeaa2afa7d2de0f02c8687..24ce188562baf65a60b6da8ed75744b7713898ea 100644 (file)
--- a/sound/soc/codecs/rt721-sdca.h
+++ b/sound/soc/codecs/rt721-sdca.h
@@ -137,6 +137,7 @@ struct rt721_sdca_dmic_kctrl_priv {
 #define RT721_HDA_LEGACY_UAJ_CTL               0x02
 #define RT721_HDA_LEGACY_CTL1                  0x05
 #define RT721_HDA_LEGACY_RESET_CTL             0x06
+#define RT721_MISC_CTL                         0x07
 #define RT721_XU_REL_CTRL                      0x0c
 #define RT721_GE_REL_CTRL1                     0x0d
 #define RT721_HDA_LEGACY_GPIO_WAKE_EN_CTL      0x0e