ASoC: rt5665: fix wrong shift rt5665_if2_1_adc_in_enum
Subsystems (3)
PATCH 1/2 ASoC: rt5665: fix wrong shift rt5665_if2_1_adc_in_enum
The shift is RT5665_IF2_1_ADC_IN_SFT not RT5665_IF3_ADC_IN_SFT.
Signed-off-by Bard Liao <[email protected]>
--- sound/soc/codecs/rt5665.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5665.c +1 -1
@@ -2256,7 +2256,7 @@ static const char * const rt5665_if2_1_adc_in_src[] = {static const SOC_ENUM_SINGLE_DECL ( rt5665_if2_1_adc_in_enum, RT5665_DIG_INF2_DATA, - RT5665_IF3_ADC_IN_SFT, rt5665_if2_1_adc_in_src); + RT5665_IF2_1_ADC_IN_SFT, rt5665_if2_1_adc_in_src);static const struct snd_kcontrol_new rt5665_if2_1_adc_in_mux =SOC_DAPM_ENUM ("IF2_1 ADC IN Source" , rt5665_if2_1_adc_in_enum);
Signature · 1 line
2.7.4
PATCH 2/2 ASoC: rt5665: fix wrong pre div reg of IF2 and IF3
The pre divider control register of IF1 and IF2/3 are different. The driver used the same register for all interfaces which was a mistake.
Signed-off-by Bard Liao <[email protected]>
--- sound/soc/codecs/rt5665.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5665.c +5 -2
@@ -4080,7 +4080,7 @@ static int rt5665_hw_params(struct snd_pcm_substream *substream, {struct snd_soc_codec *codec = dai->codec;struct rt5665_priv *rt5665 =snd_soc_codec_get_drvdata (codec); -unsigned int val_len =0 , val_clk, mask_clk, val_bits =0x0100 ; +unsigned int val_len =0 , val_clk, reg_clk, mask_clk, val_bits =0x0100 ;int pre_div, frame_size; rt5665->lrck[dai->id] =params_rate (params);
@@ -4124,6 +4124,7 @@ static int rt5665_hw_params(struct snd_pcm_substream *substream,if (params_channels (params) >2 )rt5665_set_tdm_slot (dai,0xf ,0xf ,params_channels (params),params_width (params)); + reg_clk =RT5665_ADDA_CLK_1 ; mask_clk =RT5665_I2S_PD1_MASK ; val_clk = pre_div <<RT5665_I2S_PD1_SFT ; snd_soc_update_bits(codec, RT5665_I2S1_SDP,
@@ -4131,12 +4132,14 @@ static int rt5665_hw_params(struct snd_pcm_substream *substream,break ;case RT5665_AIF2_1 :case RT5665_AIF2_2 : + reg_clk =RT5665_ADDA_CLK_2 ; mask_clk =RT5665_I2S_PD2_MASK ; val_clk = pre_div <<RT5665_I2S_PD2_SFT ;snd_soc_update_bits (codec,RT5665_I2S2_SDP ,RT5665_I2S_DL_MASK , val_len);break ;case RT5665_AIF3 : + reg_clk =RT5665_ADDA_CLK_2 ; mask_clk =RT5665_I2S_PD3_MASK ; val_clk = pre_div <<RT5665_I2S_PD3_SFT ; snd_soc_update_bits(codec, RT5665_I2S3_SDP,
@@ -4147,7 +4150,7 @@ static int rt5665_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } -snd_soc_update_bits (codec,RT5665_ADDA_CLK_1 , mask_clk, val_clk); +snd_soc_update_bits (codec, reg_clk, mask_clk, val_clk);snd_soc_update_bits (codec,RT5665_STO1_DAC_SIL_DET ,0x3700 , val_bits);switch (rt5665->lrck[dai->id]) {
Signature · 1 line
2.7.4