From: Sasha Levin Date: Sat, 27 Jun 2020 03:43:41 +0000 (-0400) Subject: Drop alsa-hda-realtek-add-headset-button-supported-for-th.patch fomr X-Git-Tag: v5.7.7~61^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec4236f3e13478649d34408d866d80c60979ffd1;p=thirdparty%2Fkernel%2Fstable-queue.git Drop alsa-hda-realtek-add-headset-button-supported-for-th.patch fomr 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/alsa-hda-realtek-add-headset-button-supported-for-th.patch b/queue-4.19/alsa-hda-realtek-add-headset-button-supported-for-th.patch deleted file mode 100644 index 4f02b2377a4..00000000000 --- a/queue-4.19/alsa-hda-realtek-add-headset-button-supported-for-th.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 84b154894c62602e0afe276dd7c25d58cd0f6a8c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 10 Feb 2020 16:30:26 +0800 -Subject: ALSA: hda/realtek - Add Headset Button supported for ThinkPad X1 - -From: Kailang Yang - -[ Upstream commit 76f7dec08fd64e9e3ad0810a1a8a60b0a846d348 ] - -ThinkPad want to support Headset Button control. -This patch will enable it. - -Signed-off-by: Kailang Yang -Cc: -Link: https://lore.kernel.org/r/7f0b7128f40f41f6b5582ff610adc33d@realtek.com -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_realtek.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 623ebe2e7db43..1bcbd5b5a067f 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -5747,7 +5747,7 @@ enum { - ALC289_FIXUP_DUAL_SPK, - ALC294_FIXUP_SPK2_TO_DAC1, - ALC294_FIXUP_ASUS_DUAL_SPK, -- -+ ALC285_FIXUP_THINKPAD_HEADSET_JACK, - }; - - static const struct hda_fixup alc269_fixups[] = { -@@ -6836,7 +6836,12 @@ static const struct hda_fixup alc269_fixups[] = { - .chained = true, - .chain_id = ALC294_FIXUP_SPK2_TO_DAC1 - }, -- -+ [ALC285_FIXUP_THINKPAD_HEADSET_JACK] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = alc_fixup_headset_jack, -+ .chained = true, -+ .chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1 -+ }, - }; - - static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -7070,8 +7075,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), - SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), - SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), -- SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1), -- SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1), -+ SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), -+ SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), - SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), - SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), - SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), --- -2.25.1 - diff --git a/queue-4.19/alsa-hda-realtek-enable-the-headset-of-asus-b9450fa-.patch b/queue-4.19/alsa-hda-realtek-enable-the-headset-of-asus-b9450fa-.patch index 5db956eeb80..0dc2a96cfbd 100644 --- a/queue-4.19/alsa-hda-realtek-enable-the-headset-of-asus-b9450fa-.patch +++ b/queue-4.19/alsa-hda-realtek-enable-the-headset-of-asus-b9450fa-.patch @@ -1,10 +1,8 @@ -From 1eb05359781ae05bd53866dd30fcbb1e5cc521b2 Mon Sep 17 00:00:00 2001 +From 048dbab0e5afcbe786fd72f03f285cccc6026b86 Mon Sep 17 00:00:00 2001 From: Sasha Levin -Date: Tue, 25 Feb 2020 15:29:21 +0800 +Date: Fri, 26 Jun 2020 23:41:55 -0400 Subject: ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294 -From: Jian-Hong Pan - [ Upstream commit 8b33a134a9cc2a501f8fc731d91caef39237d495 ] A headset on the laptop like ASUS B9450FA does not work, until quirk @@ -17,25 +15,27 @@ Link: https://lore.kernel.org/r/20200225072920.109199-1-jian-hong@endlessm.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/hda/patch_realtek.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) + sound/pci/hda/patch_realtek.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 1bcbd5b5a067f..70f722392cf50 100644 +index 623ebe2e7db43..9847be4349e60 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -5748,6 +5748,7 @@ enum { +@@ -5747,7 +5747,7 @@ enum { + ALC289_FIXUP_DUAL_SPK, ALC294_FIXUP_SPK2_TO_DAC1, ALC294_FIXUP_ASUS_DUAL_SPK, - ALC285_FIXUP_THINKPAD_HEADSET_JACK, +- + ALC294_FIXUP_ASUS_HPE, }; static const struct hda_fixup alc269_fixups[] = { -@@ -6842,6 +6843,17 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -6836,7 +6836,17 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, - .chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1 + .chain_id = ALC294_FIXUP_SPK2_TO_DAC1 }, +- + [ALC294_FIXUP_ASUS_HPE] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { @@ -50,7 +50,7 @@ index 1bcbd5b5a067f..70f722392cf50 100644 }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -7004,6 +7016,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -6999,6 +7009,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK), SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), diff --git a/queue-4.19/series b/queue-4.19/series index 40b1064c9d4..498fafddf51 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -11,7 +11,6 @@ i2c-tegra-add-missing-kerneldoc-for-some-fields.patch i2c-tegra-fix-maximum-transfer-size.patch btrfs-make-caching_thread-use-btrfs_find_next_key.patch fix-a-braino-in-sparc32-fix-register-window-handling.patch -alsa-hda-realtek-add-headset-button-supported-for-th.patch alsa-hda-realtek-enable-the-headset-of-asus-b9450fa-.patch alsa-hda-realtek-enable-mute-led-on-an-hp-system.patch alsa-hda-realtek-enable-micmute-led-on-and-hp-system.patch