lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 055/244] ALSA: hda/realtek: ALC285 Thinkpad jack pin quirk is unreachable
    Date
    From: Sami Loone <sami@loone.fi>

    commit 266fd994b2b0ab7ba3e5541868838ce30775964b upstream.

    In 9bbb94e57df1 ("ALSA: hda/realtek: fix static noise on ALC285 Lenovo
    laptops") an existing Lenovo quirk was made more generic by removing a
    0x12 pin requirement from the entry. This made the second chance table
    Thinkpad jack entry unreachable as the pin configurations became
    identical.

    Revert the 0x12 pin requirement removal and move Thinkpad jack pin quirk
    back to the primary pin table as they can co-exist when more specific
    configurations come first.

    Add a more targeted pin quirk for Lenovo devices that have 0x12 as
    0x40000000.

    Tested on Yoga 6 (AMD) laptop.

    [ Corrected the commit ID -- tiwai ]

    Fixes: 9bbb94e57df1 ("ALSA: hda/realtek: fix static noise on ALC285 Lenovo laptops")
    Signed-off-by: Sami Loone <sami@loone.fi>
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/YI0oefvTYn8URYDb@yoga
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/pci/hda/patch_realtek.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/sound/pci/hda/patch_realtek.c
    +++ b/sound/pci/hda/patch_realtek.c
    @@ -8598,6 +8598,16 @@ static const struct snd_hda_pin_quirk al
    {0x19, 0x03a11020},
    {0x21, 0x0321101f}),
    SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,
    + {0x12, 0x90a60130},
    + {0x14, 0x90170110},
    + {0x19, 0x04a11040},
    + {0x21, 0x04211020}),
    + SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,
    + {0x14, 0x90170110},
    + {0x19, 0x04a11040},
    + {0x1d, 0x40600001},
    + {0x21, 0x04211020}),
    + SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,
    {0x14, 0x90170110},
    {0x19, 0x04a11040},
    {0x21, 0x04211020}),
    @@ -8765,10 +8775,6 @@ static const struct snd_hda_pin_quirk al
    SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
    {0x19, 0x40000000},
    {0x1a, 0x40000000}),
    - SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,
    - {0x14, 0x90170110},
    - {0x19, 0x04a11040},
    - {0x21, 0x04211020}),
    {}
    };


    \
     
     \ /
      Last update: 2021-05-12 16:57    [W:3.195 / U:1.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site