ASoC: rt5682: recording has no sound after booting
Subsystems (3)
PATCH 2/2 ASoC: rt5682: recording has no sound after booting
From: Shuming Fan <[email protected]>
If ASRC turns on, HW will use clk_dac as the reference clock whether recording or playback.
Both of clk_dac and clk_adc should set proper clock while using ASRC.
--- sound/soc/codecs/rt5682.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
sound/soc/codecs/rt5682.c +5 -9
@@ -1208,7 +1208,7 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w,struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm);struct rt5682_priv *rt5682 =snd_soc_component_get_drvdata (component); -int ref, val, reg, sft, mask, idx = -EINVAL ; +int ref, val, reg, idx = -EINVAL ;static const int div_f[] = {1 ,2 ,3 ,4 ,6 ,8 ,12 ,16 ,24 ,32 ,48 };static const int div_o[] = {1 ,2 ,4 ,6 ,8 ,12 ,16 ,24 ,32 ,48 };
@@ -1222,15 +1222,10 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w, idx =rt5682_div_sel (rt5682, ref, div_f,ARRAY_SIZE (div_f)); -if (w->shift ==RT5682_PWR_ADC_S1F_BIT ) { +if (w->shift ==RT5682_PWR_ADC_S1F_BIT ) reg =RT5682_PLL_TRACK_3 ; - sft =RT5682_ADC_OSR_SFT ; - mask =RT5682_ADC_OSR_MASK ; - }else { +else reg =RT5682_PLL_TRACK_2 ; - sft =RT5682_DAC_OSR_SFT ; - mask =RT5682_DAC_OSR_MASK ; - }snd_soc_component_update_bits (component, reg,RT5682_FILTER_CLK_DIV_MASK , idx <<RT5682_FILTER_CLK_DIV_SFT );
@@ -1242,7 +1237,8 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w, }snd_soc_component_update_bits (component,RT5682_ADDA_CLK_1 , - mask, idx << sft); +RT5682_ADC_OSR_MASK |RT5682_DAC_OSR_MASK , + (idx <<RT5682_ADC_OSR_SFT ) | (idx <<RT5682_DAC_OSR_SFT ));return 0 ; }
Signature · 1 line
2.21.0
Mark Brown
maintainerQuoted 5 lines · On Mon, Mar 18, 2019 at 03:17:42PM +0800, [email protected] wrote:
From: Shuming Fan <[email protected]>
If ASRC turns on, HW will use
clk_dacas the reference clock whether recording or playback.
Both ofclk_dacandclk_adcshould set proper clock while using ASRC.
This also doesn't apply, please check and resend.
Mark Brown
maintainerApplied "ASoC: rt5682: recording has no sound after booting" to the asoc tree
In reply to [email protected]The patch
ASoC: rt5682: recording has no sound after booting
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
1c5b6a27e432e4fe170a924c8b41012271496a4cMon Sep 17 00:00:00 2001
From: Shuming Fan <[email protected]>
Date: Mon, 18 Mar 2019 15:17:42 +0800
Subject: [PATCH] ASoC: rt5682: recording has no sound after booting
If ASRC turns on, HW will use clk_dac as the reference clock whether recording or playback.
Both of clk_dac and clk_adc should set proper clock while using ASRC.
--- sound/soc/codecs/rt5682.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
sound/soc/codecs/rt5682.c +5 -9
@@ -1208,7 +1208,7 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w,struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm);struct rt5682_priv *rt5682 =snd_soc_component_get_drvdata (component); -int ref, val, reg, sft, mask, idx = -EINVAL ; +int ref, val, reg, idx = -EINVAL ;static const int div_f[] = {1 ,2 ,3 ,4 ,6 ,8 ,12 ,16 ,24 ,32 ,48 };static const int div_o[] = {1 ,2 ,4 ,6 ,8 ,12 ,16 ,24 ,32 ,48 };
@@ -1222,15 +1222,10 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w, idx =rt5682_div_sel (rt5682, ref, div_f,ARRAY_SIZE (div_f)); -if (w->shift ==RT5682_PWR_ADC_S1F_BIT ) { +if (w->shift ==RT5682_PWR_ADC_S1F_BIT ) reg =RT5682_PLL_TRACK_3 ; - sft =RT5682_ADC_OSR_SFT ; - mask =RT5682_ADC_OSR_MASK ; - }else { +else reg =RT5682_PLL_TRACK_2 ; - sft =RT5682_DAC_OSR_SFT ; - mask =RT5682_DAC_OSR_MASK ; - }snd_soc_component_update_bits (component, reg,RT5682_FILTER_CLK_DIV_MASK , idx <<RT5682_FILTER_CLK_DIV_SFT );
@@ -1242,7 +1237,8 @@ static int set_filter_clk(struct snd_soc_dapm_widget *w, }snd_soc_component_update_bits (component,RT5682_ADDA_CLK_1 , - mask, idx << sft); +RT5682_ADC_OSR_MASK |RT5682_DAC_OSR_MASK , + (idx <<RT5682_ADC_OSR_SFT ) | (idx <<RT5682_DAC_OSR_SFT ));return 0 ; }
Signature · 1 line
2.20.1