mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
ASoC: rt5645: Remove incorrect settings
The patch removes the incorrect settings to avoid the pop sound in the first playback with headphone after boot. Signed-off-by: Oder Chiou <oder_chiou@realtek.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
91931320cf
commit
f17b329b73
@ -2829,10 +2829,6 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)
|
|||||||
snd_soc_dapm_sync(dapm);
|
snd_soc_dapm_sync(dapm);
|
||||||
rt5645->jack_type = SND_JACK_HEADPHONE;
|
rt5645->jack_type = SND_JACK_HEADPHONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);
|
|
||||||
snd_soc_write(codec, RT5645_DEPOP_M1, 0x001d);
|
|
||||||
snd_soc_write(codec, RT5645_DEPOP_M1, 0x0001);
|
|
||||||
} else { /* jack out */
|
} else { /* jack out */
|
||||||
rt5645->jack_type = 0;
|
rt5645->jack_type = 0;
|
||||||
|
|
||||||
@ -2880,8 +2876,6 @@ int rt5645_set_jack_detect(struct snd_soc_codec *codec,
|
|||||||
rt5645->en_button_func = true;
|
rt5645->en_button_func = true;
|
||||||
regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
|
regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
|
||||||
RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ);
|
RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ);
|
||||||
regmap_update_bits(rt5645->regmap, RT5645_DEPOP_M1,
|
|
||||||
RT5645_HP_CB_MASK, RT5645_HP_CB_PU);
|
|
||||||
regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1,
|
regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1,
|
||||||
RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL);
|
RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user