| From 0c7b65bd422feb35e9380c05a26cb3e93cd35623 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 9 Apr 2024 06:47:34 +0000 |
| Subject: ASoC: rt722-sdca: add headset microphone vrefo setting |
| |
| From: Jack Yu <jack.yu@realtek.com> |
| |
| [ Upstream commit 140e0762ca055d1aa84b17847cde5d9e47f56f76 ] |
| |
| Add vrefo settings to fix jd and headset mic recording issue. |
| |
| Signed-off-by: Jack Yu <jack.yu@realtek.com> |
| Link: https://msgid.link/r/727219ed45d3485ba8f4646700aaa8a8@realtek.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/codecs/rt722-sdca.c | 25 +++++++++++++++++++------ |
| sound/soc/codecs/rt722-sdca.h | 3 +++ |
| 2 files changed, 22 insertions(+), 6 deletions(-) |
| |
| diff --git a/sound/soc/codecs/rt722-sdca.c b/sound/soc/codecs/rt722-sdca.c |
| index 4338cdb3a7917..9ff607984ea19 100644 |
| --- a/sound/soc/codecs/rt722-sdca.c |
| +++ b/sound/soc/codecs/rt722-sdca.c |
| @@ -1438,9 +1438,12 @@ static void rt722_sdca_jack_preset(struct rt722_sdca_priv *rt722) |
| int loop_check, chk_cnt = 100, ret; |
| unsigned int calib_status = 0; |
| |
| - /* Read eFuse */ |
| - rt722_sdca_index_write(rt722, RT722_VENDOR_SPK_EFUSE, RT722_DC_CALIB_CTRL, |
| - 0x4808); |
| + /* Config analog bias */ |
| + rt722_sdca_index_write(rt722, RT722_VENDOR_REG, RT722_ANALOG_BIAS_CTL3, |
| + 0xa081); |
| + /* GE related settings */ |
| + rt722_sdca_index_write(rt722, RT722_VENDOR_HDA_CTL, RT722_GE_RELATED_CTL2, |
| + 0xa009); |
| /* Button A, B, C, D bypass mode */ |
| rt722_sdca_index_write(rt722, RT722_VENDOR_HDA_CTL, RT722_UMP_HID_CTL4, |
| 0xcf00); |
| @@ -1474,9 +1477,6 @@ static void rt722_sdca_jack_preset(struct rt722_sdca_priv *rt722) |
| if ((calib_status & 0x0040) == 0x0) |
| break; |
| } |
| - /* Release HP-JD, EN_CBJ_TIE_GL/R open, en_osw gating auto done bit */ |
| - rt722_sdca_index_write(rt722, RT722_VENDOR_REG, RT722_DIGITAL_MISC_CTRL4, |
| - 0x0010); |
| /* Set ADC09 power entity floating control */ |
| rt722_sdca_index_write(rt722, RT722_VENDOR_HDA_CTL, RT722_ADC0A_08_PDE_FLOAT_CTL, |
| 0x2a12); |
| @@ -1489,8 +1489,21 @@ static void rt722_sdca_jack_preset(struct rt722_sdca_priv *rt722) |
| /* Set DAC03 and HP power entity floating control */ |
| rt722_sdca_index_write(rt722, RT722_VENDOR_HDA_CTL, RT722_DAC03_HP_PDE_FLOAT_CTL, |
| 0x4040); |
| + rt722_sdca_index_write(rt722, RT722_VENDOR_HDA_CTL, RT722_ENT_FLOAT_CTRL_1, |
| + 0x4141); |
| + rt722_sdca_index_write(rt722, RT722_VENDOR_HDA_CTL, RT722_FLOAT_CTRL_1, |
| + 0x0101); |
| /* Fine tune PDE40 latency */ |
| regmap_write(rt722->regmap, 0x2f58, 0x07); |
| + regmap_write(rt722->regmap, 0x2f03, 0x06); |
| + /* MIC VRefo */ |
| + rt722_sdca_index_update_bits(rt722, RT722_VENDOR_REG, |
| + RT722_COMBO_JACK_AUTO_CTL1, 0x0200, 0x0200); |
| + rt722_sdca_index_update_bits(rt722, RT722_VENDOR_REG, |
| + RT722_VREFO_GAT, 0x4000, 0x4000); |
| + /* Release HP-JD, EN_CBJ_TIE_GL/R open, en_osw gating auto done bit */ |
| + rt722_sdca_index_write(rt722, RT722_VENDOR_REG, RT722_DIGITAL_MISC_CTRL4, |
| + 0x0010); |
| } |
| |
| int rt722_sdca_io_init(struct device *dev, struct sdw_slave *slave) |
| diff --git a/sound/soc/codecs/rt722-sdca.h b/sound/soc/codecs/rt722-sdca.h |
| index 44af8901352eb..2464361a7958c 100644 |
| --- a/sound/soc/codecs/rt722-sdca.h |
| +++ b/sound/soc/codecs/rt722-sdca.h |
| @@ -69,6 +69,7 @@ struct rt722_sdca_dmic_kctrl_priv { |
| #define RT722_COMBO_JACK_AUTO_CTL2 0x46 |
| #define RT722_COMBO_JACK_AUTO_CTL3 0x47 |
| #define RT722_DIGITAL_MISC_CTRL4 0x4a |
| +#define RT722_VREFO_GAT 0x63 |
| #define RT722_FSM_CTL 0x67 |
| #define RT722_SDCA_INTR_REC 0x82 |
| #define RT722_SW_CONFIG1 0x8a |
| @@ -127,6 +128,8 @@ struct rt722_sdca_dmic_kctrl_priv { |
| #define RT722_UMP_HID_CTL6 0x66 |
| #define RT722_UMP_HID_CTL7 0x67 |
| #define RT722_UMP_HID_CTL8 0x68 |
| +#define RT722_FLOAT_CTRL_1 0x70 |
| +#define RT722_ENT_FLOAT_CTRL_1 0x76 |
| |
| /* Parameter & Verb control 01 (0x1a)(NID:20h) */ |
| #define RT722_HIDDEN_REG_SW_RESET (0x1 << 14) |
| -- |
| 2.43.0 |
| |
