Revert "ALSA: hda/realtek - FIxed ALC285 headphone no sound"
This reverts commit 78a17236b1
.
This commit is contained in:
parent
41978fa471
commit
a467355ed7
1 changed files with 12 additions and 14 deletions
|
@ -5002,7 +5002,6 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
|
|||
case 0x10ec0295:
|
||||
case 0x10ec0289:
|
||||
case 0x10ec0299:
|
||||
alc_hp_mute_disable(codec, 75);
|
||||
alc_process_coef_fw(codec, alc225_pre_hsmode);
|
||||
alc_process_coef_fw(codec, coef0225);
|
||||
break;
|
||||
|
@ -5228,7 +5227,6 @@ static void alc_headset_mode_default(struct hda_codec *codec)
|
|||
case 0x10ec0299:
|
||||
alc_process_coef_fw(codec, alc225_pre_hsmode);
|
||||
alc_process_coef_fw(codec, coef0225);
|
||||
alc_hp_enable_unmute(codec, 75);
|
||||
break;
|
||||
case 0x10ec0255:
|
||||
alc_process_coef_fw(codec, coef0255);
|
||||
|
@ -5388,7 +5386,6 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
|
|||
alc_process_coef_fw(codec, coef0225_2);
|
||||
else
|
||||
alc_process_coef_fw(codec, coef0225_1);
|
||||
alc_hp_enable_unmute(codec, 75);
|
||||
break;
|
||||
case 0x10ec0867:
|
||||
alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0);
|
||||
|
@ -5494,7 +5491,6 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
|
|||
case 0x10ec0289:
|
||||
case 0x10ec0299:
|
||||
alc_process_coef_fw(codec, coef0225);
|
||||
alc_hp_enable_unmute(codec, 75);
|
||||
break;
|
||||
}
|
||||
codec_dbg(codec, "Headset jack set to Nokia-style headset mode.\n");
|
||||
|
@ -5654,6 +5650,12 @@ static void alc_determine_headset_type(struct hda_codec *codec)
|
|||
case 0x10ec0295:
|
||||
case 0x10ec0289:
|
||||
case 0x10ec0299:
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
|
||||
msleep(80);
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
|
||||
|
||||
alc_process_coef_fw(codec, alc225_pre_hsmode);
|
||||
alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000);
|
||||
val = alc_read_coef_idx(codec, 0x45);
|
||||
|
@ -5670,19 +5672,15 @@ static void alc_determine_headset_type(struct hda_codec *codec)
|
|||
val = alc_read_coef_idx(codec, 0x46);
|
||||
is_ctia = (val & 0x00f0) == 0x00f0;
|
||||
}
|
||||
if (!is_ctia) {
|
||||
alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x38<<10);
|
||||
alc_update_coef_idx(codec, 0x49, 3<<8, 1<<8);
|
||||
msleep(100);
|
||||
val = alc_read_coef_idx(codec, 0x46);
|
||||
if ((val & 0x00f0) == 0x00f0)
|
||||
is_ctia = false;
|
||||
else
|
||||
is_ctia = true;
|
||||
}
|
||||
alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6);
|
||||
alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4);
|
||||
alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);
|
||||
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
|
||||
msleep(80);
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
|
||||
break;
|
||||
case 0x10ec0867:
|
||||
is_ctia = true;
|
||||
|
|
Loading…
Add table
Reference in a new issue