Skip to contentSkip to conversation

ASoC: rt5682: fix the random recording noise of headset

PATCH In review [email protected] 4 participants 7 messages Mar 17, 2020 – Mar 18, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ASoC: rt5682: fix the random recording noise of headset

From: Shuming Fan <[email protected]>

The cycle time of FIFO clock should increase 2 times to avoid the random recording noise issue.
This setting could apply to all known situations in i2s mode.

---
 sound/soc/codecs/rt5682.c | 2 ++
 sound/soc/codecs/rt5682.h | 2 ++
 2 files changed, 4 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
index 7ca02a5e52e9..023bc672274b 100644
@@ -3643,6 +3643,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
 			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
 	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
 			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
+			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
 
 	INIT_DELAYED_WORK(&rt5682->jack_detect_work,
 				rt5682_jack_detect_handler);
sound/soc/codecs/rt5682.h +2 -0
index 43de6e802309..0baeece84ec4 100644
@@ -657,6 +657,8 @@
 #define RT5682_DMIC_1_EN_SFT			15
 #define RT5682_DMIC_1_DIS			(0x0 << 15)
 #define RT5682_DMIC_1_EN			(0x1 << 15)
+#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)
+#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)
 #define RT5682_DMIC_1_DP_MASK			(0x3 << 4)
 #define RT5682_DMIC_1_DP_SFT			4
 #define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)
Signature · 1 line
2.25.1
#1 lore raw
Quoted 5 lines · On 3/17/20 3:33 PM, [email protected] wrote:

From: Shuming Fan <[email protected]>

The cycle time of FIFO clock should increase 2 times to avoid the random recording noise issue.
This setting could apply to all known situations in i2s mode.

Thanks for fixing this Shuming.

Just try to understand what has happened.

Can you help share more details about it, e.g.
1. the recording noise happened on headset mic or dmic?
2. will this change impact the microphone sampling clock, or the BCLK that of the I2S bclk pin?
3. without this change, why the clk is wrong, some example?

Thanks,
~Keyon

Quoted 34 lines
---
  sound/soc/codecs/rt5682.c | 2 ++
  sound/soc/codecs/rt5682.h | 2 ++
  2 files changed, 4 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
index 7ca02a5e52e9..023bc672274b 100644
@@ -3643,6 +3643,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
  			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
  	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
  			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
+			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
 
  	INIT_DELAYED_WORK(&rt5682->jack_detect_work,
  				rt5682_jack_detect_handler);
sound/soc/codecs/rt5682.h +2 -0
index 43de6e802309..0baeece84ec4 100644
@@ -657,6 +657,8 @@
  #define RT5682_DMIC_1_EN_SFT			15
  #define RT5682_DMIC_1_DIS			(0x0 << 15)
  #define RT5682_DMIC_1_EN			(0x1 << 15)
+#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)
+#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)
  #define RT5682_DMIC_1_DP_MASK			(0x3 << 4)
  #define RT5682_DMIC_1_DP_SFT			4
  #define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)
#2 lore raw

Dear Sir,

Inline.

Thanks,
Albert

-----Original Message-----
From: Keyon Jie <[email protected]>
Sent: Wednesday, March 18, 2020 10:32 AM
To: Shuming [范書銘] <[email protected]>; [email protected]; [email protected]
Cc: Oder Chiou <[email protected]>; Jack Yu <[email protected]>; [email protected]; [email protected]; Albert Chen <[email protected]>; Derek [方德義] <[email protected]>; [email protected]; Flove(HsinFu) <[email protected]>
Subject: Re: [PATCH 1/2] ASoC: rt5682: fix the random recording noise of headset

Quoted 5 lines · On 3/17/20 3:33 PM, [email protected] wrote:

From: Shuming Fan <[email protected]>

The cycle time of FIFO clock should increase 2 times to avoid the random recording noise issue.
This setting could apply to all known situations in i2s mode.

Thanks for fixing this Shuming.

Just try to understand what has happened.

Can you help share more details about it, e.g.
1. the recording noise happened on headset mic or dmic?
<Albert> Headset Mic
2. will this change impact the microphone sampling clock, or the BCLK that of the I2S bclk pin? <Albert> No.
3. without this change, why the clk is wrong, some example?
<Albert> Only adjust FIFO buffer setting.

Thanks,
~Keyon

Quoted 26 lines
---
  sound/soc/codecs/rt5682.c | 2 ++
  sound/soc/codecs/rt5682.h | 2 ++
  2 files changed, 4 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
index 7ca02a5e52e9..023bc672274b 100644
@@ -3643,6 +3643,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
  			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
  	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
  			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
+			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
 
  	INIT_DELAYED_WORK(&rt5682->jack_detect_work,
  				rt5682_jack_detect_handler);
sound/soc/codecs/rt5682.h +0 -0
index 43de6e802309..0baeece84ec4 100644

sound/soc/codecs/rt5682.h line 664

Quoted 8 lines
sound/soc/codecs/rt5682.h +2 -0
@@ -657,6 +657,8 @@
  #define RT5682_DMIC_1_EN_SFT			15
  #define RT5682_DMIC_1_DIS			(0x0 << 15)
  #define RT5682_DMIC_1_EN			(0x1 << 15)
+#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)
+#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)
  #define RT5682_DMIC_1_DP_MASK			(0x3 << 4)
  #define RT5682_DMIC_1_DP_SFT			4
  #define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)

------Please consider the environment before printing this e-mail.

#3 lore raw
Quoted 25 lines · Albert Chen

Dear Sir,

Inline.

Thanks,
Albert

-----Original Message-----
From: Keyon Jie <[email protected]>
Sent: Wednesday, March 18, 2020 10:32 AM
To: Shuming [范書銘] <[email protected]>; [email protected]; [email protected]
Cc: Oder Chiou <[email protected]>; Jack Yu <[email protected]>; [email protected]; [email protected]; Albert Chen <[email protected]>; Derek [方德義] <[email protected]>; [email protected]; Flove(HsinFu) <[email protected]>
Subject: Re: [PATCH 1/2] ASoC: rt5682: fix the random recording noise of headset

Quoted 5 lines · On 3/17/20 3:33 PM, [email protected] wrote:

From: Shuming Fan <[email protected]>

The cycle time of FIFO clock should increase 2 times to avoid the random recording noise issue.
This setting could apply to all known situations in i2s mode.

Thanks for fixing this Shuming.

Just try to understand what has happened.

Quoted 7 lines

Can you help share more details about it, e.g.
1. the recording noise happened on headset mic or dmic?
<Albert> Headset Mic
2. will this change impact the microphone sampling clock, or the BCLK that of the I2S bclk pin? <Albert> No.
3. without this change, why the clk is wrong, some example?
<Albert> Only adjust FIFO buffer setting.

Where is the FIFO buffer you mentioned located? Is it included in the path "headset mic ADC--(loopback)-->ADC headphone"?

The issue was reported to Intel also, that's why I am querying this here.

From previous feedback, Shuming shared that the loopback path mentioned above don't have this random noise issue.

Thanks,
~Keyon

Quoted 41 lines

Thanks,
~Keyon

Quoted 26 lines
---
   sound/soc/codecs/rt5682.c | 2 ++
   sound/soc/codecs/rt5682.h | 2 ++
   2 files changed, 4 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
index 7ca02a5e52e9..023bc672274b 100644
@@ -3643,6 +3643,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
   			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
   	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
   			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
+			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
 
   	INIT_DELAYED_WORK(&rt5682->jack_detect_work,
   				rt5682_jack_detect_handler);
sound/soc/codecs/rt5682.h +0 -0
index 43de6e802309..0baeece84ec4 100644

sound/soc/codecs/rt5682.h line 664

Quoted 8 lines
sound/soc/codecs/rt5682.h +2 -0
@@ -657,6 +657,8 @@
   #define RT5682_DMIC_1_EN_SFT			15
   #define RT5682_DMIC_1_DIS			(0x0 << 15)
   #define RT5682_DMIC_1_EN			(0x1 << 15)
+#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)
+#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)
   #define RT5682_DMIC_1_DP_MASK			(0x3 << 4)
   #define RT5682_DMIC_1_DP_SFT			4
   #define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)

------Please consider the environment before printing this e-mail.

#4 lore raw

-----Original Message-----
From: Keyon Jie <[email protected]>
Sent: Wednesday, March 18, 2020 11:31 AM
To: Albert Chen <[email protected]>; Shuming [范書銘] <[email protected]>; [email protected]; [email protected]
Cc: Oder Chiou <[email protected]>; Jack Yu <[email protected]>; [email protected]; [email protected]; Derek [方德義] <[email protected]>; [email protected]; Flove(HsinFu) <[email protected]>
Subject: Re: [PATCH 1/2] ASoC: rt5682: fix the random recording noise of headset

Quoted 31 lines · Albert Chen

Dear Sir,

Inline.

Thanks,
Albert

-----Original Message-----
From: Keyon Jie <[email protected]>
Sent: Wednesday, March 18, 2020 10:32 AM
To: Shuming [范書銘] <[email protected]>; [email protected]; [email protected]
Cc: Oder Chiou <[email protected]>; Jack Yu <[email protected]>; [email protected]; [email protected]; Albert Chen <[email protected]>; Derek [方德義] <[email protected]>; [email protected]; Flove(HsinFu) <[email protected]>
Subject: Re: [PATCH 1/2] ASoC: rt5682: fix the random recording noise of headset

Quoted 5 lines · On 3/17/20 3:33 PM, [email protected] wrote:

From: Shuming Fan <[email protected]>

The cycle time of FIFO clock should increase 2 times to avoid the random recording noise issue.
This setting could apply to all known situations in i2s mode.

Thanks for fixing this Shuming.

Just try to understand what has happened.

Quoted 7 lines

Can you help share more details about it, e.g.
1. the recording noise happened on headset mic or dmic?
<Albert> Headset Mic
2. will this change impact the microphone sampling clock, or the BCLK that of the I2S bclk pin? <Albert> No.
3. without this change, why the clk is wrong, some example?
<Albert> Only adjust FIFO buffer setting.

Where is the FIFO buffer you mentioned located? Is it included in the path "headset mic ADC--(loopback)-->ADC headphone"? <Albert> I2S interface.

The issue was reported to Intel also, that's why I am querying this here.

From previous feedback, Shuming shared that the loopback path mentioned above don't have this random noise issue.

<Albert>These are have total two recording random noise issues, one is the PCB trace design and another is Codec setting, Our previous reported is PCB trace cause noise.

Thanks,
~Keyon

Quoted 41 lines

Thanks,
~Keyon

Quoted 26 lines
---
   sound/soc/codecs/rt5682.c | 2 ++
   sound/soc/codecs/rt5682.h | 2 ++
   2 files changed, 4 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
index 7ca02a5e52e9..023bc672274b 100644
@@ -3643,6 +3643,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
   			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
   	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
   			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
+			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
 
   	INIT_DELAYED_WORK(&rt5682->jack_detect_work,
   				rt5682_jack_detect_handler);
sound/soc/codecs/rt5682.h +0 -0
index 43de6e802309..0baeece84ec4 100644

sound/soc/codecs/rt5682.h line 664

Quoted 8 lines
sound/soc/codecs/rt5682.h +2 -0
@@ -657,6 +657,8 @@
   #define RT5682_DMIC_1_EN_SFT			15
   #define RT5682_DMIC_1_DIS			(0x0 << 15)
   #define RT5682_DMIC_1_EN			(0x1 << 15)
+#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)
+#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)
   #define RT5682_DMIC_1_DP_MASK			(0x3 << 4)
   #define RT5682_DMIC_1_DP_SFT			4
   #define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)

------Please consider the environment before printing this e-mail.

#5 lore raw
Quoted 50 lines · Albert Chen

-----Original Message-----
From: Keyon Jie <[email protected]>
Sent: Wednesday, March 18, 2020 11:31 AM
To: Albert Chen <[email protected]>; Shuming [范書銘] <[email protected]>; [email protected]; [email protected]
Cc: Oder Chiou <[email protected]>; Jack Yu <[email protected]>; [email protected]; [email protected]; Derek [方德義] <[email protected]>; [email protected]; Flove(HsinFu) <[email protected]>
Subject: Re: [PATCH 1/2] ASoC: rt5682: fix the random recording noise of headset

Quoted 31 lines · Albert Chen

Dear Sir,

Inline.

Thanks,
Albert

-----Original Message-----
From: Keyon Jie <[email protected]>
Sent: Wednesday, March 18, 2020 10:32 AM
To: Shuming [范書銘] <[email protected]>; [email protected]; [email protected]
Cc: Oder Chiou <[email protected]>; Jack Yu <[email protected]>; [email protected]; [email protected]; Albert Chen <[email protected]>; Derek [方德義] <[email protected]>; [email protected]; Flove(HsinFu) <[email protected]>
Subject: Re: [PATCH 1/2] ASoC: rt5682: fix the random recording noise of headset

Quoted 5 lines · On 3/17/20 3:33 PM, [email protected] wrote:

From: Shuming Fan <[email protected]>

The cycle time of FIFO clock should increase 2 times to avoid the random recording noise issue.
This setting could apply to all known situations in i2s mode.

Thanks for fixing this Shuming.

Just try to understand what has happened.

Quoted 7 lines

Can you help share more details about it, e.g.
1. the recording noise happened on headset mic or dmic?
<Albert> Headset Mic
2. will this change impact the microphone sampling clock, or the BCLK that of the I2S bclk pin? <Albert> No.
3. without this change, why the clk is wrong, some example?
<Albert> Only adjust FIFO buffer setting.

Quoted 8 lines

Where is the FIFO buffer you mentioned located? Is it included in the path "headset mic ADC--(loopback)-->ADC headphone"? <Albert> I2S interface.

The issue was reported to Intel also, that's why I am querying this here.

From previous feedback, Shuming shared that the loopback path mentioned above don't have this random noise issue.

<Albert>These are have total two recording random noise issues, one is the PCB trace design and another is Codec setting, Our previous reported is PCB trace cause noise.

Okay, thanks for explaining. Looks good to me now. :)

Thanks,
~Keyon

Quoted 45 lines

Thanks,
~Keyon

Quoted 41 lines

Thanks,
~Keyon

Quoted 26 lines
---
    sound/soc/codecs/rt5682.c | 2 ++
    sound/soc/codecs/rt5682.h | 2 ++
    2 files changed, 4 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
index 7ca02a5e52e9..023bc672274b 100644
@@ -3643,6 +3643,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
    			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
    	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
    			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
+			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
 
    	INIT_DELAYED_WORK(&rt5682->jack_detect_work,
    				rt5682_jack_detect_handler);
sound/soc/codecs/rt5682.h +0 -0
index 43de6e802309..0baeece84ec4 100644

sound/soc/codecs/rt5682.h line 664

Quoted 8 lines
sound/soc/codecs/rt5682.h +2 -0
@@ -657,6 +657,8 @@
    #define RT5682_DMIC_1_EN_SFT			15
    #define RT5682_DMIC_1_DIS			(0x0 << 15)
    #define RT5682_DMIC_1_EN			(0x1 << 15)
+#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)
+#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)
    #define RT5682_DMIC_1_DP_MASK			(0x3 << 4)
    #define RT5682_DMIC_1_DP_SFT			4
    #define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)

------Please consider the environment before printing this e-mail.

maintainer
#6 lore raw

Applied "ASoC: rt5682: fix the random recording noise of headset" to the asoc tree

In reply to [email protected]

The patch

ASoC: rt5682: fix the random recording noise of headset

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

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

From 557270e8dc79f66a1db8907eb3079ade60241fe7 Mon Sep 17 00:00:00 2001
From: Shuming Fan <[email protected]>
Date: Tue, 17 Mar 2020 15:33:08 +0800
Subject: [PATCH] ASoC: rt5682: fix the random recording noise of headset

The cycle time of FIFO clock should increase 2 times to avoid the random recording noise issue.
This setting could apply to all known situations in i2s mode.

---
 sound/soc/codecs/rt5682.c | 2 ++
 sound/soc/codecs/rt5682.h | 2 ++
 2 files changed, 4 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
index 063dd338539d..3e0b5c43ece8 100644
@@ -2651,6 +2651,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
 			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
 	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
 			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
+	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
+			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
 
 	INIT_DELAYED_WORK(&rt5682->jack_detect_work,
 				rt5682_jack_detect_handler);
sound/soc/codecs/rt5682.h +2 -0
index 18faaa2a49a0..fc99e7484283 100644
@@ -651,6 +651,8 @@
 #define RT5682_DMIC_1_EN_SFT			15
 #define RT5682_DMIC_1_DIS			(0x0 << 15)
 #define RT5682_DMIC_1_EN			(0x1 << 15)
+#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)
+#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)
 #define RT5682_DMIC_1_DP_MASK			(0x3 << 4)
 #define RT5682_DMIC_1_DP_SFT			4
 #define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)
Signature · 1 line
2.20.1