pending-5.1/revert-alsa-hda-realtek-improve-the-headset-mic-for-acer-aspire-laptops.patch

   1 From 17d304604a88cf20c8dfd2c95d3decb9c4f8bca4 Mon Sep 17 00:00:00 2001
   2 From: Hui Wang <hui.wang@canonical.com>
   3 Date: Fri, 14 Jun 2019 16:44:12 +0800
   4 Subject: Revert "ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops"
   5
   6 From: Hui Wang <hui.wang@canonical.com>
   7
   8 commit 17d304604a88cf20c8dfd2c95d3decb9c4f8bca4 upstream.
   9
  10 This reverts commit 9cb40eb184c4220d244a532bd940c6345ad9dbd9.
  11
  12 This patch introduces noise and headphone playback issue after
  13 rebooting or suspending/resuming. Let us revert it.
  14
  15 BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=203831
  16 Fixes: 9cb40eb184c4 ("ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops")
  17 Cc: <stable@vger.kernel.org>
  18 Signed-off-by: Hui Wang <hui.wang@canonical.com>
  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 |   16 +++++-----------
  24  1 file changed, 5 insertions(+), 11 deletions(-)
  25
  26 --- a/sound/pci/hda/patch_realtek.c
  27 +++ b/sound/pci/hda/patch_realtek.c
  28 @@ -6166,15 +6166,13 @@ static const struct hda_fixup alc269_fix
  29                 .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
  30         },
  31         [ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = {
  32 -               .type = HDA_FIXUP_VERBS,
  33 -               .v.verbs = (const struct hda_verb[]) {
  34 -                       /* Enable the Mic */
  35 -                       { 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },
  36 -                       { 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },
  37 -                       {}
  38 +               .type = HDA_FIXUP_PINS,
  39 +               .v.pins = (const struct hda_pintbl[]) {
  40 +                       { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
  41 +                       { }
  42                 },
  43                 .chained = true,
  44 -               .chain_id = ALC269_FIXUP_LIFEBOOK_EXTMIC
  45 +               .chain_id = ALC255_FIXUP_HEADSET_MODE
  46         },
  47         [ALC255_FIXUP_ASUS_MIC_NO_PRESENCE] = {
  48                 .type = HDA_FIXUP_PINS,
  49 @@ -7220,10 +7218,6 @@ static const struct snd_hda_pin_quirk al
  50                 {0x19, 0x0181303F},
  51                 {0x21, 0x0221102f}),
  52         SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
  53 -               {0x12, 0x90a60140},
  54 -               {0x14, 0x90170120},
  55 -               {0x21, 0x02211030}),
  56 -       SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
  57                 {0x12, 0x90a601c0},
  58                 {0x14, 0x90171120},
  59                 {0x21, 0x02211030}),