UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: rt5645: Remove the redundant delay time 

This patch removes the redundant delay time to speed up from the cold start
of headphone playback.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Link: https://lore.kernel.org/r/20201230080235.12698-1-oder_chiou@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Oder Chiou 2020-12-30 16:02:35 +08:00 committed by Mark Brown
parent 89ffd36a9e
commit e9141c1aaa
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sound/soc/codecs/rt5645.c
View File

@ -435,7 +435,6 @@ struct rt5645_priv {
int jack_type; int jack_type;
bool en_button_func; bool en_button_func;
bool hp_on;
int v_id; int v_id;
}; };
@ -1645,6 +1644,7 @@ static void hp_amp_power(struct snd_soc_component *component, int on)
{ {
static int hp_amp_power_count; static int hp_amp_power_count;
struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
int i, val;
if (on) { if (on) {
if (hp_amp_power_count <= 0) { if (hp_amp_power_count <= 0) {
@ -1655,7 +1655,13 @@ static void hp_amp_power(struct snd_soc_component *component, int on)
snd_soc_component_write(component, RT5645_DEPOP_M1, 0x000d); snd_soc_component_write(component, RT5645_DEPOP_M1, 0x000d);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
RT5645_HP_DCC_INT1, 0x9f01); RT5645_HP_DCC_INT1, 0x9f01);
msleep(20); for (i = 0; i < 20; i++) {
usleep_range(1000, 1500);
regmap_read(rt5645->regmap, RT5645_PR_BASE +
RT5645_HP_DCC_INT1, &val);
if (!(val & 0x8000))
break;
}
snd_soc_component_update_bits(component, RT5645_DEPOP_M1, snd_soc_component_update_bits(component, RT5645_DEPOP_M1,
RT5645_HP_CO_MASK, RT5645_HP_CO_EN); RT5645_HP_CO_MASK, RT5645_HP_CO_EN);
regmap_write(rt5645->regmap, RT5645_PR_BASE + regmap_write(rt5645->regmap, RT5645_PR_BASE +
@ -1665,7 +1671,6 @@ static void hp_amp_power(struct snd_soc_component *component, int on)
RT5645_MAMP_INT_REG2, 0xfc00); RT5645_MAMP_INT_REG2, 0xfc00);
snd_soc_component_write(component, RT5645_DEPOP_M2, 0x1140); snd_soc_component_write(component, RT5645_DEPOP_M2, 0x1140);
msleep(90); msleep(90);
rt5645->hp_on = true;
} else { } else {
/* depop parameters */ /* depop parameters */
snd_soc_component_update_bits(component, RT5645_DEPOP_M2, snd_soc_component_update_bits(component, RT5645_DEPOP_M2,
@ -1885,27 +1890,6 @@ static int rt5645_bst2_event(struct snd_soc_dapm_widget *w,
return 0; return 0;
} }
static int rt5650_hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event)
{
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
switch (event) {
case SND_SOC_DAPM_POST_PMU:
if (rt5645->hp_on) {
msleep(100);
rt5645->hp_on = false;
}
break;
default:
return 0;
}
return 0;
}
static int rt5645_set_micbias1_event(struct snd_soc_dapm_widget *w, static int rt5645_set_micbias1_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event) struct snd_kcontrol *k, int event)
{ {
@ -2242,7 +2226,6 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {
SND_SOC_DAPM_OUTPUT("PDM1R"), SND_SOC_DAPM_OUTPUT("PDM1R"),
SND_SOC_DAPM_OUTPUT("SPOL"), SND_SOC_DAPM_OUTPUT("SPOL"),
SND_SOC_DAPM_OUTPUT("SPOR"), SND_SOC_DAPM_OUTPUT("SPOR"),
SND_SOC_DAPM_POST("DAPM_POST", rt5650_hp_event),
}; };
static const struct snd_soc_dapm_widget rt5645_specific_dapm_widgets[] = { static const struct snd_soc_dapm_widget rt5645_specific_dapm_widgets[] = {