Commit 28f1f9b2 authored by Kailang Yang's avatar Kailang Yang Committed by Takashi Iwai

ALSA: hda/realtek - Add new codec ID ALC299

ALC299 was similar as ALC225.
Add headset support for ALC299.
ALC3271 was for Dell rename.
Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 337ccfce
...@@ -337,6 +337,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) ...@@ -337,6 +337,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
case 0x10ec0288: case 0x10ec0288:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0298: case 0x10ec0298:
case 0x10ec0299:
alc_update_coef_idx(codec, 0x10, 1<<9, 0); alc_update_coef_idx(codec, 0x10, 1<<9, 0);
break; break;
case 0x10ec0285: case 0x10ec0285:
...@@ -912,6 +913,7 @@ static struct alc_codec_rename_pci_table rename_pci_tbl[] = { ...@@ -912,6 +913,7 @@ static struct alc_codec_rename_pci_table rename_pci_tbl[] = {
{ 0x10ec0256, 0x1028, 0, "ALC3246" }, { 0x10ec0256, 0x1028, 0, "ALC3246" },
{ 0x10ec0225, 0x1028, 0, "ALC3253" }, { 0x10ec0225, 0x1028, 0, "ALC3253" },
{ 0x10ec0295, 0x1028, 0, "ALC3254" }, { 0x10ec0295, 0x1028, 0, "ALC3254" },
{ 0x10ec0299, 0x1028, 0, "ALC3271" },
{ 0x10ec0670, 0x1025, 0, "ALC669X" }, { 0x10ec0670, 0x1025, 0, "ALC669X" },
{ 0x10ec0676, 0x1025, 0, "ALC679X" }, { 0x10ec0676, 0x1025, 0, "ALC679X" },
{ 0x10ec0282, 0x1043, 0, "ALC3229" }, { 0x10ec0282, 0x1043, 0, "ALC3229" },
...@@ -3716,6 +3718,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) ...@@ -3716,6 +3718,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
break; break;
case 0x10ec0225: case 0x10ec0225:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0299:
alc_process_coef_fw(codec, coef0225); alc_process_coef_fw(codec, coef0225);
break; break;
case 0x10ec0867: case 0x10ec0867:
...@@ -3823,6 +3826,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, ...@@ -3823,6 +3826,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
break; break;
case 0x10ec0225: case 0x10ec0225:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0299:
alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x31<<10); alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x31<<10);
snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
alc_process_coef_fw(codec, coef0225); alc_process_coef_fw(codec, coef0225);
...@@ -3881,6 +3885,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) ...@@ -3881,6 +3885,7 @@ static void alc_headset_mode_default(struct hda_codec *codec)
switch (codec->core.vendor_id) { switch (codec->core.vendor_id) {
case 0x10ec0225: case 0x10ec0225:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0299:
alc_process_coef_fw(codec, coef0225); alc_process_coef_fw(codec, coef0225);
break; break;
case 0x10ec0255: case 0x10ec0255:
...@@ -3996,6 +4001,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) ...@@ -3996,6 +4001,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
break; break;
case 0x10ec0225: case 0x10ec0225:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0299:
alc_process_coef_fw(codec, coef0225); alc_process_coef_fw(codec, coef0225);
break; break;
case 0x10ec0867: case 0x10ec0867:
...@@ -4089,6 +4095,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) ...@@ -4089,6 +4095,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
break; break;
case 0x10ec0225: case 0x10ec0225:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0299:
alc_process_coef_fw(codec, coef0225); alc_process_coef_fw(codec, coef0225);
break; break;
} }
...@@ -4173,6 +4180,7 @@ static void alc_determine_headset_type(struct hda_codec *codec) ...@@ -4173,6 +4180,7 @@ static void alc_determine_headset_type(struct hda_codec *codec)
break; break;
case 0x10ec0225: case 0x10ec0225:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0299:
alc_process_coef_fw(codec, coef0225); alc_process_coef_fw(codec, coef0225);
msleep(800); msleep(800);
val = alc_read_coef_idx(codec, 0x46); val = alc_read_coef_idx(codec, 0x46);
...@@ -6219,6 +6227,7 @@ static int patch_alc269(struct hda_codec *codec) ...@@ -6219,6 +6227,7 @@ static int patch_alc269(struct hda_codec *codec)
break; break;
case 0x10ec0225: case 0x10ec0225:
case 0x10ec0295: case 0x10ec0295:
case 0x10ec0299:
spec->codec_variant = ALC269_TYPE_ALC225; spec->codec_variant = ALC269_TYPE_ALC225;
break; break;
case 0x10ec0234: case 0x10ec0234:
...@@ -7256,6 +7265,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { ...@@ -7256,6 +7265,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
HDA_CODEC_ENTRY(0x10ec0294, "ALC294", patch_alc269), HDA_CODEC_ENTRY(0x10ec0294, "ALC294", patch_alc269),
HDA_CODEC_ENTRY(0x10ec0295, "ALC295", patch_alc269), HDA_CODEC_ENTRY(0x10ec0295, "ALC295", patch_alc269),
HDA_CODEC_ENTRY(0x10ec0298, "ALC298", patch_alc269), HDA_CODEC_ENTRY(0x10ec0298, "ALC298", patch_alc269),
HDA_CODEC_ENTRY(0x10ec0299, "ALC299", patch_alc269),
HDA_CODEC_REV_ENTRY(0x10ec0861, 0x100340, "ALC660", patch_alc861), HDA_CODEC_REV_ENTRY(0x10ec0861, 0x100340, "ALC660", patch_alc861),
HDA_CODEC_ENTRY(0x10ec0660, "ALC660-VD", patch_alc861vd), HDA_CODEC_ENTRY(0x10ec0660, "ALC660-VD", patch_alc861vd),
HDA_CODEC_ENTRY(0x10ec0861, "ALC861", patch_alc861), HDA_CODEC_ENTRY(0x10ec0861, "ALC861", patch_alc861),
......
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