ASoC: rt286: fix capture doesn't work at some cases
Subsystems (3)
PATCH 1/1 ASoC: rt286: fix capture doesn't work at some cases
RT286_CBJ_CTRL1(0x4f) bit 10 is needed for headset capture. It will be turned off when "VREF" widget is on and be turned on when bias level is ON. It is odd. And if "VREF" is turned on in bias level is ON, RT286_CBJ_CTRL1(0x4f) bit 10 will be turned off. This patch move the bit control from rt286_set_bias_level and rt298_vref_event to rt286_jack_detect. So it will be turned on once a jack is plugged in.
---
The bit is already set in rt286_jack_detect's jack in case, So, it is not on the patch.
--- sound/soc/codecs/rt286.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-)
sound/soc/codecs/rt286.c +3 -23
@@ -266,6 +266,8 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) }else { *mic = false;regmap_write (rt286->regmap,RT286_SET_MIC1 ,0x20 ); +regmap_update_bits (rt286->regmap, +RT286_CBJ_CTRL1 ,0x0400 ,0x0000 ); } }else {regmap_read (rt286->regmap,RT286_GET_HP_SENSE , &buf);
@@ -470,24 +472,6 @@ static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w,return 0 ; } -static int rt286_vref_event (struct snd_soc_dapm_widget *w, -struct snd_kcontrol *kcontrol,int event) -{ -struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); - -switch (event) { -case SND_SOC_DAPM_PRE_PMU : -snd_soc_update_bits (codec, -RT286_CBJ_CTRL1 ,0x0400 ,0x0000 ); -mdelay (50 ); -break ; -default : -return 0 ; - } - -return 0 ; -} -static int rt286_ldo2_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
@@ -536,7 +520,7 @@ static const struct snd_soc_dapm_widget rt286_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY_S ("HV" ,1 ,RT286_POWER_CTRL1 ,12 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("VREF" ,RT286_POWER_CTRL1 , -0 ,1 , rt286_vref_event,SND_SOC_DAPM_PRE_PMU ), +0 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY_S ("LDO1" ,1 ,RT286_POWER_CTRL2 ,2 ,0 ,NULL ,0 ), SND_SOC_DAPM_SUPPLY_S("LDO2", 2, RT286_POWER_CTRL1,
@@ -911,8 +895,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_ON :mdelay (10 );snd_soc_update_bits (codec, -RT286_CBJ_CTRL1 ,0x0400 ,0x0400 ); -snd_soc_update_bits (codec,RT286_DC_GAIN ,0x200 ,0x0 );break ;
@@ -920,8 +902,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_STANDBY :snd_soc_write (codec,RT286_SET_AUDIO_POWER ,AC_PWRST_D3 ); -snd_soc_update_bits (codec, -RT286_CBJ_CTRL1 ,0x0400 ,0x0000 );break ;default :
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainerApplied "ASoC: rt286: fix capture doesn't work at some cases" to the asoc tree
The patch
ASoC: rt286: fix capture doesn't work at some cases
has been applied to the asoc tree at
git://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
6d514c720219a4c0e1c2612c1d830592bfaf5a03Mon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Thu, 21 Jan 2016 14:10:48 +0800
Subject: [PATCH] ASoC: rt286: fix capture doesn't work at some cases
RT286_CBJ_CTRL1(0x4f) bit 10 is needed for headset capture. It will be turned off when "VREF" widget is on and be turned on when bias level is ON. It is odd. And if "VREF" is turned on in bias level is ON, RT286_CBJ_CTRL1(0x4f) bit 10 will be turned off. This patch move the bit control from rt286_set_bias_level and rt298_vref_event to rt286_jack_detect. So it will be turned on once a jack is plugged in.
--- sound/soc/codecs/rt286.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-)
sound/soc/codecs/rt286.c +3 -23
@@ -266,6 +266,8 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) }else { *mic = false;regmap_write (rt286->regmap,RT286_SET_MIC1 ,0x20 ); +regmap_update_bits (rt286->regmap, +RT286_CBJ_CTRL1 ,0x0400 ,0x0000 ); } }else {regmap_read (rt286->regmap,RT286_GET_HP_SENSE , &buf);
@@ -470,24 +472,6 @@ static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w,return 0 ; } -static int rt286_vref_event (struct snd_soc_dapm_widget *w, -struct snd_kcontrol *kcontrol,int event) -{ -struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); - -switch (event) { -case SND_SOC_DAPM_PRE_PMU : -snd_soc_update_bits (codec, -RT286_CBJ_CTRL1 ,0x0400 ,0x0000 ); -mdelay (50 ); -break ; -default : -return 0 ; - } - -return 0 ; -} -static int rt286_ldo2_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
@@ -536,7 +520,7 @@ static const struct snd_soc_dapm_widget rt286_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY_S ("HV" ,1 ,RT286_POWER_CTRL1 ,12 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("VREF" ,RT286_POWER_CTRL1 , -0 ,1 , rt286_vref_event,SND_SOC_DAPM_PRE_PMU ), +0 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY_S ("LDO1" ,1 ,RT286_POWER_CTRL2 ,2 ,0 ,NULL ,0 ), SND_SOC_DAPM_SUPPLY_S("LDO2", 2, RT286_POWER_CTRL1,
@@ -911,8 +895,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_ON :mdelay (10 );snd_soc_update_bits (codec, -RT286_CBJ_CTRL1 ,0x0400 ,0x0400 ); -snd_soc_update_bits (codec,RT286_DC_GAIN ,0x200 ,0x0 );break ;
@@ -920,8 +902,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_STANDBY :snd_soc_write (codec,RT286_SET_AUDIO_POWER ,AC_PWRST_D3 ); -snd_soc_update_bits (codec, -RT286_CBJ_CTRL1 ,0x0400 ,0x0000 );break ;default :
Signature · 1 line
2.7.0.rc3