From: Greg Kroah-Hartman Date: Mon, 18 Dec 2023 11:46:46 +0000 (+0100) Subject: drop asoc patches for driver that was not in the 5.15 tree X-Git-Tag: v5.15.144~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=876afb01cdd34fa41ec51ca31fd9934fa82bd51d;p=thirdparty%2Fkernel%2Fstable-queue.git drop asoc patches for driver that was not in the 5.15 tree --- diff --git a/queue-5.15/add-dmi-id-for-msi-bravo-15-b7ed.patch b/queue-5.15/add-dmi-id-for-msi-bravo-15-b7ed.patch deleted file mode 100644 index 105b019cc1a..00000000000 --- a/queue-5.15/add-dmi-id-for-msi-bravo-15-b7ed.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 923e6733ba0c68c46050f934983b5573a11a3915 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 10 Sep 2023 13:54:34 -0500 -Subject: Add DMI ID for MSI Bravo 15 B7ED - -From: Walt Holman - -[ Upstream commit e616a916fe8431ebd5eb3cf4ac224d143c57083c ] - -Signed-off-by: Walt Holman -Link: https://lore.kernel.org/r/20230910185433.13677-1-waltholman09@gmail.com -Signed-off-by: Mark Brown -Stable-dep-of: b24e3590c94a ("ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA") -Signed-off-by: Sasha Levin ---- - sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c -index ef07c729174d0..7e102bd443c0c 100644 ---- a/sound/soc/amd/yc/acp6x-mach.c -+++ b/sound/soc/amd/yc/acp6x-mach.c -@@ -173,6 +173,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"), - } - }, -+ { -+ .driver_data = &acp6x_card, -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 B7ED"), -+ } -+ }, - { - .driver_data = &acp6x_card, - .matches = { --- -2.43.0 - diff --git a/queue-5.15/asoc-amd-add-yc-machine-driver-using-dmic.patch b/queue-5.15/asoc-amd-add-yc-machine-driver-using-dmic.patch deleted file mode 100644 index 3ec25392c46..00000000000 --- a/queue-5.15/asoc-amd-add-yc-machine-driver-using-dmic.patch +++ /dev/null @@ -1,224 +0,0 @@ -From 3d2324a12a523b58e2d93b60818a7dfbd37ad7dd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 18 Oct 2021 16:50:43 +0530 -Subject: ASoC: amd: add YC machine driver using dmic - -From: Vijendar Mukunda - -[ Upstream commit fa991481b8b22a7797a828135ce62a73791bbe39 ] - -Add Yellow Carp platform machine driver using dmic. - -Signed-off-by: Vijendar Mukunda -Link: https://lore.kernel.org/r/20211018112044.1705805-13-Vijendar.Mukunda@amd.com -Signed-off-by: Mark Brown -Stable-dep-of: b24e3590c94a ("ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA") -Signed-off-by: Sasha Levin ---- - sound/soc/amd/yc/acp6x-mach.c | 194 ++++++++++++++++++++++++++++++++++ - 1 file changed, 194 insertions(+) - create mode 100644 sound/soc/amd/yc/acp6x-mach.c - -diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c -new file mode 100644 -index 0000000000000..9a767f47b89f1 ---- /dev/null -+++ b/sound/soc/amd/yc/acp6x-mach.c -@@ -0,0 +1,194 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Machine driver for AMD Yellow Carp platform using DMIC -+ * -+ * Copyright 2021 Advanced Micro Devices, Inc. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "acp6x.h" -+ -+#define DRV_NAME "acp_yc_mach" -+ -+SND_SOC_DAILINK_DEF(acp6x_pdm, -+ DAILINK_COMP_ARRAY(COMP_CPU("acp_yc_pdm_dma.0"))); -+ -+SND_SOC_DAILINK_DEF(dmic_codec, -+ DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec.0", -+ "dmic-hifi"))); -+ -+SND_SOC_DAILINK_DEF(pdm_platform, -+ DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_yc_pdm_dma.0"))); -+ -+static struct snd_soc_dai_link acp6x_dai_pdm[] = { -+ { -+ .name = "acp6x-dmic-capture", -+ .stream_name = "DMIC capture", -+ .capture_only = 1, -+ SND_SOC_DAILINK_REG(acp6x_pdm, dmic_codec, pdm_platform), -+ }, -+}; -+ -+static struct snd_soc_card acp6x_card = { -+ .name = "acp6x", -+ .owner = THIS_MODULE, -+ .dai_link = acp6x_dai_pdm, -+ .num_links = 1, -+}; -+ -+static const struct dmi_system_id yc_acp_quirk_table[] = { -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21D2"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21D3"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21D4"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21D5"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CF"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CG"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CQ"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CR"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21AW"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21AX"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21BN"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21BQ"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CH"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CJ"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CK"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21CL"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21D8"), -+ } -+ }, -+ { -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "21D9"), -+ } -+ }, -+ {} -+}; -+ -+static int acp6x_probe(struct platform_device *pdev) -+{ -+ struct acp6x_pdm *machine = NULL; -+ struct snd_soc_card *card; -+ int ret; -+ const struct dmi_system_id *dmi_id; -+ -+ dmi_id = dmi_first_match(yc_acp_quirk_table); -+ if (!dmi_id) -+ return -ENODEV; -+ card = &acp6x_card; -+ acp6x_card.dev = &pdev->dev; -+ -+ platform_set_drvdata(pdev, card); -+ snd_soc_card_set_drvdata(card, machine); -+ ret = devm_snd_soc_register_card(&pdev->dev, card); -+ if (ret) { -+ return dev_err_probe(&pdev->dev, ret, -+ "snd_soc_register_card(%s) failed\n", -+ card->name); -+ } -+ return 0; -+} -+ -+static struct platform_driver acp6x_mach_driver = { -+ .driver = { -+ .name = "acp_yc_mach", -+ .pm = &snd_soc_pm_ops, -+ }, -+ .probe = acp6x_probe, -+}; -+ -+module_platform_driver(acp6x_mach_driver); -+ -+MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); -+MODULE_LICENSE("GPL v2"); -+MODULE_ALIAS("platform:" DRV_NAME); --- -2.43.0 - diff --git a/queue-5.15/asoc-amd-yc-add-alienware-m17-r5-amd-into-dmi-table.patch b/queue-5.15/asoc-amd-yc-add-alienware-m17-r5-amd-into-dmi-table.patch deleted file mode 100644 index eef07d5a320..00000000000 --- a/queue-5.15/asoc-amd-yc-add-alienware-m17-r5-amd-into-dmi-table.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 81fb4c42388b5db273a5e15c64af48a6cf542ece Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 24 Oct 2022 18:42:27 +0100 -Subject: ASoC: amd: yc: Add Alienware m17 R5 AMD into DMI table - -From: Brent Mendelsohn - -[ Upstream commit d40b6529c6269cd5afddb1116a383cab9f126694 ] - -This model requires an additional detection quirk to enable the -internal microphone - BIOS doesn't seem to support AcpDmicConnected -(nothing in acpidump output). - -Link: https://bugzilla.kernel.org/show_bug.cgi?id=216590 -Signed-off-by: Brent Mendelsohn -Reviewed-by: Mario Limonciello -Link: https://lore.kernel.org/r/20221024174227.4160-1-mendiebm@gmail.com -Signed-off-by: Mark Brown -Stable-dep-of: b24e3590c94a ("ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA") -Signed-off-by: Sasha Levin ---- - sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c -index 9a767f47b89f1..d4f2f130fa5c2 100644 ---- a/sound/soc/amd/yc/acp6x-mach.c -+++ b/sound/soc/amd/yc/acp6x-mach.c -@@ -152,6 +152,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "21D9"), - } - }, -+ { -+ .driver_data = &acp6x_card, -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Alienware"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"), -+ } -+ }, - {} - }; - --- -2.43.0 - diff --git a/queue-5.15/asoc-amd-yc-add-asus-m3402ra-into-dmi-table.patch b/queue-5.15/asoc-amd-yc-add-asus-m3402ra-into-dmi-table.patch deleted file mode 100644 index 678f25f3d5e..00000000000 --- a/queue-5.15/asoc-amd-yc-add-asus-m3402ra-into-dmi-table.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 984d213fa8eab8cded29cb3539c79369e71bdf84 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Apr 2023 21:16:45 +0200 -Subject: ASoC: amd: yc: Add ASUS M3402RA into DMI table - -From: Enrico Belleri - -[ Upstream commit 110ccfa9dd6ca1272e50fbea614aa31f01d2c17e ] - -Fix builtin microphone on ASUS Vivobook S 14 OLED 2022 (M3402RA) - -Same issue with this model as apparently with other Rembrandt laptops: https://bugzilla.kernel.org/show_bug.cgi?id=216270 - -Signed-off-by: Enrico Belleri -Link: https://lore.kernel.org/r/20230427191645.24519-1-kilgore.trout@idesmi.eu -Signed-off-by: Mark Brown -Stable-dep-of: b24e3590c94a ("ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA") -Signed-off-by: Sasha Levin ---- - sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c -index 387d228369d43..441b77d00f919 100644 ---- a/sound/soc/amd/yc/acp6x-mach.c -+++ b/sound/soc/amd/yc/acp6x-mach.c -@@ -159,6 +159,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "M5402RA"), - } - }, -+ { -+ .driver_data = &acp6x_card, -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "M3402RA"), -+ } -+ }, - { - .driver_data = &acp6x_card, - .matches = { --- -2.43.0 - diff --git a/queue-5.15/asoc-amd-yc-add-asus-m5402ra-into-dmi-table.patch b/queue-5.15/asoc-amd-yc-add-asus-m5402ra-into-dmi-table.patch deleted file mode 100644 index 1f2f1ba8a50..00000000000 --- a/queue-5.15/asoc-amd-yc-add-asus-m5402ra-into-dmi-table.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 29b6432b94af560ad306cc18b46a02ec2fadd957 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 27 Dec 2022 23:49:32 +0100 -Subject: ASoC: amd: yc: Add ASUS M5402RA into DMI table -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Aniol Martí - -[ Upstream commit a0dd7fcab5cd221fa960f594c586e1f9f16c02c0 ] - -ASUS VivoBook 13 OLED (M5402RA) needs this quirk to get the built-in microphone working properly. - -Signed-off-by: Aniol Martí -Link: https://lore.kernel.org/r/20221227224932.9771-1-aniol@aniolmarti.cat -Signed-off-by: Mark Brown -Stable-dep-of: b24e3590c94a ("ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA") -Signed-off-by: Sasha Levin ---- - sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c -index d4f2f130fa5c2..387d228369d43 100644 ---- a/sound/soc/amd/yc/acp6x-mach.c -+++ b/sound/soc/amd/yc/acp6x-mach.c -@@ -152,6 +152,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "21D9"), - } - }, -+ { -+ .driver_data = &acp6x_card, -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "M5402RA"), -+ } -+ }, - { - .driver_data = &acp6x_card, - .matches = { --- -2.43.0 - diff --git a/queue-5.15/asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-a.patch b/queue-5.15/asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-a.patch deleted file mode 100644 index 90458613cc3..00000000000 --- a/queue-5.15/asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-a.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9a6e635caa4b3c2c87d2f1fbb79c61284cbad0f9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 18 Aug 2023 18:14:16 -0300 -Subject: ASoC: amd: yc: Add VivoBook Pro 15 to quirks list for acp6x - -From: BrenoRCBrito - -[ Upstream commit 3b1f08833c45d0167741e4097b0150e7cf086102 ] - -VivoBook Pro 15 Ryzen Edition uses Ryzen 6800H processor, and adding to - quirks list for acp6x will enable internal mic. - -Signed-off-by: BrenoRCBrito -Link: https://lore.kernel.org/r/20230818211417.32167-1-brenorcbrito@gmail.com -Signed-off-by: Mark Brown -Stable-dep-of: b24e3590c94a ("ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA") -Signed-off-by: Sasha Levin ---- - sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c -index 441b77d00f919..ef07c729174d0 100644 ---- a/sound/soc/amd/yc/acp6x-mach.c -+++ b/sound/soc/amd/yc/acp6x-mach.c -@@ -166,6 +166,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "M3402RA"), - } - }, -+ { -+ .driver_data = &acp6x_card, -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"), -+ } -+ }, - { - .driver_data = &acp6x_card, - .matches = { --- -2.43.0 - diff --git a/queue-5.15/asoc-amd-yc-fix-non-functional-mic-on-asus-e1504fa.patch b/queue-5.15/asoc-amd-yc-fix-non-functional-mic-on-asus-e1504fa.patch deleted file mode 100644 index 8f2a5c658be..00000000000 --- a/queue-5.15/asoc-amd-yc-fix-non-functional-mic-on-asus-e1504fa.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6015931d641e62aff526e7315a36de012c651df7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 27 Nov 2023 20:36:00 +0000 -Subject: ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA - -From: Malcolm Hart - -[ Upstream commit b24e3590c94ab0aba6e455996b502a83baa5c31c ] - -This patch adds ASUSTeK COMPUTER INC "E1504FA" to the quirks file acp6x-mach.c -to enable microphone array on ASUS Vivobook GO 15. -I have this laptop and can confirm that the patch succeeds in enabling the -microphone array. - -Signed-off-by: Malcolm Hart -Cc: stable@vger.kernel.org -Rule: add -Link: https://lore.kernel.org/stable/875y1nt1bx.fsf%405harts.com -Link: https://lore.kernel.org/r/871qcbszh0.fsf@5harts.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c -index 7e102bd443c0c..b59d3a204c598 100644 ---- a/sound/soc/amd/yc/acp6x-mach.c -+++ b/sound/soc/amd/yc/acp6x-mach.c -@@ -173,6 +173,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"), - } - }, -+ { -+ .driver_data = &acp6x_card, -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "E1504FA"), -+ } -+ }, - { - .driver_data = &acp6x_card, - .matches = { --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 5781167128f..3b006cfcec0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -5,13 +5,6 @@ r8152-add-vendor-device-id-pair-for-asus-usb-c2500.patch vfs-plumb-i_version-handling-into-struct-kstat.patch ima-use-vfs_getattr_nosec-to-get-the-i_version.patch netfilter-nf_tables-fix-exist-matching-on-bigendian-.patch -asoc-amd-add-yc-machine-driver-using-dmic.patch -asoc-amd-yc-add-alienware-m17-r5-amd-into-dmi-table.patch -asoc-amd-yc-add-asus-m5402ra-into-dmi-table.patch -asoc-amd-yc-add-asus-m3402ra-into-dmi-table.patch -asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-a.patch -add-dmi-id-for-msi-bravo-15-b7ed.patch -asoc-amd-yc-fix-non-functional-mic-on-asus-e1504fa.patch mm-memory_hotplug-handle-memblock_add_node-failures-.patch memblock-allow-to-specify-flags-with-memblock_add_no.patch mips-loongson64-handle-more-memory-types-passed-from.patch