Commit d2cfd3105094f593bc1fbd0b042a7752ddf08691
Exists in
ti-lsk-linux-4.1.y
and in
12 other branches
Merge tag 'sound-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A few addition of HD-audio fixups for ALC260 and AD1986A codecs. All marked as stable fixes. The fixes are pretty local and they are old machines, so quite safe to apply" * tag 'sound-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop ALSA: hda/analog - Fix silent output on ASUS A8JN
Showing 2 changed files Side-by-side Diff
sound/pci/hda/patch_analog.c
| ... | ... | @@ -332,6 +332,7 @@ |
| 332 | 332 | |
| 333 | 333 | static const struct snd_pci_quirk ad1986a_fixup_tbl[] = { |
| 334 | 334 | SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC), |
| 335 | + SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD), | |
| 335 | 336 | SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK), |
| 336 | 337 | SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8200, "ASUS M2", AD1986A_FIXUP_3STACK), |
| 337 | 338 | SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_FIXUP_3STACK), |
sound/pci/hda/patch_realtek.c
| ... | ... | @@ -1647,12 +1647,10 @@ |
| 1647 | 1647 | [ALC260_FIXUP_COEF] = { |
| 1648 | 1648 | .type = HDA_FIXUP_VERBS, |
| 1649 | 1649 | .v.verbs = (const struct hda_verb[]) { |
| 1650 | - { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 }, | |
| 1651 | - { 0x20, AC_VERB_SET_PROC_COEF, 0x3040 }, | |
| 1650 | + { 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 }, | |
| 1651 | + { 0x1a, AC_VERB_SET_PROC_COEF, 0x3040 }, | |
| 1652 | 1652 | { } |
| 1653 | 1653 | }, |
| 1654 | - .chained = true, | |
| 1655 | - .chain_id = ALC260_FIXUP_HP_PIN_0F, | |
| 1656 | 1654 | }, |
| 1657 | 1655 | [ALC260_FIXUP_GPIO1] = { |
| 1658 | 1656 | .type = HDA_FIXUP_VERBS, |
| ... | ... | @@ -1667,8 +1665,8 @@ |
| 1667 | 1665 | [ALC260_FIXUP_REPLACER] = { |
| 1668 | 1666 | .type = HDA_FIXUP_VERBS, |
| 1669 | 1667 | .v.verbs = (const struct hda_verb[]) { |
| 1670 | - { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 }, | |
| 1671 | - { 0x20, AC_VERB_SET_PROC_COEF, 0x3050 }, | |
| 1668 | + { 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 }, | |
| 1669 | + { 0x1a, AC_VERB_SET_PROC_COEF, 0x3050 }, | |
| 1672 | 1670 | { } |
| 1673 | 1671 | }, |
| 1674 | 1672 | .chained = true, |