From: Greg Kroah-Hartman Date: Mon, 28 Aug 2023 07:17:47 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.4.13~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4b1f04a83dfedad886834d1bb48f30a0090788c;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: asoc-amd-vangogh-select-config_snd_amd_acp_config.patch --- diff --git a/queue-6.1/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch b/queue-6.1/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch new file mode 100644 index 00000000000..3479cac4686 --- /dev/null +++ b/queue-6.1/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch @@ -0,0 +1,34 @@ +From fd0a7ec379dbf21b7bfd81914381ae5281706ef5 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 5 Jun 2023 10:58:29 +0200 +Subject: ASoC: amd: vangogh: select CONFIG_SND_AMD_ACP_CONFIG + +From: Arnd Bergmann + +commit fd0a7ec379dbf21b7bfd81914381ae5281706ef5 upstream. + +The vangogh driver just gained a link time dependency that now causes +randconfig builds to fail: + +x86_64-linux-ld: sound/soc/amd/vangogh/pci-acp5x.o: in function `snd_acp5x_probe': +pci-acp5x.c:(.text+0xbb): undefined reference to `snd_amd_acp_find_config' + +Fixes: e89f45edb747e ("ASoC: amd: vangogh: Add check for acp config flags in vangogh platform") +Signed-off-by: Arnd Bergmann +Link: https://lore.kernel.org/r/20230605085839.2157268-1-arnd@kernel.org +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/amd/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/soc/amd/Kconfig ++++ b/sound/soc/amd/Kconfig +@@ -71,6 +71,7 @@ config SND_SOC_AMD_RENOIR_MACH + config SND_SOC_AMD_ACP5x + tristate "AMD Audio Coprocessor-v5.x I2S support" + depends on X86 && PCI ++ select SND_AMD_ACP_CONFIG + help + This option enables ACP v5.x support on AMD platform + diff --git a/queue-6.1/series b/queue-6.1/series index b9d4aa5ea49..6df339337cc 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -119,3 +119,4 @@ gpio-sim-dispose-of-irq-mappings-before-destroying-t.patch gpio-sim-pass-the-gpio-device-s-software-node-to-irq.patch asoc-amd-yc-fix-a-non-functional-mic-on-lenovo-82sj.patch maple_tree-disable-mas_wr_append-when-other-readers-.patch +asoc-amd-vangogh-select-config_snd_amd_acp_config.patch