]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: hda - add two new pin tables
authorHui Wang <hui.wang@canonical.com>
Fri, 6 Jun 2014 02:50:24 +0000 (10:50 +0800)
committerTakashi Iwai <tiwai@suse.de>
Fri, 6 Jun 2014 05:56:41 +0000 (07:56 +0200)
These two new pin tables can fix headset mic problems for several
new Dell machines.

And also delete some machines from old quirk table since the existing
pin talbes already cover them.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index 246826f7480020301a144dbd719444bfc185a19f..2d698c0f67643935d7bc36fb2e4493513022aeb1 100644 (file)
@@ -4741,18 +4741,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        SND_PCI_QUIRK(0x1028, 0x0614, "Dell Inspiron 3135", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x0615, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK),
        SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK),
-       SND_PCI_QUIRK(0x1028, 0x062c, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS_HSJACK),
        SND_PCI_QUIRK(0x1028, 0x063f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
-       SND_PCI_QUIRK(0x1028, 0x064d, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x0668, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x0669, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE),
-       SND_PCI_QUIRK(0x1028, 0x0674, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
-       SND_PCI_QUIRK(0x1028, 0x067e, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
-       SND_PCI_QUIRK(0x1028, 0x067f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
-       SND_PCI_QUIRK(0x1028, 0x0680, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x0684, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
@@ -4974,6 +4968,26 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                .subvendor = 0x1028,
 #ifdef CONFIG_SND_DEBUG_VERBOSE
                .name = "Dell",
+#endif
+               .pins = (const struct hda_pintbl[]) {
+                       {0x12, 0x90a60160},
+                       {0x14, 0x90170120},
+                       {0x17, 0x90170140},
+                       {0x18, 0x40000000},
+                       {0x19, 0x411111f0},
+                       {0x1a, 0x411111f0},
+                       {0x1b, 0x411111f0},
+                       {0x1d, 0x41163b05},
+                       {0x1e, 0x411111f0},
+                       {0x21, 0x0321102f},
+               },
+               .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+       },
+       {
+               .codec = 0x10ec0255,
+               .subvendor = 0x1028,
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+               .name = "Dell",
 #endif
                .pins = (const struct hda_pintbl[]) {
                        {0x12, 0x90a60160},
@@ -6012,6 +6026,27 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
                .subvendor = 0x1028,
 #ifdef CONFIG_SND_DEBUG_VERBOSE
                .name = "Dell",
+#endif
+               .pins = (const struct hda_pintbl[]) {
+                       {0x12, 0x99a30140},
+                       {0x14, 0x90170110},
+                       {0x15, 0x0321101f},
+                       {0x16, 0x03011020},
+                       {0x18, 0x40000008},
+                       {0x19, 0x411111f0},
+                       {0x1a, 0x411111f0},
+                       {0x1b, 0x411111f0},
+                       {0x1d, 0x41000001},
+                       {0x1e, 0x411111f0},
+                       {0x1f, 0x411111f0},
+               },
+               .value = ALC668_FIXUP_AUTO_MUTE,
+       },
+       {
+               .codec = 0x10ec0668,
+               .subvendor = 0x1028,
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+               .name = "Dell",
 #endif
                .pins = (const struct hda_pintbl[]) {
                        {0x12, 0x99a30150},