fix up alsa patch removal for 6.1 and 6.5

diff --git a/queue-6.1/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch b/queue-6.1/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch
deleted file mode 100644 (file)
index 199d007..0000000
--- a/queue-6.1/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f286620b5dc974fe281d8feed6e228fd2f39d013 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.i.king@gmail.com>
-Date: Mon, 21 Aug 2023 09:00:03 +0100
-Subject: ALSA: hda/realtek: Fix spelling mistake "powe" -> "power"
-
-From: Colin Ian King <colin.i.king@gmail.com>
-
-commit f286620b5dc974fe281d8feed6e228fd2f39d013 upstream.
-
-There is a spelling mistake in a quirk entry. Fix it.
-
-Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
-Fixes: 3babae915f4c ("ALSA: hda/tas2781: Add tas2781 HDA driver")
-Link: https://lore.kernel.org/r/20230821080003.16678-1-colin.i.king@gmail.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/pci/hda/patch_realtek.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -9993,7 +9993,7 @@ static const struct snd_pci_quirk alc269
-       SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
-       SND_PCI_QUIRK(0x17aa, 0x387d, "Yoga S780-16 pro Quad AAC", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x387e, "Yoga S780-16 pro Quad YC", ALC287_FIXUP_TAS2781_I2C),
--      SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual powe mode2 YC", ALC287_FIXUP_TAS2781_I2C),
-+      SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual power mode2 YC", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C),

diff --git a/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch b/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch
deleted file mode 100644 (file)
index 20a3864..0000000
--- a/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fb6254df09bba303db2a1002085f6c0b90a456ed Mon Sep 17 00:00:00 2001
-From: Kailang Yang <kailang@realtek.com>
-Date: Tue, 12 Sep 2023 15:31:49 +0800
-Subject: ALSA: hda/realtek - Fixed two speaker platform
-
-From: Kailang Yang <kailang@realtek.com>
-
-commit fb6254df09bba303db2a1002085f6c0b90a456ed upstream.
-
-If system has two speakers and one connect to 0x14 pin, use this
-function will disable it.
-
-Fixes: e43252db7e20 ("ALSA: hda/realtek - ALC287 I2S speaker platform support")
-Signed-off-by: Kailang Yang <kailang@realtek.com>
-Link: https://lore.kernel.org/r/e3f2aac3fe6a47079d728a6443358cc2@realtek.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/pci/hda/patch_realtek.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7062,8 +7062,10 @@ static void alc287_fixup_bind_dacs(struc
-       snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
-       spec->gen.preferred_dacs = preferred_pairs;
-       spec->gen.auto_mute_via_amp = 1;
--      snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
--                          0x0); /* Make sure 0x14 was disable */
-+      if (spec->gen.autocfg.speaker_pins[0] != 0x14) {
-+              snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-+                                      0x0); /* Make sure 0x14 was disable */
-+      }
- }
- 
- 

diff --git a/queue-6.1/series b/queue-6.1/series
index 7040b6cd195a0aabbc0d8fda1820e4d4345495f0..7a847932592f76998fc3bec0556fd12a00d7fbcd 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -143,8 +143,6 @@ rdma-srp-do-not-call-scsi_done-from-srp_abort.patch
 rdma-siw-fix-connection-failure-handling.patch
 rdma-mlx5-fix-mutex-unlocking-on-error-flow-for-steering-anchor-creation.patch
 rdma-mlx5-fix-null-string-error.patch
-alsa-hda-realtek-fix-spelling-mistake-powe-power.patch
-alsa-hda-realtek-fixed-two-speaker-platform.patch
 x86-sev-use-the-ghcb-protocol-when-available-for-snp-cpuid-requests.patch
 ksmbd-fix-race-condition-between-session-lookup-and-expire.patch
 ksmbd-fix-uaf-in-smb20_oplock_break_ack.patch

diff --git a/queue-6.5/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch b/queue-6.5/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch
deleted file mode 100644 (file)
index f7f4249..0000000
--- a/queue-6.5/alsa-hda-realtek-fix-spelling-mistake-powe-power.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f286620b5dc974fe281d8feed6e228fd2f39d013 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.i.king@gmail.com>
-Date: Mon, 21 Aug 2023 09:00:03 +0100
-Subject: ALSA: hda/realtek: Fix spelling mistake "powe" -> "power"
-
-From: Colin Ian King <colin.i.king@gmail.com>
-
-commit f286620b5dc974fe281d8feed6e228fd2f39d013 upstream.
-
-There is a spelling mistake in a quirk entry. Fix it.
-
-Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
-Fixes: 3babae915f4c ("ALSA: hda/tas2781: Add tas2781 HDA driver")
-Link: https://lore.kernel.org/r/20230821080003.16678-1-colin.i.king@gmail.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/pci/hda/patch_realtek.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -10016,7 +10016,7 @@ static const struct snd_pci_quirk alc269
-       SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),
-       SND_PCI_QUIRK(0x17aa, 0x387d, "Yoga S780-16 pro Quad AAC", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x387e, "Yoga S780-16 pro Quad YC", ALC287_FIXUP_TAS2781_I2C),
--      SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual powe mode2 YC", ALC287_FIXUP_TAS2781_I2C),
-+      SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual power mode2 YC", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
-       SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C),

diff --git a/queue-6.5/alsa-hda-realtek-fixed-two-speaker-platform.patch b/queue-6.5/alsa-hda-realtek-fixed-two-speaker-platform.patch
deleted file mode 100644 (file)
index 81fb57a..0000000
--- a/queue-6.5/alsa-hda-realtek-fixed-two-speaker-platform.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fb6254df09bba303db2a1002085f6c0b90a456ed Mon Sep 17 00:00:00 2001
-From: Kailang Yang <kailang@realtek.com>
-Date: Tue, 12 Sep 2023 15:31:49 +0800
-Subject: ALSA: hda/realtek - Fixed two speaker platform
-
-From: Kailang Yang <kailang@realtek.com>
-
-commit fb6254df09bba303db2a1002085f6c0b90a456ed upstream.
-
-If system has two speakers and one connect to 0x14 pin, use this
-function will disable it.
-
-Fixes: e43252db7e20 ("ALSA: hda/realtek - ALC287 I2S speaker platform support")
-Signed-off-by: Kailang Yang <kailang@realtek.com>
-Link: https://lore.kernel.org/r/e3f2aac3fe6a47079d728a6443358cc2@realtek.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/pci/hda/patch_realtek.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7065,8 +7065,10 @@ static void alc287_fixup_bind_dacs(struc
-       snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
-       spec->gen.preferred_dacs = preferred_pairs;
-       spec->gen.auto_mute_via_amp = 1;
--      snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
--                          0x0); /* Make sure 0x14 was disable */
-+      if (spec->gen.autocfg.speaker_pins[0] != 0x14) {
-+              snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-+                                      0x0); /* Make sure 0x14 was disable */
-+      }
- }
- 
- 

diff --git a/queue-6.5/series b/queue-6.5/series
index 761a577dc7370338b9aa6d1d6b7bc53a74fa7c36..5dc55c3a8a0c0ffdda53693f10d9e997949d5b57 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -148,8 +148,6 @@ rdma-mlx5-fix-mkey-cache-possible-deadlock-on-cleanup.patch
 rdma-mlx5-fix-assigning-access-flags-to-cache-mkeys.patch
 rdma-mlx5-fix-mutex-unlocking-on-error-flow-for-steering-anchor-creation.patch
 rdma-mlx5-fix-null-string-error.patch
-alsa-hda-realtek-fix-spelling-mistake-powe-power.patch
-alsa-hda-realtek-fixed-two-speaker-platform.patch
 x86-sev-change-npages-to-unsigned-long-in-snp_accept_memory.patch
 x86-sev-use-the-ghcb-protocol-when-available-for-snp-cpuid-requests.patch
 ksmbd-fix-race-condition-between-session-lookup-and-expire.patch