git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 4b43d05a1978a93a19374c6e6b817c9c1ff4ba4b Mon Sep 17 00:00:00 2001
   2 From: Armas Spann <zappel@retarded.farm>
   3 Date: Fri, 24 Jul 2020 16:06:16 +0200
   4 Subject: ALSA: hda/realtek: enable headset mic of ASUS ROG Zephyrus G15(GA502) series with ALC289
   5
   6 From: Armas Spann <zappel@retarded.farm>
   7
   8 commit 4b43d05a1978a93a19374c6e6b817c9c1ff4ba4b upstream.
   9
  10 This patch adds support for headset mic to the ASUS ROG Zephyrus
  11 G15(GA502) notebook series by adding the corresponding
  12 vendor/pci_device id, as well as adding a new fixup for the used
  13 realtek ALC289. The fixup stets the correct pin to get the headset mic
  14 correctly recognized on audio-jack.
  15
  16 Signed-off-by: Armas Spann <zappel@retarded.farm>
  17 Cc: <stable@vger.kernel.org>
  18 Link: https://lore.kernel.org/r/20200724140616.298892-1-zappel@retarded.farm
  19 Signed-off-by: Takashi Iwai <tiwai@suse.de>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  sound/pci/hda/patch_realtek.c |    9 +++++++++
  24  1 file changed, 9 insertions(+)
  25
  26 --- a/sound/pci/hda/patch_realtek.c
  27 +++ b/sound/pci/hda/patch_realtek.c
  28 @@ -6118,6 +6118,7 @@ enum {
  29         ALC269VC_FIXUP_ACER_HEADSET_MIC,
  30         ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE,
  31         ALC289_FIXUP_ASUS_G401,
  32 +       ALC289_FIXUP_ASUS_GA502,
  33         ALC256_FIXUP_ACER_MIC_NO_PRESENCE,
  34  };
  35
  36 @@ -7335,6 +7336,13 @@ static const struct hda_fixup alc269_fix
  37                         { }
  38                 },
  39         },
  40 +       [ALC289_FIXUP_ASUS_GA502] = {
  41 +               .type = HDA_FIXUP_PINS,
  42 +               .v.pins = (const struct hda_pintbl[]) {
  43 +                       { 0x19, 0x03a11020 }, /* headset mic with jack detect */
  44 +                       { }
  45 +               },
  46 +       },
  47         [ALC256_FIXUP_ACER_MIC_NO_PRESENCE] = {
  48                 .type = HDA_FIXUP_PINS,
  49                 .v.pins = (const struct hda_pintbl[]) {
  50 @@ -7526,6 +7534,7 @@ static const struct snd_pci_quirk alc269
  51         SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
  52         SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
  53         SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
  54 +       SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
  55         SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_G401),
  56         SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
  57         SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),