summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-10 11:34:44 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-10 11:34:44 -0400
commitbc6c2cbfc858cd170a5cb58baafbf4d2db9f7088 (patch)
tree678eb6797d742c4030258f7b080e772865d19a09
parent44c7dc04befad9f893348137d98621ca11d7ed38 (diff)
downloadlongterm-queue-4.18-bc6c2cbfc858cd170a5cb58baafbf4d2db9f7088.tar.gz
alsa: drop acer patch n/a for 4.18
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/ALSA-hda-realtek-Improve-the-headset-mic-for-Acer-As.patch14
-rw-r--r--queue/series1
2 files changed, 7 insertions, 8 deletions
diff --git a/queue/ALSA-hda-realtek-Improve-the-headset-mic-for-Acer-As.patch b/queue/ALSA-hda-realtek-Improve-the-headset-mic-for-Acer-As.patch
index acaabc4..3227ae2 100644
--- a/queue/ALSA-hda-realtek-Improve-the-headset-mic-for-Acer-As.patch
+++ b/queue/ALSA-hda-realtek-Improve-the-headset-mic-for-Acer-As.patch
@@ -1,4 +1,4 @@
-From 9cb40eb184c4220d244a532bd940c6345ad9dbd9 Mon Sep 17 00:00:00 2001
+From 92bfbd43e487797ca19c81b6e76f2a6cbd3600c6 Mon Sep 17 00:00:00 2001
From: Hui Wang <hui.wang@canonical.com>
Date: Wed, 29 May 2019 12:41:38 +0800
Subject: [PATCH] ALSA: hda/realtek - Improve the headset mic for Acer Aspire
@@ -27,10 +27,10 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index f1bac03e954b..18cb48054e54 100644
+index dffb7bcea71f..65ace9b1db16 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
-@@ -6223,13 +6223,15 @@ static const struct hda_fixup alc269_fixups[] = {
+@@ -6052,13 +6052,15 @@ static const struct hda_fixup alc269_fixups[] = {
.chain_id = ALC269_FIXUP_THINKPAD_ACPI,
},
[ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = {
@@ -51,9 +51,9 @@ index f1bac03e954b..18cb48054e54 100644
},
[ALC255_FIXUP_ASUS_MIC_NO_PRESENCE] = {
.type = HDA_FIXUP_PINS,
-@@ -7274,6 +7276,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
- {0x19, 0x0181303F},
- {0x21, 0x0221102f}),
+@@ -6864,6 +6866,10 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
+
+ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,
+ {0x12, 0x90a60140},
+ {0x14, 0x90170120},
@@ -63,5 +63,5 @@ index f1bac03e954b..18cb48054e54 100644
{0x14, 0x90171120},
{0x21, 0x02211030}),
--
-2.9.5
+2.7.4
diff --git a/queue/series b/queue/series
index 874a8aa..f5b1995 100644
--- a/queue/series
+++ b/queue/series
@@ -54,7 +54,6 @@ KVM-PPC-Book3S-HV-XIVE-Do-not-clear-IRQ-data-of-pass.patch
powerpc-perf-Fix-MMCRA-corruption-by-bhrb_filter.patch
ALSA-line6-Assure-canceling-delayed-work-at-disconne.patch
ALSA-hda-realtek-Set-default-power-save-node-to-0.patch
-ALSA-hda-realtek-Improve-the-headset-mic-for-Acer-As.patch
KVM-s390-Do-not-report-unusabled-IDs-via-KVM_CAP_MAX.patch
drm-nouveau-i2c-Disable-i2c-bus-access-after-fini.patch
i2c-mlxcpld-Fix-wrong-initialization-order-in-probe.patch