From 79363a32730028dc014299cf055f8bfefbd0da45 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 9 Feb 2026 15:10:38 +0100 Subject: [PATCH] drop alsa patch from 5.10 and 5.15 --- ...ix-headset-mic-for-tongfang-x6ar55xu.patch | 45 ------------------- queue-5.10/series | 1 - ...ix-headset-mic-for-tongfang-x6ar55xu.patch | 45 ------------------- queue-5.15/series | 1 - 4 files changed, 92 deletions(-) delete mode 100644 queue-5.10/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch delete mode 100644 queue-5.15/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch diff --git a/queue-5.10/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch b/queue-5.10/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch deleted file mode 100644 index 3984699a9d..0000000000 --- a/queue-5.10/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1aaedafb21f38cb872d44f7608b4828a1e14e795 Mon Sep 17 00:00:00 2001 -From: Werner Sembach -Date: Fri, 23 Jan 2026 23:12:24 +0100 -Subject: ALSA: hda/realtek: Really fix headset mic for TongFang X6AR55xU. - -From: Werner Sembach - -commit 1aaedafb21f38cb872d44f7608b4828a1e14e795 upstream. - -Add a PCI quirk to enable microphone detection on the headphone jack of -TongFang X6AR55xU devices. - -The former quirk entry did not acomplish this and is removed. - -Fixes: b48fe9af1e60 ("ALSA: hda/realtek: Fix headset mic for TongFang X6AR55xU") -Signed-off-by: Tim Guttzeit -Signed-off-by: Werner Sembach -Link: https://patch.msgid.link/20260123221233.28273-1-wse@tuxedocomputers.com -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/pci/hda/patch_realtek.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -9604,6 +9604,7 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1d05, 0x1147, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP), - SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP), - SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP), -+ SND_PCI_QUIRK(0x1d05, 0x3031, "TongFang X6AR55xU", ALC2XX_FIXUP_HEADSET_MIC), - SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC), - SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC), -@@ -10052,10 +10053,6 @@ static const struct snd_hda_pin_quirk al - {0x12, 0x90a60140}, - {0x19, 0x04a11030}, - {0x21, 0x04211020}), -- SND_HDA_PIN_QUIRK(0x10ec0274, 0x1d05, "TongFang", ALC274_FIXUP_HP_HEADSET_MIC, -- {0x17, 0x90170110}, -- {0x19, 0x03a11030}, -- {0x21, 0x03211020}), - SND_HDA_PIN_QUIRK(0x10ec0282, 0x1025, "Acer", ALC282_FIXUP_ACER_DISABLE_LINEOUT, - ALC282_STANDARD_PINS, - {0x12, 0x90a609c0}, diff --git a/queue-5.10/series b/queue-5.10/series index d1fbbc6cb3..75acadfbec 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -40,4 +40,3 @@ gve-fix-stats-report-corruption-on-queue-count-change.patch tracing-fix-ftrace-event-field-alignments.patch gve-correct-ethtool-rx_dropped-calculation.patch nvmet-tcp-pass-iov_len-instead-of-sg-length-to-bvec_set_page.patch -alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch diff --git a/queue-5.15/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch b/queue-5.15/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch deleted file mode 100644 index 283a073993..0000000000 --- a/queue-5.15/alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1aaedafb21f38cb872d44f7608b4828a1e14e795 Mon Sep 17 00:00:00 2001 -From: Werner Sembach -Date: Fri, 23 Jan 2026 23:12:24 +0100 -Subject: ALSA: hda/realtek: Really fix headset mic for TongFang X6AR55xU. - -From: Werner Sembach - -commit 1aaedafb21f38cb872d44f7608b4828a1e14e795 upstream. - -Add a PCI quirk to enable microphone detection on the headphone jack of -TongFang X6AR55xU devices. - -The former quirk entry did not acomplish this and is removed. - -Fixes: b48fe9af1e60 ("ALSA: hda/realtek: Fix headset mic for TongFang X6AR55xU") -Signed-off-by: Tim Guttzeit -Signed-off-by: Werner Sembach -Link: https://patch.msgid.link/20260123221233.28273-1-wse@tuxedocomputers.com -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman ---- - sound/pci/hda/patch_realtek.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -9685,6 +9685,7 @@ static const struct snd_pci_quirk alc269 - SND_PCI_QUIRK(0x1d05, 0x1147, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP), - SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP), - SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP), -+ SND_PCI_QUIRK(0x1d05, 0x3031, "TongFang X6AR55xU", ALC2XX_FIXUP_HEADSET_MIC), - SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC), - SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC), -@@ -10133,10 +10134,6 @@ static const struct snd_hda_pin_quirk al - {0x12, 0x90a60140}, - {0x19, 0x04a11030}, - {0x21, 0x04211020}), -- SND_HDA_PIN_QUIRK(0x10ec0274, 0x1d05, "TongFang", ALC274_FIXUP_HP_HEADSET_MIC, -- {0x17, 0x90170110}, -- {0x19, 0x03a11030}, -- {0x21, 0x03211020}), - SND_HDA_PIN_QUIRK(0x10ec0282, 0x1025, "Acer", ALC282_FIXUP_ACER_DISABLE_LINEOUT, - ALC282_STANDARD_PINS, - {0x12, 0x90a609c0}, diff --git a/queue-5.15/series b/queue-5.15/series index b404d5c4dd..1b1469ef20 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -74,4 +74,3 @@ spi-tegra210-quad-protect-curr_xfer-in-tegra_qspi_co.patch spi-tegra210-quad-protect-curr_xfer-clearing-in-tegr.patch spi-tegra-fix-a-memory-leak-in-tegra_slink_probe.patch nvmet-tcp-pass-iov_len-instead-of-sg-length-to-bvec_set_page.patch -alsa-hda-realtek-really-fix-headset-mic-for-tongfang-x6ar55xu.patch -- 2.47.3