aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2014-06-13 05:15:44 -0400
committerTakashi Iwai <tiwai@suse.de>2014-06-13 05:21:05 -0400
commit2041d56464a067461d7cc21734a0f024587ed2ff (patch)
treec2f2459aacdb0a305759c2ae303c13de755a2ef3 /sound/pci
parent64eb428078b7b9b40c2d9413a7332fa3af85c51d (diff)
ALSA: hda - Add quirk for external mic on Lifebook U904
According to the bug reporter (Данило Шеган), the external mic starts to work and has proper jack detection if only pin 0x19 is marked properly as an external headset mic. AlsaInfo at https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1328587/+attachment/4128991/+files/AlsaInfo.txt Cc: stable@vger.kernel.org BugLink: https://bugs.launchpad.net/bugs/1328587 Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 06d606399abb..4c47c77e6507 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4246,6 +4246,7 @@ enum {
4246 ALC269_FIXUP_HEADSET_MIC, 4246 ALC269_FIXUP_HEADSET_MIC,
4247 ALC269_FIXUP_QUANTA_MUTE, 4247 ALC269_FIXUP_QUANTA_MUTE,
4248 ALC269_FIXUP_LIFEBOOK, 4248 ALC269_FIXUP_LIFEBOOK,
4249 ALC269_FIXUP_LIFEBOOK_EXTMIC,
4249 ALC269_FIXUP_AMIC, 4250 ALC269_FIXUP_AMIC,
4250 ALC269_FIXUP_DMIC, 4251 ALC269_FIXUP_DMIC,
4251 ALC269VB_FIXUP_AMIC, 4252 ALC269VB_FIXUP_AMIC,
@@ -4383,6 +4384,13 @@ static const struct hda_fixup alc269_fixups[] = {
4383 .chained = true, 4384 .chained = true,
4384 .chain_id = ALC269_FIXUP_QUANTA_MUTE 4385 .chain_id = ALC269_FIXUP_QUANTA_MUTE
4385 }, 4386 },
4387 [ALC269_FIXUP_LIFEBOOK_EXTMIC] = {
4388 .type = HDA_FIXUP_PINS,
4389 .v.pins = (const struct hda_pintbl[]) {
4390 { 0x19, 0x01a1903c }, /* headset mic, with jack detect */
4391 { }
4392 },
4393 },
4386 [ALC269_FIXUP_AMIC] = { 4394 [ALC269_FIXUP_AMIC] = {
4387 .type = HDA_FIXUP_PINS, 4395 .type = HDA_FIXUP_PINS,
4388 .v.pins = (const struct hda_pintbl[]) { 4396 .v.pins = (const struct hda_pintbl[]) {
@@ -4844,6 +4852,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
4844 SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX), 4852 SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX),
4845 SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), 4853 SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
4846 SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK), 4854 SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),
4855 SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),
4847 SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE), 4856 SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
4848 SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE), 4857 SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
4849 SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), 4858 SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),