diff options
author | Hui Wang <hui.wang@canonical.com> | 2015-07-21 22:33:34 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-07-22 04:33:00 -0400 |
commit | 21e9d017b88ea0baa367ef0b6516d794fa23e85e (patch) | |
tree | 68050d485fc10a4e6dd0d171679364aaa37aa1f4 | |
parent | 6c3d91193d829bf58a35a10650415b05a736ca6c (diff) |
ALSA: hda - remove one pin from ALC292_STANDARD_PINS
One more Dell laptop with alc293 codec needs
ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, but the pin 0x1e does not match
the corresponding one in the ALC292_STANDARD_PINS. To use this macro
for this machine, we need to remove pin 0x1e from it.
BugLink: https://bugs.launchpad.net/bugs/1476888
Cc: <stable@vger.kernel.org>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index caba66b2311c..ee6f13af647d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -5430,8 +5430,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { | |||
5430 | {0x15, 0x0221401f}, \ | 5430 | {0x15, 0x0221401f}, \ |
5431 | {0x1a, 0x411111f0}, \ | 5431 | {0x1a, 0x411111f0}, \ |
5432 | {0x1b, 0x411111f0}, \ | 5432 | {0x1b, 0x411111f0}, \ |
5433 | {0x1d, 0x40700001}, \ | 5433 | {0x1d, 0x40700001} |
5434 | {0x1e, 0x411111f0} | ||
5435 | 5434 | ||
5436 | #define ALC298_STANDARD_PINS \ | 5435 | #define ALC298_STANDARD_PINS \ |
5437 | {0x18, 0x411111f0}, \ | 5436 | {0x18, 0x411111f0}, \ |
@@ -5690,35 +5689,48 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { | |||
5690 | {0x13, 0x411111f0}, | 5689 | {0x13, 0x411111f0}, |
5691 | {0x16, 0x01014020}, | 5690 | {0x16, 0x01014020}, |
5692 | {0x18, 0x411111f0}, | 5691 | {0x18, 0x411111f0}, |
5693 | {0x19, 0x01a19030}), | 5692 | {0x19, 0x01a19030}, |
5693 | {0x1e, 0x411111f0}), | ||
5694 | SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, | 5694 | SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, |
5695 | ALC292_STANDARD_PINS, | 5695 | ALC292_STANDARD_PINS, |
5696 | {0x12, 0x90a60140}, | 5696 | {0x12, 0x90a60140}, |
5697 | {0x13, 0x411111f0}, | 5697 | {0x13, 0x411111f0}, |
5698 | {0x16, 0x01014020}, | 5698 | {0x16, 0x01014020}, |
5699 | {0x18, 0x02a19031}, | 5699 | {0x18, 0x02a19031}, |
5700 | {0x19, 0x01a1903e}), | 5700 | {0x19, 0x01a1903e}, |
5701 | {0x1e, 0x411111f0}), | ||
5701 | SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, | 5702 | SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, |
5702 | ALC292_STANDARD_PINS, | 5703 | ALC292_STANDARD_PINS, |
5703 | {0x12, 0x90a60140}, | 5704 | {0x12, 0x90a60140}, |
5704 | {0x13, 0x411111f0}, | 5705 | {0x13, 0x411111f0}, |
5705 | {0x16, 0x411111f0}, | 5706 | {0x16, 0x411111f0}, |
5706 | {0x18, 0x411111f0}, | 5707 | {0x18, 0x411111f0}, |
5707 | {0x19, 0x411111f0}), | 5708 | {0x19, 0x411111f0}, |
5709 | {0x1e, 0x411111f0}), | ||
5708 | SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, | 5710 | SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, |
5709 | ALC292_STANDARD_PINS, | 5711 | ALC292_STANDARD_PINS, |
5710 | {0x12, 0x40000000}, | 5712 | {0x12, 0x40000000}, |
5711 | {0x13, 0x90a60140}, | 5713 | {0x13, 0x90a60140}, |
5712 | {0x16, 0x21014020}, | 5714 | {0x16, 0x21014020}, |
5713 | {0x18, 0x411111f0}, | 5715 | {0x18, 0x411111f0}, |
5714 | {0x19, 0x21a19030}), | 5716 | {0x19, 0x21a19030}, |
5717 | {0x1e, 0x411111f0}), | ||
5715 | SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, | 5718 | SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, |
5716 | ALC292_STANDARD_PINS, | 5719 | ALC292_STANDARD_PINS, |
5717 | {0x12, 0x40000000}, | 5720 | {0x12, 0x40000000}, |
5718 | {0x13, 0x90a60140}, | 5721 | {0x13, 0x90a60140}, |
5719 | {0x16, 0x411111f0}, | 5722 | {0x16, 0x411111f0}, |
5720 | {0x18, 0x411111f0}, | 5723 | {0x18, 0x411111f0}, |
5721 | {0x19, 0x411111f0}), | 5724 | {0x19, 0x411111f0}, |
5725 | {0x1e, 0x411111f0}), | ||
5726 | SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, | ||
5727 | ALC292_STANDARD_PINS, | ||
5728 | {0x12, 0x40000000}, | ||
5729 | {0x13, 0x90a60140}, | ||
5730 | {0x16, 0x21014020}, | ||
5731 | {0x18, 0x411111f0}, | ||
5732 | {0x19, 0x21a19030}, | ||
5733 | {0x1e, 0x411111ff}), | ||
5722 | SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, | 5734 | SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, |
5723 | ALC298_STANDARD_PINS, | 5735 | ALC298_STANDARD_PINS, |
5724 | {0x12, 0x90a60130}, | 5736 | {0x12, 0x90a60130}, |