Unverified Commit a2753981 authored by Shuming Fan's avatar Shuming Fan Committed by Mark Brown
Browse files

ASoC: rt722: add settings for rt722VB 



This patch adds settings for RT722VB.

Signed-off-by: default avatarShuming Fan <shumingf@realtek.com>
Link: https://patch.msgid.link/20251007080950.1999411-1-shumingf@realtek.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4c4ed5e0

sound/soc/codecs/rt722-sdca-sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -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):

sound/soc/codecs/rt722-sdca.c

+14 −0
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/rt722-sdca.h

+6 −0
Original line number Diff line number Diff line
@@ -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,