]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: hda/realtek - Add support for ALC295/ALC3254
authorKailang Yang <kailang@realtek.com>
Tue, 24 May 2016 08:46:07 +0000 (16:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Jun 2016 19:15:53 +0000 (12:15 -0700)
commit 7d727869c7b86da0874436ac5675dcdadaf3a0a1 upstream.

Add support for ALC295/ALC3254.
They are simply compatible with ALC225 chip.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/pci/hda/patch_realtek.c

index 10ca90058bfa37d8778ad1e7357f1416bd1a8fa3..a7f7df138191ee5c8ab6116f1136e6d4967481ba 100644 (file)
@@ -335,6 +335,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
        case 0x10ec0283:
        case 0x10ec0286:
        case 0x10ec0288:
+       case 0x10ec0295:
        case 0x10ec0298:
                alc_update_coef_idx(codec, 0x10, 1<<9, 0);
                break;
@@ -907,6 +908,7 @@ static struct alc_codec_rename_pci_table rename_pci_tbl[] = {
        { 0x10ec0298, 0x1028, 0, "ALC3266" },
        { 0x10ec0256, 0x1028, 0, "ALC3246" },
        { 0x10ec0225, 0x1028, 0, "ALC3253" },
+       { 0x10ec0295, 0x1028, 0, "ALC3254" },
        { 0x10ec0670, 0x1025, 0, "ALC669X" },
        { 0x10ec0676, 0x1025, 0, "ALC679X" },
        { 0x10ec0282, 0x1043, 0, "ALC3229" },
@@ -3697,6 +3699,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
                alc_process_coef_fw(codec, coef0668);
                break;
        case 0x10ec0225:
+       case 0x10ec0295:
                alc_process_coef_fw(codec, coef0225);
                break;
        }
@@ -3797,6 +3800,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
                snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
                break;
        case 0x10ec0225:
+       case 0x10ec0295:
                alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x31<<10);
                snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
                alc_process_coef_fw(codec, coef0225);
@@ -3854,6 +3858,7 @@ static void alc_headset_mode_default(struct hda_codec *codec)
 
        switch (codec->core.vendor_id) {
        case 0x10ec0225:
+       case 0x10ec0295:
                alc_process_coef_fw(codec, coef0225);
                break;
        case 0x10ec0255:
@@ -3957,6 +3962,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
                alc_process_coef_fw(codec, coef0688);
                break;
        case 0x10ec0225:
+       case 0x10ec0295:
                alc_process_coef_fw(codec, coef0225);
                break;
        }
@@ -4038,6 +4044,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
                alc_process_coef_fw(codec, coef0688);
                break;
        case 0x10ec0225:
+       case 0x10ec0295:
                alc_process_coef_fw(codec, coef0225);
                break;
        }
@@ -4121,6 +4128,7 @@ static void alc_determine_headset_type(struct hda_codec *codec)
                is_ctia = (val & 0x1c02) == 0x1c02;
                break;
        case 0x10ec0225:
+       case 0x10ec0295:
                alc_process_coef_fw(codec, coef0225);
                msleep(800);
                val = alc_read_coef_idx(codec, 0x46);
@@ -6034,6 +6042,7 @@ static int patch_alc269(struct hda_codec *codec)
                alc_update_coef_idx(codec, 0x36, 1 << 13, 1 << 5); /* Switch pcbeep path to Line in path*/
                break;
        case 0x10ec0225:
+       case 0x10ec0295:
                spec->codec_variant = ALC269_TYPE_ALC225;
                break;
        case 0x10ec0234:
@@ -6980,6 +6989,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = {
        HDA_CODEC_ENTRY(0x10ec0292, "ALC292", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0293, "ALC293", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0294, "ALC294", patch_alc269),
+       HDA_CODEC_ENTRY(0x10ec0295, "ALC295", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0298, "ALC298", patch_alc269),
        HDA_CODEC_REV_ENTRY(0x10ec0861, 0x100340, "ALC660", patch_alc861),
        HDA_CODEC_ENTRY(0x10ec0660, "ALC660-VD", patch_alc861vd),