Revert "ALSA: hda/realtek - Fixed ALC256 headphone no sound"
This reverts commit 96615d6895
.
This commit is contained in:
parent
a467355ed7
commit
5d48b55dfe
1 changed files with 13 additions and 37 deletions
|
@ -4842,30 +4842,6 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,
|
|||
}
|
||||
}
|
||||
|
||||
static void alc_hp_mute_disable(struct hda_codec *codec, unsigned int delay)
|
||||
{
|
||||
if (delay <= 0)
|
||||
delay = 75;
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
|
||||
msleep(delay);
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
|
||||
msleep(delay);
|
||||
}
|
||||
|
||||
static void alc_hp_enable_unmute(struct hda_codec *codec, unsigned int delay)
|
||||
{
|
||||
if (delay <= 0)
|
||||
delay = 75;
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
|
||||
msleep(delay);
|
||||
snd_hda_codec_write(codec, 0x21, 0,
|
||||
AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
|
||||
msleep(delay);
|
||||
}
|
||||
|
||||
static const struct coef_fw alc225_pre_hsmode[] = {
|
||||
UPDATE_COEF(0x4a, 1<<8, 0),
|
||||
UPDATE_COEFEX(0x57, 0x05, 1<<14, 0),
|
||||
|
@ -4967,7 +4943,6 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
|
|||
case 0x10ec0236:
|
||||
case 0x10ec0256:
|
||||
case 0x19e58326:
|
||||
alc_hp_mute_disable(codec, 75);
|
||||
alc_process_coef_fw(codec, coef0256);
|
||||
break;
|
||||
case 0x10ec0234:
|
||||
|
@ -5239,7 +5214,6 @@ static void alc_headset_mode_default(struct hda_codec *codec)
|
|||
alc_write_coef_idx(codec, 0x45, 0xc089);
|
||||
msleep(50);
|
||||
alc_process_coef_fw(codec, coef0256);
|
||||
alc_hp_enable_unmute(codec, 75);
|
||||
break;
|
||||
case 0x10ec0234:
|
||||
case 0x10ec0274:
|
||||
|
@ -5337,7 +5311,6 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
|
|||
case 0x10ec0256:
|
||||
case 0x19e58326:
|
||||
alc_process_coef_fw(codec, coef0256);
|
||||
alc_hp_enable_unmute(codec, 75);
|
||||
break;
|
||||
case 0x10ec0234:
|
||||
case 0x10ec0274:
|
||||
|
@ -5453,7 +5426,6 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
|
|||
case 0x10ec0256:
|
||||
case 0x19e58326:
|
||||
alc_process_coef_fw(codec, coef0256);
|
||||
alc_hp_enable_unmute(codec, 75);
|
||||
break;
|
||||
case 0x10ec0234:
|
||||
case 0x10ec0274:
|
||||
|
@ -5559,21 +5531,25 @@ static void alc_determine_headset_type(struct hda_codec *codec)
|
|||
alc_write_coef_idx(codec, 0x06, 0x6104);
|
||||
alc_write_coefex_idx(codec, 0x57, 0x3, 0x09a3);
|
||||
|
||||
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, coef0255);
|
||||
msleep(300);
|
||||
val = alc_read_coef_idx(codec, 0x46);
|
||||
is_ctia = (val & 0x0070) == 0x0070;
|
||||
if (!is_ctia) {
|
||||
alc_write_coef_idx(codec, 0x45, 0xe089);
|
||||
msleep(100);
|
||||
val = alc_read_coef_idx(codec, 0x46);
|
||||
if ((val & 0x0070) == 0x0070)
|
||||
is_ctia = false;
|
||||
else
|
||||
is_ctia = true;
|
||||
}
|
||||
|
||||
alc_write_coefex_idx(codec, 0x57, 0x3, 0x0da3);
|
||||
alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0);
|
||||
|
||||
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 0x10ec0234:
|
||||
case 0x10ec0274:
|
||||
|
|
Loading…
Add table
Reference in a new issue