ASoC: rt5682: fix jack type detection issue
Subsystems (3)
PATCH 1/2 ASoC: rt5682: fix jack type detection issue
From: Shuming Fan <[email protected]>
The jack type detection needs the main bias power of analog.
The modification makes sure the main bias power on/off while jack plug/unplug.
--- sound/soc/codecs/rt5682.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
sound/soc/codecs/rt5682.c +5 -7
@@ -915,7 +915,8 @@ static int rt5682_headset_detect(struct snd_soc_component *component,if (jack_insert) {snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , -RT5682_PWR_VREF2 ,RT5682_PWR_VREF2 ); +RT5682_PWR_VREF2 |RT5682_PWR_MB , +RT5682_PWR_VREF2 |RT5682_PWR_MB );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 ,RT5682_PWR_FV2 ,0 );usleep_range (15000 ,20000 );
@@ -952,7 +953,7 @@ static int rt5682_headset_detect(struct snd_soc_component *component,snd_soc_component_update_bits (component,RT5682_CBJ_CTRL_1 ,RT5682_TRIG_JD_MASK ,RT5682_TRIG_JD_LOW );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , -RT5682_PWR_VREF2 ,0 ); +RT5682_PWR_VREF2 |RT5682_PWR_MB ,0 );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_3 ,RT5682_PWR_CBJ ,0 );
@@ -2301,16 +2302,13 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,switch (level) {case SND_SOC_BIAS_PREPARE :regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB |RT5682_PWR_BG , -RT5682_PWR_MB |RT5682_PWR_BG ); +RT5682_PWR_BG ,RT5682_PWR_BG );regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO );break ;case SND_SOC_BIAS_STANDBY : -regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB ,RT5682_PWR_MB );regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL ,RT5682_DIG_GATE_CTRL );break ;
@@ -2318,7 +2316,7 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO ,0 );regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB |RT5682_PWR_BG ,0 ); +RT5682_PWR_BG ,0 );break ;default :
Signature · 1 line
2.21.0
Mark Brown
maintainerQuoted 4 lines · On Mon, Mar 18, 2019 at 03:17:13PM +0800, [email protected] wrote:
From: Shuming Fan <[email protected]>
The jack type detection needs the main bias power of analog.
The modification makes sure the main bias power on/off while jack plug/unplug.
This doesn't apply against current code, please check and resend.
A message that is not in the archive (sent off-list or not yet received): 10317AB43303BA4884D7AF9C2EBCFF4002B5D5E8@RTITMBSVM07.realtek.com.tw
Mark Brown
maintainerQuoted 7 lines · Shuming [范書銘]
Hi Mark,
This patch based on "ASoC: rt5682: Check JD status when system resume" patch. But "ASoC: rt5682: Check JD status when system resume" patch doesn't apply yet.
Could you please check "ASoC: rt5682: Check JD status when system resume" patch first ?
https://patchwork.kernel.org/patch/10844139/
I have seen that, it's really hard to understand. In any case, please resend like I said in the mail.
Mark Brown
maintainerApplied "ASoC: rt5682: fix jack type detection issue" to the asoc tree
In reply to [email protected]The patch
ASoC: rt5682: fix jack type detection issue
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
Quoted 1 line
From
675212bfb23394514b7f68ebf3954ba936281cccMon Sep 17 00:00:00 2001
From: Shuming Fan <[email protected]>
Date: Mon, 18 Mar 2019 15:17:13 +0800
Subject: [PATCH] ASoC: rt5682: fix jack type detection issue
The jack type detection needs the main bias power of analog.
The modification makes sure the main bias power on/off while jack plug/unplug.
--- sound/soc/codecs/rt5682.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
sound/soc/codecs/rt5682.c +5 -7
@@ -915,7 +915,8 @@ static int rt5682_headset_detect(struct snd_soc_component *component,if (jack_insert) {snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , -RT5682_PWR_VREF2 ,RT5682_PWR_VREF2 ); +RT5682_PWR_VREF2 |RT5682_PWR_MB , +RT5682_PWR_VREF2 |RT5682_PWR_MB );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 ,RT5682_PWR_FV2 ,0 );usleep_range (15000 ,20000 );
@@ -952,7 +953,7 @@ static int rt5682_headset_detect(struct snd_soc_component *component,snd_soc_component_update_bits (component,RT5682_CBJ_CTRL_1 ,RT5682_TRIG_JD_MASK ,RT5682_TRIG_JD_LOW );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_1 , -RT5682_PWR_VREF2 ,0 ); +RT5682_PWR_VREF2 |RT5682_PWR_MB ,0 );snd_soc_component_update_bits (component,RT5682_PWR_ANLG_3 ,RT5682_PWR_CBJ ,0 );
@@ -2301,16 +2302,13 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,switch (level) {case SND_SOC_BIAS_PREPARE :regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB |RT5682_PWR_BG , -RT5682_PWR_MB |RT5682_PWR_BG ); +RT5682_PWR_BG ,RT5682_PWR_BG );regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO );break ;case SND_SOC_BIAS_STANDBY : -regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB ,RT5682_PWR_MB );regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL ,RT5682_DIG_GATE_CTRL );break ;
@@ -2318,7 +2316,7 @@ static int rt5682_set_bias_level(struct snd_soc_component *component,regmap_update_bits (rt5682->regmap,RT5682_PWR_DIG_1 ,RT5682_DIG_GATE_CTRL |RT5682_PWR_LDO ,0 );regmap_update_bits (rt5682->regmap,RT5682_PWR_ANLG_1 , -RT5682_PWR_MB |RT5682_PWR_BG ,0 ); +RT5682_PWR_BG ,0 );break ;default :
Signature · 1 line
2.20.1