From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 13 May 2024 09:39:49 +0000 (+0200)
Subject: Merge tag 'asoc-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3a07362fab1653d3aca31a9155c8cc776138fd02;p=linux.git

Merge tag 'asoc-v6.10' of https://git./linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v6.10

This is a very big update, in large part due to extensive work the Intel
people have been doing in their drivers though it's also been busy
elsewhere.  There's also a big overhaul of the DAPM documentation from
Luca Ceresoli arising from the work he did putting together his recent
ELC talk, and he also contributed a new tool for visualising the DAPM
state.

 - A new tool dapm-graph for visualising the DAPM state.
 - Substantial fixes and clarifications for the DAPM documentation.
 - Very large updates throughout the Intel audio drivers.
 - Cleanups of accessors for driver data, module labelling, and for
   constification.
 - Modernsation and cleanup work in the Mediatek drivers.
 - Several fixes and features for the DaVinci I2S driver.
 - New drivers for several AMD and Intel platforms, Nuvoton NAU8325,
   Rockchip RK3308 and Texas Instruments PCM6240.
---

3a07362fab1653d3aca31a9155c8cc776138fd02
diff --cc sound/soc/sof/amd/Makefile
index 5f2eca283690b,380a9769c3213..701d578d63b21
--- a/sound/soc/sof/amd/Makefile
+++ b/sound/soc/sof/amd/Makefile
@@@ -4,15 -4,15 +4,15 @@@
  #
  # Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. All rights reserved.
  
- snd-sof-amd-acp-objs := acp.o acp-loader.o acp-ipc.o acp-pcm.o acp-stream.o acp-trace.o acp-common.o
+ snd-sof-amd-acp-y := acp.o acp-loader.o acp-ipc.o acp-pcm.o acp-stream.o acp-trace.o acp-common.o
  snd-sof-amd-acp-$(CONFIG_SND_SOC_SOF_ACP_PROBES) = acp-probes.o
- snd-sof-amd-renoir-objs := pci-rn.o renoir.o
- snd-sof-amd-rembrandt-objs := pci-rmb.o rembrandt.o
- snd-sof-amd-vangogh-objs := pci-vangogh.o vangogh.o
- snd-sof-amd-acp63-objs := pci-acp63.o acp63.o
+ snd-sof-amd-renoir-y := pci-rn.o renoir.o
+ snd-sof-amd-rembrandt-y := pci-rmb.o rembrandt.o
+ snd-sof-amd-vangogh-y := pci-vangogh.o vangogh.o
+ snd-sof-amd-acp63-y := pci-acp63.o acp63.o
  
  obj-$(CONFIG_SND_SOC_SOF_AMD_COMMON) += snd-sof-amd-acp.o
 -obj-$(CONFIG_SND_SOC_SOF_AMD_RENOIR) +=snd-sof-amd-renoir.o
 -obj-$(CONFIG_SND_SOC_SOF_AMD_REMBRANDT) +=snd-sof-amd-rembrandt.o
 -obj-$(CONFIG_SND_SOC_SOF_AMD_VANGOGH) +=snd-sof-amd-vangogh.o
 -obj-$(CONFIG_SND_SOC_SOF_AMD_ACP63) +=snd-sof-amd-acp63.o
 +obj-$(CONFIG_SND_SOC_SOF_AMD_RENOIR) += snd-sof-amd-renoir.o
 +obj-$(CONFIG_SND_SOC_SOF_AMD_REMBRANDT) += snd-sof-amd-rembrandt.o
 +obj-$(CONFIG_SND_SOC_SOF_AMD_VANGOGH) += snd-sof-amd-vangogh.o
 +obj-$(CONFIG_SND_SOC_SOF_AMD_ACP63) += snd-sof-amd-acp63.o