6.1-stable patches

added patches:
	asoc-amd-yc-revert-fix-non-functional-mic-on-lenovo-21j2.patch

diff --git a/queue-6.1/asoc-amd-yc-revert-fix-non-functional-mic-on-lenovo-21j2.patch b/queue-6.1/asoc-amd-yc-revert-fix-non-functional-mic-on-lenovo-21j2.patch
new file mode 100644 (file)
index 0000000..c0b3ed3
--- /dev/null
+++ b/queue-6.1/asoc-amd-yc-revert-fix-non-functional-mic-on-lenovo-21j2.patch
@@ -0,0 +1,52 @@
+From 861b3415e4dee06cc00cd1754808a7827b9105bf Mon Sep 17 00:00:00 2001
+From: Jiawei Wang <me@jwang.link>
+Date: Wed, 13 Mar 2024 09:58:52 +0800
+Subject: ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2"
+
+From: Jiawei Wang <me@jwang.link>
+
+commit 861b3415e4dee06cc00cd1754808a7827b9105bf upstream.
+
+This reverts commit ed00a6945dc32462c2d3744a3518d2316da66fcc,
+which added a quirk entry to enable the Yellow Carp (YC)
+driver for the Lenovo 21J2 laptop.
+
+Although the microphone functioned with the YC driver, it
+resulted in incorrect driver usage. The Lenovo 21J2 is not a
+Yellow Carp platform, but a Pink Sardine platform, which
+already has an upstreamed driver.
+
+The microphone on the Lenovo 21J2 operates correctly with the
+CONFIG_SND_SOC_AMD_PS flag enabled and does not require the
+quirk entry. So this patch removes the quirk entry.
+
+Thanks to Mukunda Vijendar [1] for pointing this out.
+
+Link: https://lore.kernel.org/linux-sound/023092e1-689c-4b00-b93f-4092c3724fb6@amd.com/ [1]
+
+Signed-off-by: Jiawei Wang <me@jwang.link>
+Link: https://lore.kernel.org/linux-sound/023092e1-689c-4b00-b93f-4092c3724fb6@amd.com/ [1]
+Link: https://msgid.link/r/20240313015853.3573242-2-me@jwang.link
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: Luca Stefani <luca.stefani.ge1@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/amd/yc/acp6x-mach.c |    7 -------
+ 1 file changed, 7 deletions(-)
+
+--- a/sound/soc/amd/yc/acp6x-mach.c
++++ b/sound/soc/amd/yc/acp6x-mach.c
+@@ -203,13 +203,6 @@ static const struct dmi_system_id yc_acp
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+-                      DMI_MATCH(DMI_PRODUCT_NAME, "21J2"),
+-              }
+-      },
+-      {
+-              .driver_data = &acp6x_card,
+-              .matches = {
+-                      DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "21J0"),
+               }
+       },

diff --git a/queue-6.1/series b/queue-6.1/series
index aedfd66d72031a9d18c2872280bf099203557dff..51d74903baf7cec44eaa9d60be7e851fb35605e5 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -176,3 +176,4 @@ i2c-i801-avoid-potential-double-call-to-gpiod_remove_lookup_table.patch
 drm-amd-display-handle-range-offsets-in-vrr-ranges.patch
 x86-efistub-call-mixed-mode-boot-services-on-the-firmware-s-stack.patch
 net-tls-handle-backlogging-of-crypto-requests.patch
+asoc-amd-yc-revert-fix-non-functional-mic-on-lenovo-21j2.patch