On Mon, Feb 16, 2015 at 02:12:26PM +0100, David Henningsson wrote:
...
> >
> >Thanks David! The first commit (423044744aa4 "ALSA: hda - Add mute
> >LED pin quirk for HP 15 touchsmart") is a clean cherry-pick for the
> >3.16 kernel. The second one needs some backporting. I'm queuing the
> >patch bellow for this kernel.
>
> Ehh...how can the first one apply but not the second, as they both have the
> exact same context? (Well, except that the second one assumes you applied
> the first.)
As the comment in my backport states, I just had to adjust context of
the patch. For example, 3.16 kernel didn't had quirks for (0x103c,
0x21f8) and (0x103c, 0x21f9) and thus these lines deletion in the
original patch were dropped :-)
Cheers,
--
Luís
>
> That said, feel free to pick the below patch if you prefer. It would be
> slightly more risky but likely that means that it has potential to fix more
> bugs, too. After all I haven't seen any fallout so...
>
> // David
>
> >
> >Cheers,
> >--
> >Luís
> >
> > From c90713f7d46e13578d1808e47c4c495d43d825b9 Mon Sep 17 00:00:00 2001
> >From: Hui Wang <hui.wang@xxxxxxxxxxxxx>
> >Date: Wed, 3 Sep 2014 11:31:08 +0800
> >Subject: [PATCH] ALSA: hda/realtek - move HP_MUTE_LED_MIC1 quirk for alc282
> >
> >commit 2c609999759c6964d99a614e8259fa700b5b337c upstream.
> >
> >Cc: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
> >Signed-off-by: Hui Wang <hui.wang@xxxxxxxxxxxxx>
> >Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> >[ luis: backported to 3.16: adjusted context ]
> >Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
> >---
> > sound/pci/hda/patch_realtek.c | 77 ++++++++++++++++++++++++++++++-------------
> > 1 file changed, 55 insertions(+), 22 deletions(-)
> >
> >diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> >index 72d76a936a54..ded8b2fa136f 100644
> >--- a/sound/pci/hda/patch_realtek.c
> >+++ b/sound/pci/hda/patch_realtek.c
> >@@ -4799,44 +4799,22 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
> > SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
> > SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
> > SND_PCI_QUIRK(0x103c, 0x18e6, "HP", ALC269_FIXUP_HP_GPIO_LED),
> >- SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x218b, "HP", ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED),
> > /* ALC282 */
> > SND_PCI_QUIRK(0x103c, 0x2191, "HP Touchsmart 14", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x2192, "HP Touchsmart 15", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x220d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x220e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x220f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x2210, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x2211, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x2212, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x2213, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x2214, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x2266, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x2267, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x2268, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x2269, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x226a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x226b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x226c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x226d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x226e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x226f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x227a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x227b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x229e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x22a0, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x22b2, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x22b7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x22bf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x22c0, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x22c1, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x22c2, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x22cd, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x22ce, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x22cf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >- SND_PCI_QUIRK(0x103c, 0x22d0, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > /* ALC290 */
> > SND_PCI_QUIRK(0x103c, 0x2260, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> > SND_PCI_QUIRK(0x103c, 0x2261, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
> >@@ -5075,6 +5053,61 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
> > {0x1d, 0x40f41905},
> > {0x1e, 0x411111f0},
> > {0x21, 0x0321101f}),
> >+ SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
> >+ {0x12, 0x99a30130},
> >+ {0x14, 0x90170110},
> >+ {0x17, 0x40020008},
> >+ {0x18, 0x411111f0},
> >+ {0x19, 0x03a11020},
> >+ {0x1a, 0x411111f0},
> >+ {0x1b, 0x411111f0},
> >+ {0x1d, 0x40e00001},
> >+ {0x1e, 0x411111f0},
> >+ {0x21, 0x03211040}),
> >+ SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
> >+ {0x12, 0x99a30130},
> >+ {0x14, 0x90170110},
> >+ {0x17, 0x40000000},
> >+ {0x18, 0x411111f0},
> >+ {0x19, 0x03a11030},
> >+ {0x1a, 0x411111f0},
> >+ {0x1b, 0x411111f0},
> >+ {0x1d, 0x40e00001},
> >+ {0x1e, 0x411111f0},
> >+ {0x21, 0x03211020}),
> >+ SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
> >+ {0x12, 0x99a30130},
> >+ {0x14, 0x90170110},
> >+ {0x17, 0x40000000},
> >+ {0x18, 0x411111f0},
> >+ {0x19, 0x03a11030},
> >+ {0x1a, 0x411111f0},
> >+ {0x1b, 0x411111f0},
> >+ {0x1d, 0x40f00001},
> >+ {0x1e, 0x411111f0},
> >+ {0x21, 0x03211020}),
> >+ SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
> >+ {0x12, 0x99a30130},
> >+ {0x14, 0x90170110},
> >+ {0x17, 0x40000000},
> >+ {0x18, 0x411111f0},
> >+ {0x19, 0x04a11020},
> >+ {0x1a, 0x411111f0},
> >+ {0x1b, 0x411111f0},
> >+ {0x1d, 0x40f00001},
> >+ {0x1e, 0x411111f0},
> >+ {0x21, 0x0421101f}),
> >+ SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
> >+ {0x12, 0x99a30130},
> >+ {0x14, 0x90170110},
> >+ {0x17, 0x40000000},
> >+ {0x18, 0x411111f0},
> >+ {0x19, 0x03a11030},
> >+ {0x1a, 0x411111f0},
> >+ {0x1b, 0x411111f0},
> >+ {0x1d, 0x40f00001},
> >+ {0x1e, 0x411111f0},
> >+ {0x21, 0x04211020}),
> > SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
> > {0x12, 0x90a60130},
> > {0x14, 0x90170110},
> >
>
> --
> David Henningsson, Canonical Ltd.
> https://launchpad.net/~diwic
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html