From: Sasha Levin Date: Mon, 4 Dec 2023 19:50:57 +0000 (-0500) Subject: Drop asoc-sof-sof-pci-dev-use-community-key-on-all-up-boa.patch-6898 X-Git-Tag: v4.14.332~23^2~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ae09d1bf19f45c51778c15c32ef6b116c233ab1;p=thirdparty%2Fkernel%2Fstable-queue.git Drop asoc-sof-sof-pci-dev-use-community-key-on-all-up-boa.patch-6898 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/asoc-sof-sof-pci-dev-use-community-key-on-all-up-boa.patch-6898 b/queue-5.15/asoc-sof-sof-pci-dev-use-community-key-on-all-up-boa.patch-6898 deleted file mode 100644 index 3f4bb2ebc5a..00000000000 --- a/queue-5.15/asoc-sof-sof-pci-dev-use-community-key-on-all-up-boa.patch-6898 +++ /dev/null @@ -1,61 +0,0 @@ -From 6c0c3a4b6e5988f5d4df82c904ea0b661e2d3773 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 19 Nov 2021 17:13:27 -0600 -Subject: ASoC: SOF: sof-pci-dev: use community key on all Up boards -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Pierre-Louis Bossart - -[ Upstream commit 405e52f412b85b581899f5e1b82d25a7c8959d89 ] - -There are already 3 versions of the Up boards with support for the SOF -community key (ApolloLake, WhiskyLake, TigerLake). Rather than -continue to add quirks for each version, let's add a wildcard. - -For WHL and TGL, the authentication supports both the SOF community -key and the firmware signed with the Intel production key. Given two -choices, the community key is the preferred option to allow developers -to sign their own firmware. The firmware signed with production key -can still be selected if needed with a kernel module -option (snd-sof-pci.fw_path="intel/sof") - -Tested-by: Péter Ujfalusi -Signed-off-by: Pierre-Louis Bossart -Reviewed-by: Bard Liao -Reviewed-by: Péter Ujfalusi -Link: https://lore.kernel.org/r/20211119231327.211946-1-pierre-louis.bossart@linux.intel.com -Signed-off-by: Mark Brown -Stable-dep-of: 7dd692217b86 ("ASoC: SOF: sof-pci-dev: Fix community key quirk detection") -Signed-off-by: Sasha Levin ---- - sound/soc/sof/sof-pci-dev.c | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c -index 3b4c011e02834..c1cd156996b43 100644 ---- a/sound/soc/sof/sof-pci-dev.c -+++ b/sound/soc/sof/sof-pci-dev.c -@@ -64,17 +64,9 @@ static const struct dmi_system_id sof_tplg_table[] = { - - static const struct dmi_system_id community_key_platforms[] = { - { -- .ident = "Up Squared", -+ .ident = "Up boards", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), -- DMI_MATCH(DMI_BOARD_NAME, "UP-APL01"), -- } -- }, -- { -- .ident = "Up Extreme", -- .matches = { -- DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), -- DMI_MATCH(DMI_BOARD_NAME, "UP-WHL01"), - } - }, - { --- -2.42.0 - diff --git a/queue-5.15/series b/queue-5.15/series index c39810aece3..5bd9cbcddcf 100644 --- 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-use-community-key-on-all-up-boa.patch-6898 asoc-sof-sof-pci-dev-add-parameter-to-override-topol.patch-4431 asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 asoc-sof-sof-pci-dev-fix-community-key-quirk-detecti.patch-6356