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: put more delay in enable DAC steps

Browse Source 
There is still the issue that loud and small on some
EVBs. For mass production consistency, we need to
increase and put more delay in enable DAC steps.

The suggest from vendor, we need to use 50 us instead
of 20 us for the key step 2 and step 4, insert 20 us
in other every steps.

Therefore, the total delay in enable DAC is about:
50 * 2 + 20 * 16 = 420us
It looks okay.

Change-Id: Ibc02930271a8a21bc279ee4323e66852f2d58086
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
This commit is contained in:
Xing Zheng
2018-05-08 20:06:34 +08:00
committed by Tao Huang
parent 40a9912f2f
commit fefcebe591
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -777,6 +777,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_CURRENT_MSK,
RK3308_DAC_CURRENT_EN);
udelay(20);
/*
* 2. Set the ACODEC_DAC_ANA_CON1[6] and ACODEC_DAC_ANA_CON1[2] to 0x1,
* to enable the reference voltage buffer
@@ -788,7 +790,7 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_BUF_REF_R_EN);
/* Waiting the stable reference voltage */
udelay(10);
udelay(50);
if (rk3308->dac_output == DAC_HPOUT ||
rk3308->dac_output == DAC_LINEOUT_HPOUT) {
@@ -798,6 +800,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_POP_SOUND_R_MSK,
RK3308_DAC_POP_SOUND_L_WORK |
RK3308_DAC_POP_SOUND_R_WORK);
udelay(20);
}
/* Step 04 */
@@ -808,7 +812,7 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_R_HPMIX_EN);
/* Waiting the stable HPMIX */
udelay(10);
udelay(50);
/* Step 05 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON13,
@@ -817,6 +821,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_HPMIX_WORK |
RK3308_DAC_R_HPMIX_WORK);
udelay(20);
if (rk3308->dac_output == DAC_LINEOUT ||
rk3308->dac_output == DAC_LINEOUT_HPOUT) {
/* Step 06 */
@@ -825,6 +831,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_R_LINEOUT_EN,
RK3308_DAC_L_LINEOUT_EN |
RK3308_DAC_R_LINEOUT_EN);
udelay(20);
}
if (rk3308->dac_output == DAC_HPOUT ||
@@ -842,6 +850,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_R_HPOUT_WORK,
RK3308_DAC_L_HPOUT_WORK |
RK3308_DAC_R_HPOUT_WORK);
udelay(20);
}
/* Step 09 */
@@ -851,6 +861,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_REF_EN |
RK3308_DAC_R_REF_EN);
udelay(20);
/* Step 10 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON02,
RK3308_DAC_L_CLK_EN |
@@ -858,6 +870,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_CLK_EN |
RK3308_DAC_R_CLK_EN);
udelay(20);
/* Step 11 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON02,
RK3308_DAC_L_DAC_EN |
@@ -865,6 +879,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_DAC_EN |
RK3308_DAC_R_DAC_EN);
udelay(20);
/* Step 12 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON02,
RK3308_DAC_L_DAC_WORK |
@@ -872,6 +888,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_DAC_WORK |
RK3308_DAC_R_DAC_WORK);
udelay(20);
/* Step 13 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON12,
RK3308_DAC_L_HPMIX_SEL_MSK |
@@ -879,6 +897,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_HPMIX_I2S |
RK3308_DAC_R_HPMIX_I2S);
udelay(20);
/* Step 14 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON13,
RK3308_DAC_L_HPMIX_UNMUTE |
@@ -886,6 +906,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_HPMIX_UNMUTE |
RK3308_DAC_R_HPMIX_UNMUTE);
udelay(20);
/* Step 15 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON12,
RK3308_DAC_L_HPMIX_GAIN_MSK |
@@ -893,6 +915,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_L_HPMIX_GAIN_NDB_6 |
RK3308_DAC_R_HPMIX_GAIN_NDB_6);
udelay(20);
if (rk3308->dac_output == DAC_HPOUT ||
rk3308->dac_output == DAC_LINEOUT_HPOUT) {
/* Step 16 */
@@ -901,16 +925,20 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_R_HPOUT_UNMUTE,
RK3308_DAC_L_HPOUT_UNMUTE |
RK3308_DAC_R_HPOUT_UNMUTE);
udelay(20);
}
if (rk3308->dac_output == DAC_LINEOUT ||
rk3308->dac_output == DAC_LINEOUT_HPOUT)
rk3308->dac_output == DAC_LINEOUT_HPOUT) {
/* Step 17 */
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON04,
RK3308_DAC_L_LINEOUT_UNMUTE |
RK3308_DAC_R_LINEOUT_UNMUTE,
RK3308_DAC_L_LINEOUT_UNMUTE |
RK3308_DAC_R_LINEOUT_UNMUTE);
udelay(20);
}
if (rk3308->dac_output == DAC_HPOUT ||
rk3308->dac_output == DAC_LINEOUT_HPOUT) {
@@ -923,6 +951,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
regmap_update_bits(rk3308->regmap, RK3308_DAC_ANA_CON06,
RK3308_DAC_R_HPOUT_GAIN_MSK,
RK3308_DAC_R_HPOUT_GAIN_NDB_39);
udelay(20);
}
if (rk3308->dac_output == DAC_LINEOUT ||
@@ -933,6 +963,8 @@ static int rk3308_codec_dac_enable(struct rk3308_codec_priv *rk3308)
RK3308_DAC_R_LINEOUT_GAIN_MSK,
RK3308_DAC_L_LINEOUT_GAIN_NDB_6 |
RK3308_DAC_R_LINEOUT_GAIN_NDB_6);
udelay(20);
}
/* TODO: TRY TO TEST DRIVE STRENGTH */