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

This commit is contained in:
Mark Brown
2013-01-10 12:22:17 +00:00

View File

@@ -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)
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