ASoC: rt722: add settings for rt722VB

This patch adds settings for RT722VB.

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

diff --git a/sound/soc/codecs/rt722-sdca-sdw.c b/sound/soc/codecs/rt722-sdca-sdw.c
index 70700bdb80a14374321d1d8d8744356484ac01ac..5ea40c1b159a8022c2af62a2007ead8184686cbe 100644 (file)
--- a/sound/soc/codecs/rt722-sdca-sdw.c
+++ b/sound/soc/codecs/rt722-sdca-sdw.c
@@ -21,7 +21,7 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg)
        switch (reg) {
        case 0x2f01 ... 0x2f0a:
        case 0x2f35 ... 0x2f36:
-       case 0x2f50:
+       case 0x2f50 ... 0x2f52:
        case 0x2f54:
        case 0x2f58 ... 0x2f5d:
        case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT722_SDCA_ENT0, RT722_SDCA_CTL_FUNC_STATUS, 0):

diff --git a/sound/soc/codecs/rt722-sdca.c b/sound/soc/codecs/rt722-sdca.c
index 333611490ae3583275ba087a70545d7d08ced10a..79b8b7e70a33473d20a7f8c910013b3ab1acd75c 100644 (file)
--- a/sound/soc/codecs/rt722-sdca.c
+++ b/sound/soc/codecs/rt722-sdca.c
@@ -1378,6 +1378,9 @@ static void rt722_sdca_dmic_preset(struct rt722_sdca_priv *rt722)
                /* PHYtiming TDZ/TZD control */
                regmap_write(rt722->regmap, 0x2f03, 0x06);
 
+               if (rt722->hw_vid == RT722_VB)
+                       regmap_write(rt722->regmap, 0x2f52, 0x00);
+
                /* clear flag */
                regmap_write(rt722->regmap,
                        SDW_SDCA_CTL(FUNC_NUM_MIC_ARRAY, RT722_SDCA_ENT0, RT722_SDCA_CTL_FUNC_STATUS, 0),
@@ -1415,6 +1418,9 @@ static void rt722_sdca_amp_preset(struct rt722_sdca_priv *rt722)
                        SDW_SDCA_CTL(FUNC_NUM_AMP, RT722_SDCA_ENT_OT23,
                                RT722_SDCA_CTL_VENDOR_DEF, CH_08), 0x04);
 
+               if (rt722->hw_vid == RT722_VB)
+                       regmap_write(rt722->regmap, 0x2f54, 0x00);
+
                /* clear flag */
                regmap_write(rt722->regmap,
                        SDW_SDCA_CTL(FUNC_NUM_AMP, RT722_SDCA_ENT0, RT722_SDCA_CTL_FUNC_STATUS, 0),
@@ -1506,6 +1512,9 @@ static void rt722_sdca_jack_preset(struct rt722_sdca_priv *rt722)
                rt722_sdca_index_write(rt722, RT722_VENDOR_REG, RT722_DIGITAL_MISC_CTRL4,
                        0x0010);
 
+               if (rt722->hw_vid == RT722_VB)
+                       regmap_write(rt722->regmap, 0x2f51, 0x00);
+
                /* clear flag */
                regmap_write(rt722->regmap,
                        SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT722_SDCA_ENT0, RT722_SDCA_CTL_FUNC_STATUS, 0),
@@ -1516,6 +1525,7 @@ static void rt722_sdca_jack_preset(struct rt722_sdca_priv *rt722)
 int rt722_sdca_io_init(struct device *dev, struct sdw_slave *slave)
 {
        struct rt722_sdca_priv *rt722 = dev_get_drvdata(dev);
+       unsigned int val;
 
        rt722->disable_irq = false;
 
@@ -1545,6 +1555,10 @@ int rt722_sdca_io_init(struct device *dev, struct sdw_slave *slave)
 
        pm_runtime_get_noresume(&slave->dev);
 
+       rt722_sdca_index_read(rt722, RT722_VENDOR_REG, RT722_JD_PRODUCT_NUM, &val);
+       rt722->hw_vid = (val & 0x0f00) >> 8;
+       dev_dbg(&slave->dev, "%s hw_vid=0x%x\n", __func__, rt722->hw_vid);
+
        rt722_sdca_dmic_preset(rt722);
        rt722_sdca_amp_preset(rt722);
        rt722_sdca_jack_preset(rt722);

diff --git a/sound/soc/codecs/rt722-sdca.h b/sound/soc/codecs/rt722-sdca.h
index 3c383705dd3cdebce02be313b801c9df8ef1a993..823abee9ab76cf9c9bd37b86726e6dffa4b2990b 100644 (file)
--- a/sound/soc/codecs/rt722-sdca.h
+++ b/sound/soc/codecs/rt722-sdca.h
@@ -39,6 +39,7 @@ struct  rt722_sdca_priv {
        /* For DMIC */
        bool fu1e_dapm_mute;
        bool fu1e_mixer_mute[4];
+       int hw_vid;
 };
 
 struct rt722_sdca_dmic_kctrl_priv {
@@ -233,6 +234,11 @@ enum rt722_sdca_jd_src {
        RT722_JD1,
 };
 
+enum rt722_sdca_version {
+       RT722_VA,
+       RT722_VB,
+};
+
 int rt722_sdca_io_init(struct device *dev, struct sdw_slave *slave);
 int rt722_sdca_init(struct device *dev, struct regmap *regmap, struct sdw_slave *slave);
 int rt722_sdca_index_write(struct rt722_sdca_priv *rt722,