| From e8191a8e475551b277d85cd76c3f0f52fdf42e86 Mon Sep 17 00:00:00 2001 |
| From: Hui Wang <hui.wang@canonical.com> |
| Date: Fri, 24 Apr 2015 13:39:59 +0800 |
| Subject: ALSA: hda - fix headset mic detection problem for one more machine |
| |
| From: Hui Wang <hui.wang@canonical.com> |
| |
| commit e8191a8e475551b277d85cd76c3f0f52fdf42e86 upstream. |
| |
| We have two machines with alc256 codec in the pin quirk table, so |
| moving the common pins to ALC256_STANDARD_PINS. |
| |
| BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1447909 |
| Signed-off-by: Hui Wang <hui.wang@canonical.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/pci/hda/patch_realtek.c | 24 +++++++++++++++--------- |
| 1 file changed, 15 insertions(+), 9 deletions(-) |
| |
| --- a/sound/pci/hda/patch_realtek.c |
| +++ b/sound/pci/hda/patch_realtek.c |
| @@ -5144,6 +5144,16 @@ static const struct hda_model_fixup alc2 |
| {0x1b, 0x411111f0}, \ |
| {0x1e, 0x411111f0} |
| |
| +#define ALC256_STANDARD_PINS \ |
| + {0x12, 0x90a60140}, \ |
| + {0x14, 0x90170110}, \ |
| + {0x19, 0x411111f0}, \ |
| + {0x1a, 0x411111f0}, \ |
| + {0x1b, 0x411111f0}, \ |
| + {0x1d, 0x40700001}, \ |
| + {0x1e, 0x411111f0}, \ |
| + {0x21, 0x02211020} |
| + |
| #define ALC282_STANDARD_PINS \ |
| {0x14, 0x90170110}, \ |
| {0x18, 0x411111f0}, \ |
| @@ -5237,15 +5247,11 @@ static const struct snd_hda_pin_quirk al |
| {0x1d, 0x40700001}, |
| {0x21, 0x02211050}), |
| SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, |
| - {0x12, 0x90a60140}, |
| - {0x13, 0x40000000}, |
| - {0x14, 0x90170110}, |
| - {0x19, 0x411111f0}, |
| - {0x1a, 0x411111f0}, |
| - {0x1b, 0x411111f0}, |
| - {0x1d, 0x40700001}, |
| - {0x1e, 0x411111f0}, |
| - {0x21, 0x02211020}), |
| + ALC256_STANDARD_PINS, |
| + {0x13, 0x40000000}), |
| + SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, |
| + ALC256_STANDARD_PINS, |
| + {0x13, 0x411111f0}), |
| SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, |
| {0x12, 0x90a60130}, |
| {0x13, 0x40000000}, |