|
|
@@ -4082,18 +4082,19 @@ static struct coef_fw alc225_pre_hsmode[] = {
|
|
|
static void alc_headset_mode_unplugged(struct hda_codec *codec)
|
|
|
{
|
|
|
static struct coef_fw coef0255[] = {
|
|
|
+ WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */
|
|
|
WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */
|
|
|
UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), /* Direct Drive HP Amp control(Set to verb control)*/
|
|
|
WRITE_COEF(0x06, 0x6104), /* Set MIC2 Vref gate with HP */
|
|
|
WRITE_COEFEX(0x57, 0x03, 0x8aa6), /* Direct Drive HP Amp control */
|
|
|
{}
|
|
|
};
|
|
|
- static struct coef_fw coef0255_1[] = {
|
|
|
- WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */
|
|
|
- {}
|
|
|
- };
|
|
|
static struct coef_fw coef0256[] = {
|
|
|
WRITE_COEF(0x1b, 0x0c4b), /* LDO and MISC control */
|
|
|
+ WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */
|
|
|
+ WRITE_COEF(0x06, 0x6104), /* Set MIC2 Vref gate with HP */
|
|
|
+ WRITE_COEFEX(0x57, 0x03, 0x09a3), /* Direct Drive HP Amp control */
|
|
|
+ UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), /* Direct Drive HP Amp control(Set to verb control)*/
|
|
|
{}
|
|
|
};
|
|
|
static struct coef_fw coef0233[] = {
|
|
|
@@ -4156,13 +4157,11 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
|
|
|
|
|
|
switch (codec->core.vendor_id) {
|
|
|
case 0x10ec0255:
|
|
|
- alc_process_coef_fw(codec, coef0255_1);
|
|
|
alc_process_coef_fw(codec, coef0255);
|
|
|
break;
|
|
|
case 0x10ec0236:
|
|
|
case 0x10ec0256:
|
|
|
alc_process_coef_fw(codec, coef0256);
|
|
|
- alc_process_coef_fw(codec, coef0255);
|
|
|
break;
|
|
|
case 0x10ec0234:
|
|
|
case 0x10ec0274:
|
|
|
@@ -4215,6 +4214,12 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
|
|
|
WRITE_COEF(0x06, 0x6100), /* Set MIC2 Vref gate to normal */
|
|
|
{}
|
|
|
};
|
|
|
+ static struct coef_fw coef0256[] = {
|
|
|
+ UPDATE_COEFEX(0x57, 0x05, 1<<14, 1<<14), /* Direct Drive HP Amp control(Set to verb control)*/
|
|
|
+ WRITE_COEFEX(0x57, 0x03, 0x09a3),
|
|
|
+ WRITE_COEF(0x06, 0x6100), /* Set MIC2 Vref gate to normal */
|
|
|
+ {}
|
|
|
+ };
|
|
|
static struct coef_fw coef0233[] = {
|
|
|
UPDATE_COEF(0x35, 0, 1<<14),
|
|
|
WRITE_COEF(0x06, 0x2100),
|
|
|
@@ -4262,14 +4267,19 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
|
|
|
};
|
|
|
|
|
|
switch (codec->core.vendor_id) {
|
|
|
- case 0x10ec0236:
|
|
|
case 0x10ec0255:
|
|
|
- case 0x10ec0256:
|
|
|
alc_write_coef_idx(codec, 0x45, 0xc489);
|
|
|
snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
|
|
|
alc_process_coef_fw(codec, coef0255);
|
|
|
snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
|
|
|
break;
|
|
|
+ case 0x10ec0236:
|
|
|
+ case 0x10ec0256:
|
|
|
+ alc_write_coef_idx(codec, 0x45, 0xc489);
|
|
|
+ snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
|
|
|
+ alc_process_coef_fw(codec, coef0256);
|
|
|
+ snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
|
|
|
+ break;
|
|
|
case 0x10ec0234:
|
|
|
case 0x10ec0274:
|
|
|
case 0x10ec0294:
|
|
|
@@ -4351,6 +4361,14 @@ static void alc_headset_mode_default(struct hda_codec *codec)
|
|
|
WRITE_COEF(0x49, 0x0049),
|
|
|
{}
|
|
|
};
|
|
|
+ static struct coef_fw coef0256[] = {
|
|
|
+ WRITE_COEF(0x45, 0xc489),
|
|
|
+ WRITE_COEFEX(0x57, 0x03, 0x0da3),
|
|
|
+ WRITE_COEF(0x49, 0x0049),
|
|
|
+ UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), /* Direct Drive HP Amp control(Set to verb control)*/
|
|
|
+ WRITE_COEF(0x06, 0x6100),
|
|
|
+ {}
|
|
|
+ };
|
|
|
static struct coef_fw coef0233[] = {
|
|
|
WRITE_COEF(0x06, 0x2100),
|
|
|
WRITE_COEF(0x32, 0x4ea3),
|
|
|
@@ -4401,11 +4419,16 @@ static void alc_headset_mode_default(struct hda_codec *codec)
|
|
|
alc_process_coef_fw(codec, alc225_pre_hsmode);
|
|
|
alc_process_coef_fw(codec, coef0225);
|
|
|
break;
|
|
|
- case 0x10ec0236:
|
|
|
case 0x10ec0255:
|
|
|
- case 0x10ec0256:
|
|
|
alc_process_coef_fw(codec, coef0255);
|
|
|
break;
|
|
|
+ case 0x10ec0236:
|
|
|
+ case 0x10ec0256:
|
|
|
+ alc_write_coef_idx(codec, 0x1b, 0x0e4b);
|
|
|
+ alc_write_coef_idx(codec, 0x45, 0xc089);
|
|
|
+ msleep(50);
|
|
|
+ alc_process_coef_fw(codec, coef0256);
|
|
|
+ break;
|
|
|
case 0x10ec0234:
|
|
|
case 0x10ec0274:
|
|
|
case 0x10ec0294:
|
|
|
@@ -4449,8 +4472,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
|
|
|
};
|
|
|
static struct coef_fw coef0256[] = {
|
|
|
WRITE_COEF(0x45, 0xd489), /* Set to CTIA type */
|
|
|
- WRITE_COEF(0x1b, 0x0c6b),
|
|
|
- WRITE_COEFEX(0x57, 0x03, 0x8ea6),
|
|
|
+ WRITE_COEF(0x1b, 0x0e6b),
|
|
|
{}
|
|
|
};
|
|
|
static struct coef_fw coef0233[] = {
|
|
|
@@ -4568,8 +4590,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
|
|
|
};
|
|
|
static struct coef_fw coef0256[] = {
|
|
|
WRITE_COEF(0x45, 0xe489), /* Set to OMTP Type */
|
|
|
- WRITE_COEF(0x1b, 0x0c6b),
|
|
|
- WRITE_COEFEX(0x57, 0x03, 0x8ea6),
|
|
|
+ WRITE_COEF(0x1b, 0x0e6b),
|
|
|
{}
|
|
|
};
|
|
|
static struct coef_fw coef0233[] = {
|
|
|
@@ -4701,13 +4722,37 @@ static void alc_determine_headset_type(struct hda_codec *codec)
|
|
|
};
|
|
|
|
|
|
switch (codec->core.vendor_id) {
|
|
|
- case 0x10ec0236:
|
|
|
case 0x10ec0255:
|
|
|
+ alc_process_coef_fw(codec, coef0255);
|
|
|
+ msleep(300);
|
|
|
+ val = alc_read_coef_idx(codec, 0x46);
|
|
|
+ is_ctia = (val & 0x0070) == 0x0070;
|
|
|
+ break;
|
|
|
+ case 0x10ec0236:
|
|
|
case 0x10ec0256:
|
|
|
+ alc_write_coef_idx(codec, 0x1b, 0x0e4b);
|
|
|
+ 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;
|
|
|
+
|
|
|
+ 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:
|