shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rk3308_codec: clear ADC/DAC digital registers before configuration

Browse Source 
We need to clear previous residual configuration for
ADC/DAC digital registers before enable them, otherwise,
the acodec maybe abnormal.

Change-Id: I2eeb6ccf1508cf10d214d97c29273d70d16f3417
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
This commit is contained in:
Xing Zheng
2018-05-09 10:11:10 +08:00
committed by Tao Huang
parent 97802925c1
commit 4ea2cc2a65
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sound/soc/codecs/rk3308_codec.c
View File

@@ -455,6 +455,32 @@ static int rk3308_codec_reset(struct snd_soc_codec *codec)
return 0;
}
static int rk3308_codec_adc_dig_reset(struct rk3308_codec_priv *rk3308)
{
regmap_update_bits(rk3308->regmap, RK3308_GLB_CON,
RK3308_ADC_DIG_WORK,
RK3308_ADC_DIG_RESET);
udelay(50);
regmap_update_bits(rk3308->regmap, RK3308_GLB_CON,
RK3308_ADC_DIG_WORK,
RK3308_ADC_DIG_WORK);
return 0;
}
static int rk3308_codec_dac_dig_reset(struct rk3308_codec_priv *rk3308)
{
regmap_update_bits(rk3308->regmap, RK3308_GLB_CON,
RK3308_DAC_DIG_WORK,
RK3308_DAC_DIG_RESET);
udelay(50);
regmap_update_bits(rk3308->regmap, RK3308_GLB_CON,
RK3308_DAC_DIG_WORK,
RK3308_DAC_DIG_WORK);
return 0;
}
static int rk3308_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
@@ -606,6 +632,9 @@ static int rk3308_hw_params(struct snd_pcm_substream *substream,
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
unsigned int dac_aif1 = 0, dac_aif2 = 0;
/* Clear the status of DAC DIG Digital reigisters */
rk3308_codec_dac_dig_reset(rk3308);
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
dac_aif1 |= RK3308_DAC_I2S_VALID_LEN_16BITS;
@@ -637,6 +666,9 @@ static int rk3308_hw_params(struct snd_pcm_substream *substream,
unsigned int adc_aif1 = 0, adc_aif2 = 0;
int grp, cur_grp_max;
/* Clear the status of ADC DIG Digital reigisters */
rk3308_codec_adc_dig_reset(rk3308);
switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE:
adc_aif1 |= RK3308_ADC_I2S_VALID_LEN_16BITS;