From 807b68e856af8f3dd6d8b9708b2232a27cd1c4f7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 13 Feb 2024 15:47:58 +0100 Subject: [PATCH] 6.1-stable patches added patches: revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch --- ...d-new-dmi-entries-for-acp5x-platform.patch | 52 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 53 insertions(+) create mode 100644 queue-6.1/revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch diff --git a/queue-6.1/revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch b/queue-6.1/revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch new file mode 100644 index 00000000000..0dfb1493bc2 --- /dev/null +++ b/queue-6.1/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 +Date: Tue, 13 Feb 2024 15:44:48 +0100 +Subject: Revert "ASoC: amd: Add new dmi entries for acp5x platform" + +From: Greg Kroah-Hartman + +This reverts commit 48ad42cd95acc2da22b38497f22d53cb433863a1 which is +commit c3ab23a10771bbe06300e5374efa809789c65455 upstream. + +Link: https://lore.kernel.org/r/CAD_nV8BG0t7US=+C28kQOR==712MPfZ9m-fuKksgoZCgrEByCw@mail.gmail.com +Reported-by: Ted Chang +Cc: Takashi Iwai +Cc: Venkata Prasad Potturu +Cc: Mark Brown +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + 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 + // +@@ -33,19 +33,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.1/series b/queue-6.1/series index 50619e2624a..2a2f7abb567 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -56,3 +56,4 @@ hrtimer-report-offline-hrtimer-enqueue.patch input-i8042-fix-strange-behavior-of-touchpad-on-clevo-ns70pu.patch input-atkbd-skip-atkbd_cmd_setleds-when-skipping-atkbd_cmd_getid.patch io_uring-net-fix-sr-len-for-ioring_op_recv-with-msg_waitall-and-buffers.patch +revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch -- 2.47.3