ASoC: rt298: reset AD dilter is there is no MCLK
Subsystems (3)
PATCH 1/2 ASoC: rt298: reset AD dilter is there is no MCLK
rt298 need to reset AD filter and the ADC settings will take effort.
--- sound/soc/codecs/rt298.c | 20 ++++++++++++++++++++ sound/soc/codecs/rt298.h | 2 ++ 2 files changed, 22 insertions(+)
sound/soc/codecs/rt298.c +20 -0
@@ -481,6 +481,26 @@ static int rt298_adc_event(struct snd_soc_dapm_widget *w,snd_soc_update_bits (codec,VERB_CMD (AC_VERB_SET_AMP_GAIN_MUTE , nid,0 ),0x7080 ,0x7000 ); +/* If MCLK doesn't exist, reset AD filter */ +if (!(snd_soc_read (codec,RT298_VAD_CTRL ) &0x200 )) { +pr_info ("NO MCLK\n" ); +switch (nid) { +case RT298_ADC_IN1 : +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x2 ,0x2 ); +mdelay (10 ); +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x2 ,0x0 ); +break ; +case RT298_ADC_IN2 : +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x4 ,0x4 ); +mdelay (10 ); +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x4 ,0x0 ); +break ; + } + }break ;case SND_SOC_DAPM_PRE_PMD : snd_soc_update_bits(codec,
sound/soc/codecs/rt298.h +2 -0
@@ -137,6 +137,7 @@#define RT298_A_BIAS_CTRL2 0x02#define RT298_POWER_CTRL1 0x03#define RT298_A_BIAS_CTRL3 0x04 +#define RT298_D_FILTER_CTRL 0x05#define RT298_POWER_CTRL2 0x08#define RT298_I2S_CTRL1 0x09#define RT298_I2S_CTRL2 0x0a
@@ -148,6 +149,7 @@#define RT298_IRQ_CTRL 0x33#define RT298_WIND_FILTER_CTRL 0x46#define RT298_PLL_CTRL1 0x49 +#define RT298_VAD_CTRL 0x4e#define RT298_CBJ_CTRL1 0x4f#define RT298_CBJ_CTRL2 0x50#define RT298_PLL_CTRL 0x63
Signature · 1 line
1.8.1.1.439.g50a6b54
PATCH 2/2 ASoC: rt298: fix capture doesn't work at some cases
RT298_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, RT298_CBJ_CTRL1(0x4f) bit 10 will be turned off. This patch move the bit control from rt298_set_bias_level and rt298_vref_event to rt298_jack_detect. So it will be turned on once a jack is plugged in.
--- sound/soc/codecs/rt298.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)
sound/soc/codecs/rt298.c +3 -28
@@ -275,6 +275,8 @@ static int rt298_jack_detect(struct rt298_priv *rt298, bool *hp, bool *mic) }else { *mic = false;regmap_write (rt298->regmap,RT298_SET_MIC1 ,0x20 ); +regmap_update_bits (rt298->regmap, +RT298_CBJ_CTRL1 ,0x0400 ,0x0000 ); } }else {regmap_read (rt298->regmap,RT298_GET_HP_SENSE , &buf);
@@ -539,30 +541,12 @@ static int rt298_mic1_event(struct snd_soc_dapm_widget *w,return 0 ; } -static int rt298_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, -RT298_CBJ_CTRL1 ,0x0400 ,0x0000 ); -mdelay (50 ); -break ; -default : -return 0 ; - } - -return 0 ; -} -static const struct snd_soc_dapm_widget rt298_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY_S ("HV" ,1 ,RT298_POWER_CTRL1 ,12 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("VREF" ,RT298_POWER_CTRL1 , -0 ,1 , rt298_vref_event,SND_SOC_DAPM_PRE_PMU ), +0 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY_S ("BG_MBIAS" ,1 ,RT298_POWER_CTRL2 ,1 ,0 ,NULL ,0 ), SND_SOC_DAPM_SUPPLY_S("LDO1", 1, RT298_POWER_CTRL2,
@@ -953,18 +937,9 @@ static int rt298_set_bias_level(struct snd_soc_codec *codec, }break ; -case SND_SOC_BIAS_ON : -mdelay (30 ); -snd_soc_update_bits (codec, -RT298_CBJ_CTRL1 ,0x0400 ,0x0400 ); - -break ; -case SND_SOC_BIAS_STANDBY :snd_soc_write (codec,RT298_SET_AUDIO_POWER ,AC_PWRST_D3 ); -snd_soc_update_bits (codec, -RT298_CBJ_CTRL1 ,0x0400 ,0x0000 );break ;default :
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainerApplied "ASoC: rt298: fix capture doesn't work at some cases" to the asoc tree
The patch
ASoC: rt298: 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
9ff49ce475cfeaf486321a2db8132a9500740faaMon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Tue, 26 Apr 2016 18:07:11 +0800
Subject: [PATCH] ASoC: rt298: fix capture doesn't work at some cases
RT298_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, RT298_CBJ_CTRL1(0x4f) bit 10 will be turned off. This patch move the bit control from rt298_set_bias_level and rt298_vref_event to rt298_jack_detect. So it will be turned on once a jack is plugged in.
--- sound/soc/codecs/rt298.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)
sound/soc/codecs/rt298.c +3 -28
@@ -275,6 +275,8 @@ static int rt298_jack_detect(struct rt298_priv *rt298, bool *hp, bool *mic) }else { *mic = false;regmap_write (rt298->regmap,RT298_SET_MIC1 ,0x20 ); +regmap_update_bits (rt298->regmap, +RT298_CBJ_CTRL1 ,0x0400 ,0x0000 ); } }else {regmap_read (rt298->regmap,RT298_GET_HP_SENSE , &buf);
@@ -539,30 +541,12 @@ static int rt298_mic1_event(struct snd_soc_dapm_widget *w,return 0 ; } -static int rt298_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, -RT298_CBJ_CTRL1 ,0x0400 ,0x0000 ); -mdelay (50 ); -break ; -default : -return 0 ; - } - -return 0 ; -} -static const struct snd_soc_dapm_widget rt298_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY_S ("HV" ,1 ,RT298_POWER_CTRL1 ,12 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("VREF" ,RT298_POWER_CTRL1 , -0 ,1 , rt298_vref_event,SND_SOC_DAPM_PRE_PMU ), +0 ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY_S ("BG_MBIAS" ,1 ,RT298_POWER_CTRL2 ,1 ,0 ,NULL ,0 ), SND_SOC_DAPM_SUPPLY_S("LDO1", 1, RT298_POWER_CTRL2,
@@ -953,18 +937,9 @@ static int rt298_set_bias_level(struct snd_soc_codec *codec, }break ; -case SND_SOC_BIAS_ON : -mdelay (30 ); -snd_soc_update_bits (codec, -RT298_CBJ_CTRL1 ,0x0400 ,0x0400 ); - -break ; -case SND_SOC_BIAS_STANDBY :snd_soc_write (codec,RT298_SET_AUDIO_POWER ,AC_PWRST_D3 ); -snd_soc_update_bits (codec, -RT298_CBJ_CTRL1 ,0x0400 ,0x0000 );break ;default :
Signature · 1 line
2.8.0.rc3
Mark Brown
maintainerApplied "ASoC: rt298: reset AD dilter is there is no MCLK" to the asoc tree
In reply to Bard LiaoThe patch
ASoC: rt298: reset AD dilter is there is no MCLK
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
3c9e014c442caefa14c71494ca4473121007f60fMon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Tue, 26 Apr 2016 18:07:10 +0800
Subject: [PATCH] ASoC: rt298: reset AD dilter is there is no MCLK
rt298 need to reset AD filter and the ADC settings will take effort.
--- sound/soc/codecs/rt298.c | 20 ++++++++++++++++++++ sound/soc/codecs/rt298.h | 2 ++ 2 files changed, 22 insertions(+)
sound/soc/codecs/rt298.c +20 -0
@@ -481,6 +481,26 @@ static int rt298_adc_event(struct snd_soc_dapm_widget *w,snd_soc_update_bits (codec,VERB_CMD (AC_VERB_SET_AMP_GAIN_MUTE , nid,0 ),0x7080 ,0x7000 ); +/* If MCLK doesn't exist, reset AD filter */ +if (!(snd_soc_read (codec,RT298_VAD_CTRL ) &0x200 )) { +pr_info ("NO MCLK\n" ); +switch (nid) { +case RT298_ADC_IN1 : +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x2 ,0x2 ); +mdelay (10 ); +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x2 ,0x0 ); +break ; +case RT298_ADC_IN2 : +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x4 ,0x4 ); +mdelay (10 ); +snd_soc_update_bits (codec, +RT298_D_FILTER_CTRL ,0x4 ,0x0 ); +break ; + } + }break ;case SND_SOC_DAPM_PRE_PMD : snd_soc_update_bits(codec,
sound/soc/codecs/rt298.h +2 -0
@@ -137,6 +137,7 @@#define RT298_A_BIAS_CTRL2 0x02#define RT298_POWER_CTRL1 0x03#define RT298_A_BIAS_CTRL3 0x04 +#define RT298_D_FILTER_CTRL 0x05#define RT298_POWER_CTRL2 0x08#define RT298_I2S_CTRL1 0x09#define RT298_I2S_CTRL2 0x0a
@@ -148,6 +149,7 @@#define RT298_IRQ_CTRL 0x33#define RT298_WIND_FILTER_CTRL 0x46#define RT298_PLL_CTRL1 0x49 +#define RT298_VAD_CTRL 0x4e#define RT298_CBJ_CTRL1 0x4f#define RT298_CBJ_CTRL2 0x50#define RT298_PLL_CTRL 0x63
Signature · 1 line
2.8.0.rc3