ASoC: rt722: fix pop noise at the beginning of headphone playback
Subsystems (3)
PATCH 1/1 ASoC: rt722: fix pop noise at the beginning of headphone playback
From: Shuming Fan <[email protected]>
This patch added the function_status check to avoid the calibration again. The codec driver reinitializes when the 'FUNCTION_NEEDS_INITIALIZATION' flag raises.
Signed-off-by Shuming Fan <[email protected]>
--- sound/soc/codecs/rt722-sdca-sdw.c | 8 + sound/soc/codecs/rt722-sdca.c | 285 +++++++++++++++++------------- sound/soc/codecs/rt722-sdca.h | 5 + 3 files changed, 176 insertions(+), 122 deletions(-)
sound/soc/codecs/rt722-sdca-sdw.c +8 -0
@@ -24,6 +24,7 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg)case 0x2f50 :case 0x2f54 : case 0x2f58 ... 0x2f5d: +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT0 ,RT722_SDCA_CTL_FUNC_STATUS ,0 ):case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_GE49 ,RT722_SDCA_CTL_SELECTED_MODE ,0 ): case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT722_SDCA_ENT_GE49, RT722_SDCA_CTL_DETECTED_MODE,
@@ -56,6 +57,7 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg) RT722_SDCA_CTL_VENDOR_DEF, 0):case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_PDE2A ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT0 ,RT722_SDCA_CTL_FUNC_STATUS ,0 ):case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_CS1F ,RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): case SDW_SDCA_CTL(FUNC_NUM_HID, RT722_SDCA_ENT_HID01,
@@ -70,6 +72,7 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg) RT722_SDCA_CTL_VENDOR_DEF, CH_08):case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT0 ,RT722_SDCA_CTL_FUNC_STATUS ,0 ):case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_CS31 ,RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): case RT722_BUF_ADDR_HID1 ... RT722_BUF_ADDR_HID2:
@@ -150,11 +153,14 @@ static bool rt722_sdca_volatile_register(struct device *dev, unsigned int reg)switch (reg) {case 0x2f01 :case 0x2f54 : +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT0 ,RT722_SDCA_CTL_FUNC_STATUS ,0 ):case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_GE49 ,RT722_SDCA_CTL_DETECTED_MODE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT0 ,RT722_SDCA_CTL_FUNC_STATUS ,0 ):case SDW_SDCA_CTL (FUNC_NUM_HID ,RT722_SDCA_ENT_HID01 ,RT722_SDCA_CTL_HIDTX_CURRENT_OWNER , 0) ... SDW_SDCA_CTL(FUNC_NUM_HID, RT722_SDCA_ENT_HID01,RT722_SDCA_CTL_HIDTX_MESSAGE_LENGTH ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT0 ,RT722_SDCA_CTL_FUNC_STATUS ,0 ): case RT722_BUF_ADDR_HID1 ... RT722_BUF_ADDR_HID2:case 0x2000000 :case 0x200000d :
@@ -166,6 +172,8 @@ static bool rt722_sdca_volatile_register(struct device *dev, unsigned int reg)case 0x2000084 :case 0x2000086 :case 0x3110000 : +case 0x5800003 : +case 0x5810000 :return true;default :return false;
sound/soc/codecs/rt722-sdca.c +163 -122
303 lines not on this page · raw message
sound/soc/codecs/rt722-sdca.h +5 -0
@@ -183,6 +183,7 @@ struct rt722_sdca_dmic_kctrl_priv {#define RT722_SDCA_ENT_PLATFORM_FU44 0x44#define RT722_SDCA_ENT_XU03 0x03#define RT722_SDCA_ENT_XU0D 0x0d +#define RT722_SDCA_ENT0 0x00/* RT722 SDCA control */ #define RT722_SDCA_CTL_SAMPLE_FREQ_INDEX 0x10
@@ -197,6 +198,7 @@ struct rt722_sdca_dmic_kctrl_priv {#define RT722_SDCA_CTL_REQ_POWER_STATE 0x01#define RT722_SDCA_CTL_VENDOR_DEF 0x30#define RT722_SDCA_CTL_FU_CH_GAIN 0x0b +#define RT722_SDCA_CTL_FUNC_STATUS 0x10/* RT722 SDCA channel */ #define CH_L 0x01
@@ -215,6 +217,9 @@ struct rt722_sdca_dmic_kctrl_priv {#define RT722_SDCA_RATE_96000HZ 0x0b#define RT722_SDCA_RATE_192000HZ 0x0d +/* Function_Status */ +#define FUNCTION_NEEDS_INITIALIZATION BIT(5) +enum {RT722_AIF1 ,/* For headset mic and headphone */ RT722_AIF2 ,/* For speaker */
Signature · 1 line
2.34.1