Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-14 20:28:51 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-14 20:29:11 +0200
commit4f42d54abba7928720f2feb7f6ebb3ecbf76da12 (patch)
tree8177c31f769865317d79c1d14cb4c7765fd4687b
parentc27851467e6a2a9cb9d89a1d2075282be5201291 (diff)
Revert "ALSA: hda/realtek - Improve the headset mic for Acer
Aspire laptops" (bsc#1051510).
-rw-r--r--patches.drivers/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch62
-rw-r--r--series.conf1
2 files changed, 63 insertions, 0 deletions
diff --git a/patches.drivers/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch b/patches.drivers/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch
new file mode 100644
index 0000000000..c7c226e3ad
--- /dev/null
+++ b/patches.drivers/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch
@@ -0,0 +1,62 @@
+From 17d304604a88cf20c8dfd2c95d3decb9c4f8bca4 Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang@canonical.com>
+Date: Fri, 14 Jun 2019 16:44:12 +0800
+Subject: [PATCH] Revert "ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops"
+Git-commit: 17d304604a88cf20c8dfd2c95d3decb9c4f8bca4
+Patch-mainline: v5.2-rc5
+References: bsc#1051510
+
+This reverts commit 9cb40eb184c4220d244a532bd940c6345ad9dbd9.
+
+This patch introduces noise and headphone playback issue after
+rebooting or suspending/resuming. Let us revert it.
+
+Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=203831
+Fixes: 9cb40eb184c4 ("ALSA: hda/realtek - Improve the headset mic for Acer Aspire laptops")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Hui Wang <hui.wang@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index 1afb268f3da0..179e4be1f747 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -6268,15 +6268,13 @@ static const struct hda_fixup alc269_fixups[] = {
+ .chain_id = ALC269_FIXUP_THINKPAD_ACPI,
+ },
+ [ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = {
+- .type = HDA_FIXUP_VERBS,
+- .v.verbs = (const struct hda_verb[]) {
+- /* Enable the Mic */
+- { 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },
+- { 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },
+- {}
++ .type = HDA_FIXUP_PINS,
++ .v.pins = (const struct hda_pintbl[]) {
++ { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
++ { }
+ },
+ .chained = true,
+- .chain_id = ALC269_FIXUP_LIFEBOOK_EXTMIC
++ .chain_id = ALC255_FIXUP_HEADSET_MODE
+ },
+ [ALC255_FIXUP_ASUS_MIC_NO_PRESENCE] = {
+ .type = HDA_FIXUP_PINS,
+@@ -7320,10 +7318,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
+ {0x18, 0x02a11030},
+ {0x19, 0x0181303F},
+ {0x21, 0x0221102f}),
+- SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
+- {0x12, 0x90a60140},
+- {0x14, 0x90170120},
+- {0x21, 0x02211030}),
+ SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
+ {0x12, 0x90a601c0},
+ {0x14, 0x90171120},
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index a04d8fee09..b60275e5f8 100644
--- a/series.conf
+++ b/series.conf
@@ -22433,6 +22433,7 @@
patches.drivers/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch
patches.drivers/ASoC-fsl_asrc-Fix-the-issue-about-unsupported-rate.patch
patches.drivers/ASoC-cs42xx8-Add-regcache-mask-dirty.patch
+ patches.drivers/Revert-ALSA-hda-realtek-Improve-the-headset-mic-for-.patch
# davem/net
patches.drivers/ibmvnic-Do-not-close-unopened-driver-during-reset.patch