From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 13 Feb 2024 14:48:18 +0000 (+0100)
Subject: 6.7-stable patches
X-Git-Tag: v6.1.78~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6349fb4bb18f0495031e38a62291cb483cf674f3;p=thirdparty%2Fkernel%2Fstable-queue.git

6.7-stable patches

added patches:
	revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch
---

diff --git a/queue-6.7/revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch b/queue-6.7/revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch
new file mode 100644
index 00000000000..30e2dc08947
--- /dev/null
+++ b/queue-6.7/revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch
@@ -0,0 +1,52 @@
+From 3641e5cbd92833a95987e8bc5a47f7bdab1f539d Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 13 Feb 2024 15:44:48 +0100
+Subject: Revert "ASoC: amd: Add new dmi entries for acp5x platform"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 4b6986b170f2f23e390bbd2d50784caa9cb67093 which is
+commit c3ab23a10771bbe06300e5374efa809789c65455 upstream.
+
+Link: https://lore.kernel.org/r/CAD_nV8BG0t7US=+C28kQOR==712MPfZ9m-fuKksgoZCgrEByCw@mail.gmail.com
+Reported-by: Ted Chang <tedchang2010@gmail.com>
+Cc: Takashi Iwai <tiwai@suse.de>
+Cc: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>
+Cc: Mark Brown <broonie@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/amd/acp-config.c |   15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+--- a/sound/soc/amd/acp-config.c
++++ b/sound/soc/amd/acp-config.c
+@@ -3,7 +3,7 @@
+ // This file is provided under a dual BSD/GPLv2 license. When using or
+ // redistributing this file, you may do so under either license.
+ //
+-// Copyright(c) 2021, 2023 Advanced Micro Devices, Inc.
++// Copyright(c) 2021 Advanced Micro Devices, Inc.
+ //
+ // Authors: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
+ //
+@@ -45,19 +45,6 @@ static const struct config_entry config_
+ 				},
+ 			},
+ 			{}
+-		},
+-	},
+-	{
+-		.flags = FLAG_AMD_LEGACY,
+-		.device = ACP_PCI_DEV_ID,
+-		.dmi_table = (const struct dmi_system_id []) {
+-			{
+-				.matches = {
+-					DMI_MATCH(DMI_SYS_VENDOR, "Valve"),
+-					DMI_MATCH(DMI_PRODUCT_NAME, "Jupiter"),
+-				},
+-			},
+-			{}
+ 		},
+ 	},
+ 	{
diff --git a/queue-6.7/series b/queue-6.7/series
index c011cbb2a91..debfcfe92a5 100644
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -118,3 +118,4 @@ bcachefs-grab-s_umount-only-if-snapshotting.patch
 bcachefs-fix-incorrect-usage-of-req_op_flush.patch
 bcachefs-unlock-parent-dir-if-entry-is-not-found-in-subvolume-deletion.patch
 bcachefs-time_stats-check-for-last_event-0-when-updating-freq-stats.patch
+revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch