Drop alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch b/queue-6.1/alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch
deleted file mode 100644 (file)
index 4aeaadf..0000000
--- a/queue-6.1/alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 948225e3347ea22b5e5ad668c64ed799bb47d8e4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 19 Sep 2023 16:27:16 +0800
-Subject: ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support
-
-From: Kailang Yang <kailang@realtek.com>
-
-[ Upstream commit 41b07476da38ac2878a14e5b8fe0312c41ea36e3 ]
-
-New platform SSID:0x231f.
-
-0x17 was only speaker pin, DAC assigned will be 0x03. Headphone
-assigned to 0x02.
-Playback via headphone will get EQ filter processing.
-So, it needs to swap DAC.
-
-Signed-off-by: Kailang Yang <kailang@realtek.com>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/8d63c6e360124e3ea2523753050e6f05@realtek.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 62476b6fd248c..3bea49e772a1f 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -10544,6 +10544,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
-               {0x17, 0x90170110},
-               {0x19, 0x03a11030},
-               {0x21, 0x03211020}),
-+      SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,
-+              {0x17, 0x90170110}, /* 0x231f with RTK I2S AMP */
-+              {0x19, 0x04a11040},
-+              {0x21, 0x04211020}),
-       SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,
-               {0x12, 0x90a60130},
-               {0x17, 0x90170110},
--- 
-2.40.1
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 01d3b92e90e98e312d326cd20262b5410cfba755..427e48a764e690d96c88b9f5e36901274042e9bf 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -4,7 +4,6 @@ alsa-hda-tas2781-add-tas2781-hda-driver.patch
 alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch
 alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch
 alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch
-alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch
 asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch
 asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch
 mptcp-rename-timer-related-helper-to-less-confusing-.patch

diff --git a/queue-6.5/alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch b/queue-6.5/alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch
deleted file mode 100644 (file)
index afd4bf6..0000000
--- a/queue-6.5/alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 097eb22c1cce349594a0c43edfd5dcd2af10813a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 19 Sep 2023 16:27:16 +0800
-Subject: ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support
-
-From: Kailang Yang <kailang@realtek.com>
-
-[ Upstream commit 41b07476da38ac2878a14e5b8fe0312c41ea36e3 ]
-
-New platform SSID:0x231f.
-
-0x17 was only speaker pin, DAC assigned will be 0x03. Headphone
-assigned to 0x02.
-Playback via headphone will get EQ filter processing.
-So, it needs to swap DAC.
-
-Signed-off-by: Kailang Yang <kailang@realtek.com>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/8d63c6e360124e3ea2523753050e6f05@realtek.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 b040889b22880..45fa102060cef 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -10567,6 +10567,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
-               {0x17, 0x90170110},
-               {0x19, 0x03a11030},
-               {0x21, 0x03211020}),
-+      SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,
-+              {0x17, 0x90170110}, /* 0x231f with RTK I2S AMP */
-+              {0x19, 0x04a11040},
-+              {0x21, 0x04211020}),
-       SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,
-               {0x12, 0x90a60130},
-               {0x17, 0x90170110},
--- 
-2.40.1
-

diff --git a/queue-6.5/series b/queue-6.5/series
index a53b4f38bc8bc9fdc2470d5d0f1520c2fababb7b..0c042ede416354323a14e3cbe7ec0778e2bc8e35 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -2,7 +2,6 @@ alsa-hda-tas2781-add-tas2781-hda-driver.patch
 alsa-hda-realtek-add-quirk-for-hp-victus-16-d1xxx-to.patch
 alsa-hda-realtek-add-quirk-for-mute-leds-on-hp-envy-.patch
 alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch
-alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch
 asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch
 asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch
 maple_tree-add-mas_is_active-to-detect-in-tree-walks.patch