diff options
author | Hui Wang <hui.wang@canonical.com> | 2015-04-24 01:39:59 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-24 01:47:08 -0400 |
commit | e8191a8e475551b277d85cd76c3f0f52fdf42e86 (patch) | |
tree | 13d5dca6b5e2174060a305f28bb11ede04bf59fb /sound | |
parent | d32b66668c702aed0e330dc5ca186afbadcdacf8 (diff) |
ALSA: hda - fix headset mic detection problem for one more machine
We have two machines with alc256 codec in the pin quirk table, so
moving the common pins to ALC256_STANDARD_PINS.
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4b10cde12831..06199e4e930f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -5228,6 +5228,16 @@ static const struct hda_model_fixup alc269_fixup_models[] = { | |||
5228 | {0x1b, 0x411111f0}, \ | 5228 | {0x1b, 0x411111f0}, \ |
5229 | {0x1e, 0x411111f0} | 5229 | {0x1e, 0x411111f0} |
5230 | 5230 | ||
5231 | #define ALC256_STANDARD_PINS \ | ||
5232 | {0x12, 0x90a60140}, \ | ||
5233 | {0x14, 0x90170110}, \ | ||
5234 | {0x19, 0x411111f0}, \ | ||
5235 | {0x1a, 0x411111f0}, \ | ||
5236 | {0x1b, 0x411111f0}, \ | ||
5237 | {0x1d, 0x40700001}, \ | ||
5238 | {0x1e, 0x411111f0}, \ | ||
5239 | {0x21, 0x02211020} | ||
5240 | |||
5231 | #define ALC282_STANDARD_PINS \ | 5241 | #define ALC282_STANDARD_PINS \ |
5232 | {0x14, 0x90170110}, \ | 5242 | {0x14, 0x90170110}, \ |
5233 | {0x18, 0x411111f0}, \ | 5243 | {0x18, 0x411111f0}, \ |
@@ -5328,15 +5338,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { | |||
5328 | {0x1d, 0x40700001}, | 5338 | {0x1d, 0x40700001}, |
5329 | {0x21, 0x02211050}), | 5339 | {0x21, 0x02211050}), |
5330 | SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, | 5340 | SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, |
5331 | {0x12, 0x90a60140}, | 5341 | ALC256_STANDARD_PINS, |
5332 | {0x13, 0x40000000}, | 5342 | {0x13, 0x40000000}), |
5333 | {0x14, 0x90170110}, | 5343 | SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, |
5334 | {0x19, 0x411111f0}, | 5344 | ALC256_STANDARD_PINS, |
5335 | {0x1a, 0x411111f0}, | 5345 | {0x13, 0x411111f0}), |
5336 | {0x1b, 0x411111f0}, | ||
5337 | {0x1d, 0x40700001}, | ||
5338 | {0x1e, 0x411111f0}, | ||
5339 | {0x21, 0x02211020}), | ||
5340 | SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, | 5346 | SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, |
5341 | {0x12, 0x90a60130}, | 5347 | {0x12, 0x90a60130}, |
5342 | {0x13, 0x40000000}, | 5348 | {0x13, 0x40000000}, |