ASoC: rt722: fix pop noise at the beginning of DMIC recording
Subsystems (3)
PATCH 2/2 ASoC: rt722: fix pop noise at the beginning of DMIC recording
From: Shuming Fan <[email protected]>
This patch added the PDE status check which makes sure the PDE transition is done. It will decrease the pop noise at the beginning of DMIC recording.
--- sound/soc/codecs/rt722-sdca-sdw.c | 12 +++++++++++ sound/soc/codecs/rt722-sdca.c | 33 +++++++++++++++++++++++++++++++ sound/soc/codecs/rt722-sdca.h | 1 + 3 files changed, 46 insertions(+)
sound/soc/codecs/rt722-sdca-sdw.c +12 -0
@@ -43,8 +43,12 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg) RT722_SDCA_CTL_FU_MUTE, CH_R):case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 , +RT722_SDCA_CTL_ACTUAL_POWER_STATE ,0 ):case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE12 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE12 , +RT722_SDCA_CTL_ACTUAL_POWER_STATE ,0 ):case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_CS01 ,RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT722_SDCA_ENT_CS11,
@@ -57,6 +61,8 @@ 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_ENT_PDE2A , +RT722_SDCA_CTL_ACTUAL_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 ):
@@ -72,6 +78,8 @@ 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_ENT_PDE23 , +RT722_SDCA_CTL_ACTUAL_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 ):
@@ -154,13 +162,17 @@ static bool rt722_sdca_volatile_register(struct device *dev, unsigned int 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_PDE12 ,RT722_SDCA_CTL_ACTUAL_POWER_STATE ,0 ): +case SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 ,RT722_SDCA_CTL_ACTUAL_POWER_STATE ,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_MIC_ARRAY ,RT722_SDCA_ENT_PDE2A ,RT722_SDCA_CTL_ACTUAL_POWER_STATE ,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 SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 ,RT722_SDCA_CTL_ACTUAL_POWER_STATE ,0 ): case RT722_BUF_ADDR_HID1 ... RT722_BUF_ADDR_HID2:case 0x2000000 :case 0x200000d :
sound/soc/codecs/rt722-sdca.c +33 -0
@@ -842,6 +842,7 @@ static int rt722_sdca_fu113_event(struct snd_soc_dapm_widget *w,case SND_SOC_DAPM_POST_PMU : rt722->fu1e_dapm_mute = false;rt722_sdca_set_fu1e_capture_ctl (rt722); +usleep_range (150000 ,160000 );break ;case SND_SOC_DAPM_PRE_PMD : rt722->fu1e_dapm_mute = true;
@@ -871,6 +872,28 @@ static int rt722_sdca_fu36_event(struct snd_soc_dapm_widget *w,return 0 ; } +static void rt722_pde_transition_delay (struct rt722_sdca_priv *rt722,unsigned char func, +unsigned char entity,unsigned char ps) +{ +unsigned int delay =1000 , val; + +pm_runtime_mark_last_busy (&rt722->slave->dev); + +/* waiting for Actual PDE becomes to PS0/PS3 */ +while (delay) { +regmap_read (rt722->regmap, +SDW_SDCA_CTL (func, entity,RT722_SDCA_CTL_ACTUAL_POWER_STATE ,0 ), &val); +if (val == ps) +break ; + +usleep_range (1000 ,1500 ); + delay--; + } +if (!delay) { +dev_warn (&rt722->slave->dev,"%s PDE to %s is NOT ready" , __func__, ps?"PS3" :"PS0" ); + } +} +static int rt722_sdca_pde47_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
@@ -884,11 +907,13 @@ static int rt722_sdca_pde47_event(struct snd_soc_dapm_widget *w,regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps0); +rt722_pde_transition_delay (rt722,FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 , ps0);break ;case SND_SOC_DAPM_PRE_PMD :regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps3); +rt722_pde_transition_delay (rt722,FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE40 , ps3);break ; }return 0 ;
@@ -907,11 +932,13 @@ static int rt722_sdca_pde23_event(struct snd_soc_dapm_widget *w,regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps0); +rt722_pde_transition_delay (rt722,FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 , ps0);break ;case SND_SOC_DAPM_PRE_PMD :regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps3); +rt722_pde_transition_delay (rt722,FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 , ps3);break ; }return 0 ;
@@ -930,11 +957,13 @@ static int rt722_sdca_pde11_event(struct snd_soc_dapm_widget *w,regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_PDE2A ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps0); +rt722_pde_transition_delay (rt722,FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_PDE2A , ps0);break ;case SND_SOC_DAPM_PRE_PMD :regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_PDE2A ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps3); +rt722_pde_transition_delay (rt722,FUNC_NUM_MIC_ARRAY ,RT722_SDCA_ENT_PDE2A , ps3);break ; }return 0 ;
@@ -953,11 +982,13 @@ static int rt722_sdca_pde12_event(struct snd_soc_dapm_widget *w,regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE12 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps0); +rt722_pde_transition_delay (rt722,FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE12 , ps0);break ;case SND_SOC_DAPM_PRE_PMD :regmap_write (rt722->regmap,SDW_SDCA_CTL (FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE12 ,RT722_SDCA_CTL_REQ_POWER_STATE ,0 ), ps3); +rt722_pde_transition_delay (rt722,FUNC_NUM_JACK_CODEC ,RT722_SDCA_ENT_PDE12 , ps3);break ; }return 0 ;
@@ -1343,6 +1374,8 @@ static void rt722_sdca_dmic_preset(struct rt722_sdca_priv *rt722) RT722_SDCA_CTL_VENDOR_DEF, 0), 0x01);/* Fine tune PDE2A latency */ regmap_write (rt722->regmap,0x2f5c ,0x25 ); +/* PHYtiming TDZ/TZD control */ +regmap_write (rt722->regmap,0x2f03 ,0x06 );/* clear flag */ regmap_write(rt722->regmap,
sound/soc/codecs/rt722-sdca.h +1 -0
@@ -199,6 +199,7 @@ struct rt722_sdca_dmic_kctrl_priv {#define RT722_SDCA_CTL_VENDOR_DEF 0x30#define RT722_SDCA_CTL_FU_CH_GAIN 0x0b#define RT722_SDCA_CTL_FUNC_STATUS 0x10 +#define RT722_SDCA_CTL_ACTUAL_POWER_STATE 0x10/* RT722 SDCA channel */ #define CH_L 0x01
Signature · 1 line
2.34.1
Mark Brown
maintainerQuoted 4 lines · On Wed, 16 Apr 2025 17:25:47 +0800, [email protected] wrote:
This patch added the PDE status check which makes sure the PDE transition is done. It will decrease the pop noise at the beginning of DMIC recording.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[2/2] ASoC: rt722: fix pop noise at the beginning of DMIC recording
commit: 9b62b7a6574ea25e1da15b883de74284fb45197c
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark