From c8a1691e3c7390f70ff145e2076aa33781343e08 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 9 Feb 2026 15:11:44 +0100 Subject: [PATCH] drop alsa patch as it was wrong and the fixup didn't apply --- ...-fix-headset-mic-for-tongfang-x6ar55.patch | 39 ------------------- queue-5.10/series | 1 - ...-fix-headset-mic-for-tongfang-x6ar55.patch | 39 ------------------- queue-5.15/series | 1 - 4 files changed, 80 deletions(-) delete mode 100644 queue-5.10/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch delete mode 100644 queue-5.15/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch diff --git a/queue-5.10/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch b/queue-5.10/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch deleted file mode 100644 index 7b86ca40ab..0000000000 --- a/queue-5.10/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 301871891511231be84cc61494b47cedea705a1e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Jan 2026 16:15:55 +0100 -Subject: ALSA: hda/realtek: Fix headset mic for TongFang X6AR55xU - -From: Tim Guttzeit - -[ Upstream commit b48fe9af1e60360baf09ca6b7a3cd6541f16e611 ] - -Add a PCI quirk to enable microphone detection on the headphone jack of -TongFang X6AR55xU devices. - -Signed-off-by: Tim Guttzeit -Signed-off-by: Werner Sembach -Link: https://patch.msgid.link/20260119151626.35481-1-wse@tuxedocomputers.com -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_realtek.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index a8f530037033e..b8c7f4c8593ba 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -10052,6 +10052,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { - {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}, --- -2.51.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 75acadfbec..8c289f9e43 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -18,7 +18,6 @@ asoc-davinci-evm-fix-reference-leak-in-davinci_evm_p.patch asoc-tlv320adcx140-propagate-error-codes-during-prob.patch wifi-cfg80211-fix-bitrate-calculation-overflow-for-h.patch scsi-target-iscsi-fix-use-after-free-in-iscsit_dec_s.patch -alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch scsi-target-iscsi-fix-use-after-free-in-iscsit_dec_c.patch wifi-mac80211-don-t-increment-crypto_tx_tailroom_nee.patch platform-x86-toshiba_haps-fix-memory-leaks-in-add-re.patch diff --git a/queue-5.15/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch b/queue-5.15/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch deleted file mode 100644 index acb45f957a..0000000000 --- a/queue-5.15/alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 31c35e204ae40a075292fbd8a65afee887924695 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Jan 2026 16:15:55 +0100 -Subject: ALSA: hda/realtek: Fix headset mic for TongFang X6AR55xU - -From: Tim Guttzeit - -[ Upstream commit b48fe9af1e60360baf09ca6b7a3cd6541f16e611 ] - -Add a PCI quirk to enable microphone detection on the headphone jack of -TongFang X6AR55xU devices. - -Signed-off-by: Tim Guttzeit -Signed-off-by: Werner Sembach -Link: https://patch.msgid.link/20260119151626.35481-1-wse@tuxedocomputers.com -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin ---- - sound/pci/hda/patch_realtek.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 839a7e957d42a..72d9ea5171bbd 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -10133,6 +10133,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { - {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}, --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 1b1469ef20..8d5ee35a93 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -39,7 +39,6 @@ asoc-davinci-evm-fix-reference-leak-in-davinci_evm_p.patch asoc-tlv320adcx140-propagate-error-codes-during-prob.patch wifi-cfg80211-fix-bitrate-calculation-overflow-for-h.patch scsi-target-iscsi-fix-use-after-free-in-iscsit_dec_s.patch -alsa-hda-realtek-fix-headset-mic-for-tongfang-x6ar55.patch scsi-target-iscsi-fix-use-after-free-in-iscsit_dec_c.patch wifi-mac80211-don-t-increment-crypto_tx_tailroom_nee.patch platform-x86-toshiba_haps-fix-memory-leaks-in-add-re.patch -- 2.47.3