Skip to content

L
linux
Commit fd2eab87 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'asoc/fix/sgtl5000' into tmp

parents 87fee06c b50684da
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sound/soc/codecs/sgtl5000.c
View file @ fd2eab87
...@@ -401,7 +401,7 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = { ...@@ -401,7 +401,7 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = {
5, 1, 0), 5, 1, 0),
SOC_SINGLE_TLV("Mic Volume", SGTL5000_CHIP_MIC_CTRL, SOC_SINGLE_TLV("Mic Volume", SGTL5000_CHIP_MIC_CTRL,
0, 4, 0, mic_gain_tlv), 0, 3, 0, mic_gain_tlv),
}; };
/* mute the codec used by alsa core */ /* mute the codec used by alsa core */
...@@ -1344,7 +1344,7 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) ...@@ -1344,7 +1344,7 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
SGTL5000_HP_ZCD_EN | SGTL5000_HP_ZCD_EN |
SGTL5000_ADC_ZCD_EN); SGTL5000_ADC_ZCD_EN);
snd_soc_write(codec, SGTL5000_CHIP_MIC_CTRL, 0); snd_soc_write(codec, SGTL5000_CHIP_MIC_CTRL, 2);
/* /*
* disable DAP * disable DAP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7