Drop asoc-sof-sof-pci-dev-fix-community-key-quirk-detecti.patch-6356

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

diff --git a/queue-5.15/asoc-sof-sof-pci-dev-fix-community-key-quirk-detecti.patch-6356 b/queue-5.15/asoc-sof-sof-pci-dev-fix-community-key-quirk-detecti.patch-6356
deleted file mode 100644 (file)
index f1f0cbc..0000000
--- a/queue-5.15/asoc-sof-sof-pci-dev-fix-community-key-quirk-detecti.patch-6356
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5483b479d7a82ad63a17eae085aa325b53141aef Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 20 Oct 2023 14:59:53 -0600
-Subject: ASoC: SOF: sof-pci-dev: Fix community key quirk detection
-
-From: Mark Hasemeyer <markhas@chromium.org>
-
-[ Upstream commit 7dd692217b861a8292ff8ac2c9d4458538fd6b96 ]
-
-Some Chromebooks do not populate the product family DMI value resulting
-in firmware load failures.
-
-Add another quirk detection entry that looks for "Google" in the BIOS
-version. Theoretically, PRODUCT_FAMILY could be replaced with
-BIOS_VERSION, but it is left as a quirk to be conservative.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
-Acked-by: Curtis Malainey <cujomalainey@chromium.org>
-Link: https://lore.kernel.org/r/20231020145953.v1.1.Iaf5702dc3f8af0fd2f81a22ba2da1a5e15b3604c@changeid
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/sof/sof-pci-dev.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
-index 9f0732461a611..ec40053041e15 100644
---- a/sound/soc/sof/sof-pci-dev.c
-+++ b/sound/soc/sof/sof-pci-dev.c
-@@ -101,6 +101,13 @@ static const struct dmi_system_id community_key_platforms[] = {
-                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"),
-               }
-       },
-+      {
-+              .ident = "Google firmware",
-+              .callback = chromebook_use_community_key,
-+              .matches = {
-+                      DMI_MATCH(DMI_BIOS_VERSION, "Google"),
-+              }
-+      },
-       {},
- };
- 
--- 
-2.42.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 993a82141dd81198996916380093db0241d2a512..f0cb0a54a02bbf0ff67718d0dea3dde36570fe86 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch
 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch
 iommu-vt-d-make-context-clearing-consistent-with-con.patch
 smb3-fix-touch-h-of-symlink.patch-27885
-asoc-sof-sof-pci-dev-fix-community-key-quirk-detecti.patch-6356
 fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578
 fs-add-ctime-accessors-infrastructure.patch-279
 smb3-fix-caching-of-ctime-on-setxattr.patch-25511