Skip to contentSkip to conversation

sound fixes for 3.15

GIT PULL Takashi Iwai 1 participant 1 message Jun 3, 2014 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v3.15-final from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.15

The topmost commit is 192a98e280e560510a62aca8cfa83b4ae7c095bb

----------------------------------------------------------------

sound fixes for 3.15-final

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.

----------------------------------------------------------------

Ronan Marquet (1):
ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop

Takashi Iwai (2):
ALSA: hda/analog - Fix silent output on ASUS A8JN
ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup

---
 sound/pci/hda/patch_analog.c  |  1 +
 sound/pci/hda/patch_realtek.c | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)
sound/pci/hda/patch_analog.c +1 -0
index 40ba06eb44af..06275f8807a8 100644
@@ -332,6 +332,7 @@ static const struct hda_fixup ad1986a_fixups[] = {
 
 static const struct snd_pci_quirk ad1986a_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC),
+	SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD),
 	SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK),
 	SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8200, "ASUS M2", AD1986A_FIXUP_3STACK),
 	SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_FIXUP_3STACK),
sound/pci/hda/patch_realtek.c +4 -6
index 49e884fb3e5d..d943508a7f48 100644
@@ -1647,12 +1647,10 @@ static const struct hda_fixup alc260_fixups[] = {
 	[ALC260_FIXUP_COEF] = {
 		.type = HDA_FIXUP_VERBS,
 		.v.verbs = (const struct hda_verb[]) {
-			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
-			{ 0x20, AC_VERB_SET_PROC_COEF,  0x3040 },
+			{ 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 },
+			{ 0x1a, AC_VERB_SET_PROC_COEF,  0x3040 },
 			{ }
 		},
-		.chained = true,
-		.chain_id = ALC260_FIXUP_HP_PIN_0F,
 	},
 	[ALC260_FIXUP_GPIO1] = {
 		.type = HDA_FIXUP_VERBS,
@@ -1667,8 +1665,8 @@ static const struct hda_fixup alc260_fixups[] = {
 	[ALC260_FIXUP_REPLACER] = {
 		.type = HDA_FIXUP_VERBS,
 		.v.verbs = (const struct hda_verb[]) {
-			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
-			{ 0x20, AC_VERB_SET_PROC_COEF,  0x3050 },
+			{ 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 },
+			{ 0x1a, AC_VERB_SET_PROC_COEF,  0x3050 },
 			{ }
 		},
 		.chained = true,