aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/sof/topology.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-08-08 13:28:53 +0100
committerMark Brown <broonie@kernel.org>2023-08-08 13:28:53 +0100
commit442ece6b3473157a5680aa156be7bd776ff7e378 (patch)
tree515c7bff7d50fefb0dcc7fd3b386f65e8af2ba1c /sound/soc/sof/topology.c
parentASoC: SOF: ipc3-dtrace: Switch to memdup_user_nul() helper (diff)
parentASoC: SOF: Intel: hda-mlink: add sublink to dev_dbg() log (diff)
downloadwireguard-linux-442ece6b3473157a5680aa156be7bd776ff7e378.tar.xz
wireguard-linux-442ece6b3473157a5680aa156be7bd776ff7e378.zip
ASoC: SOF: Intel: add LunarLake support
Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: This patchset first fixes a number of errors made in the hda-mlink support, then adds Lunar Lake definitions. The main contribution is the hda-dai changes where the HDaudio DMA is now used for SSP, DMIC and SoundWire. In previous hardware the GPDMA (aka DesignWare) was used and controlled by the audio firmware. The volume of code is minimized with the abstraction added in previous kernel cycles. Due to cross-dependencies between ASoC and SoundWire trees, the full support for jack detection will be deferred to the next kernel cycle. There's not much point to ask for a sync of the two trees to support one patch for each tree - we are at -rc5 already.
Diffstat (limited to 'sound/soc/sof/topology.c')
-rw-r--r--sound/soc/sof/topology.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 3866dd3cba69..be63ba06762f 100644
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -2158,6 +2158,8 @@ static int sof_complete(struct snd_soc_component *scomp)
struct snd_sof_widget *pipe_widget = spipe->pipe_widget;
struct snd_sof_widget *swidget;
+ pipe_widget->instance_id = -EINVAL;
+
/* Update the scheduler widget's IPC structure */
if (widget_ops && widget_ops[pipe_widget->id].ipc_setup) {
ret = widget_ops[pipe_widget->id].ipc_setup(pipe_widget);