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

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

diff --git a/queue-6.1/alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch b/queue-6.1/alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch
deleted file mode 100644 (file)
index 312dd4f..0000000
--- a/queue-6.1/alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 180826e595afdaf93f61a7d8929efb5e586ee9b0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Sep 2023 16:50:41 +0800
-Subject: ALSA: hda/realtek - ALC287 I2S speaker platform support
-
-From: Kailang Yang <kailang@realtek.com>
-
-[ Upstream commit e43252db7e207a2e194e6a4883a43a31a776a968 ]
-
-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.
-
-Tested-by: Mark Pearson <mpearson@lenovo.com>
-Signed-off-by: Kailang Yang <kailang@realtek.com>
-Link: https://lore.kernel.org/r/4e4cfa1b3b4c46838aecafc6e8b6f876@realtek.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Stable-dep-of: 41b07476da38 ("ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/pci/hda/patch_realtek.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index e01af481e0d0d..62476b6fd248c 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7046,6 +7046,27 @@ static void alc295_fixup_dell_inspiron_top_speakers(struct hda_codec *codec,
-       }
- }
- 
-+/* Forcibly assign NID 0x03 to HP while NID 0x02 to SPK */
-+static void alc287_fixup_bind_dacs(struct hda_codec *codec,
-+                                  const struct hda_fixup *fix, int action)
-+{
-+      struct alc_spec *spec = codec->spec;
-+      static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */
-+      static const hda_nid_t preferred_pairs[] = {
-+              0x17, 0x02, 0x21, 0x03, 0
-+      };
-+
-+      if (action != HDA_FIXUP_ACT_PRE_PROBE)
-+              return;
-+
-+      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 */
-+}
-+
-+
- enum {
-       ALC269_FIXUP_GPIO2,
-       ALC269_FIXUP_SONY_VAIO,
-@@ -7307,6 +7328,7 @@ enum {
-       ALC287_FIXUP_TAS2781_I2C,
-       ALC245_FIXUP_HP_MUTE_LED_COEFBIT,
-       ALC245_FIXUP_HP_X360_MUTE_LEDS,
-+      ALC287_FIXUP_THINKPAD_I2S_SPK,
- };
- 
- /* A special fixup for Lenovo C940 and Yoga Duet 7;
-@@ -9392,6 +9414,10 @@ static const struct hda_fixup alc269_fixups[] = {
-               .chained = true,
-               .chain_id = ALC245_FIXUP_HP_GPIO_LED
-       },
-+      [ALC287_FIXUP_THINKPAD_I2S_SPK] = {
-+              .type = HDA_FIXUP_FUNC,
-+              .v.func = alc287_fixup_bind_dacs,
-+      },
- };
- 
- static const struct snd_pci_quirk alc269_fixup_tbl[] = {
-@@ -10514,6 +10540,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
-               {0x17, 0x90170111},
-               {0x19, 0x03a11030},
-               {0x21, 0x03211020}),
-+      SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,
-+              {0x17, 0x90170110},
-+              {0x19, 0x03a11030},
-+              {0x21, 0x03211020}),
-       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 427e48a764e690d96c88b9f5e36901274042e9bf..09bfd142a9a64400f036c515b1f2d78a9b4a5f74 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -3,7 +3,6 @@ spi-zynqmp-gqspi-fix-clock-imbalance-on-probe-failur.patch
 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
 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-i2s-speaker-platform-support.patch b/queue-6.5/alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch
deleted file mode 100644 (file)
index 736092a..0000000
--- a/queue-6.5/alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 96533eb59bc801c55a4a632c135e321c2134ca9e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 6 Sep 2023 16:50:41 +0800
-Subject: ALSA: hda/realtek - ALC287 I2S speaker platform support
-
-From: Kailang Yang <kailang@realtek.com>
-
-[ Upstream commit e43252db7e207a2e194e6a4883a43a31a776a968 ]
-
-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.
-
-Tested-by: Mark Pearson <mpearson@lenovo.com>
-Signed-off-by: Kailang Yang <kailang@realtek.com>
-Link: https://lore.kernel.org/r/4e4cfa1b3b4c46838aecafc6e8b6f876@realtek.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Stable-dep-of: 41b07476da38 ("ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/pci/hda/patch_realtek.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 57bd11c6057d5..b040889b22880 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7049,6 +7049,27 @@ static void alc295_fixup_dell_inspiron_top_speakers(struct hda_codec *codec,
-       }
- }
- 
-+/* Forcibly assign NID 0x03 to HP while NID 0x02 to SPK */
-+static void alc287_fixup_bind_dacs(struct hda_codec *codec,
-+                                  const struct hda_fixup *fix, int action)
-+{
-+      struct alc_spec *spec = codec->spec;
-+      static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */
-+      static const hda_nid_t preferred_pairs[] = {
-+              0x17, 0x02, 0x21, 0x03, 0
-+      };
-+
-+      if (action != HDA_FIXUP_ACT_PRE_PROBE)
-+              return;
-+
-+      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 */
-+}
-+
-+
- enum {
-       ALC269_FIXUP_GPIO2,
-       ALC269_FIXUP_SONY_VAIO,
-@@ -7311,6 +7332,7 @@ enum {
-       ALC287_FIXUP_TAS2781_I2C,
-       ALC245_FIXUP_HP_MUTE_LED_COEFBIT,
-       ALC245_FIXUP_HP_X360_MUTE_LEDS,
-+      ALC287_FIXUP_THINKPAD_I2S_SPK,
- };
- 
- /* A special fixup for Lenovo C940 and Yoga Duet 7;
-@@ -9405,6 +9427,10 @@ static const struct hda_fixup alc269_fixups[] = {
-               .chained = true,
-               .chain_id = ALC245_FIXUP_HP_GPIO_LED
-       },
-+      [ALC287_FIXUP_THINKPAD_I2S_SPK] = {
-+              .type = HDA_FIXUP_FUNC,
-+              .v.func = alc287_fixup_bind_dacs,
-+      },
- };
- 
- static const struct snd_pci_quirk alc269_fixup_tbl[] = {
-@@ -10537,6 +10563,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
-               {0x17, 0x90170111},
-               {0x19, 0x03a11030},
-               {0x21, 0x03211020}),
-+      SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,
-+              {0x17, 0x90170110},
-+              {0x19, 0x03a11030},
-+              {0x21, 0x03211020}),
-       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 0c042ede416354323a14e3cbe7ec0778e2bc8e35..65db913b121238861cf2c9d0a995b742ca11eb4f 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -1,7 +1,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
 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