Skip to contentSkip to conversation

ASoC: Intel: soc-acpi: use dummy topology for SN624x

PATCH In review Qianghua Wang 3 participants 3 messages Nov 3 – Nov 4

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Intel: soc-acpi: use dummy topology for SN624x

The SN624x SoundWire entries in the MTL, ARL, LNL and PTL match tables point at sof-<platform>-sn624x.tplg. Those monolithic topologies are not shipped in sof-bin, so the SOF probe fails with a missing topology on any system that does not carry the out-of-tree files.

The SN624x jack, amp and mic DAIs map onto the generic SDCA function topologies (sof-sdca-jack, sof-sdca-1amp, sof-sdca-mic) and the HDMI fragments. Use sof-<platform>-dummy.tplg so the card is always built from function topologies and no monolithic topology is needed.

Tested on a Wildcat Lake (PTL match table) laptop with SN6244, with sof-ptl-sn624x.tplg removed: the card probes with sof-sdca-jack-id0, sof-sdca-1amp-id2, sof-sdca-mic-id4 and sof-hdmi-pcm5-id5. Speaker, headset, DMIC and HDMI playback/capture work.

Fixes 32f9c551a91a ("ASoC: Intel: soc-acpi: add SN624x entries for ARL/LNL/MTL/PTL")
---
 sound/soc/intel/common/soc-acpi-intel-arl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
sound/soc/intel/common/soc-acpi-intel-arl-match.c +2 -2
index 310c4b77c..1d5f6677b 100644
@@ -769,14 +769,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
 		.link_mask = BIT(0),
 		.links = arl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-arl-sn624x.tplg",
+		.sof_tplg_filename = "sof-arl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(0),
 		.links = arl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-arl-sn624x.tplg",
+		.sof_tplg_filename = "sof-arl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{},
sound/soc/intel/common/soc-acpi-intel-lnl-match.c +2 -2
index cbf79eb2e..a9fef394f 100644
@@ -867,14 +867,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
 		.link_mask = BIT(0),
 		.links = lnl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-lnl-sn624x.tplg",
+		.sof_tplg_filename = "sof-lnl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(0),
 		.links = lnl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-lnl-sn624x.tplg",
+		.sof_tplg_filename = "sof-lnl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{},
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +2 -2
index e89c5cfd6..704b4e0d2 100644
@@ -1564,14 +1564,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
 		.link_mask = BIT(0),
 		.links = mtl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-mtl-sn624x.tplg",
+		.sof_tplg_filename = "sof-mtl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(0),
 		.links = mtl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-mtl-sn624x.tplg",
+		.sof_tplg_filename = "sof-mtl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{},
sound/soc/intel/common/soc-acpi-intel-ptl-match.c +3 -3
index 0ce51c44b..a5896796a 100644
@@ -599,21 +599,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-ptl-sn624x.tplg",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-ptl-sn624x.tplg",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6247,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-ptl-sn624x.tplg",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{},
Signature · 1 line
2.53.0
Reviewed-by Bard Liao on v1 1/1
#1 lore raw
Quoted 29 lines

-----Original Message-----
From: Qianghua Wang <[email protected]>
Sent: Tuesday, November 3, 2026 2:41 PM
To: [email protected]
Cc: Rojewski, Cezary <[email protected]>; Liam Girdwood <[email protected]>; Peter Ujfalusi <[email protected]>; Bard Liao <[email protected]>; Pierre-Louis Bossart <[email protected]>; Mark Brown <[email protected]>; [email protected]; Qianghua Wang <[email protected]>
Subject: [PATCH] ASoC: Intel: soc-acpi: use dummy topology for SN624x

The SN624x SoundWire entries in the MTL, ARL, LNL and PTL match tables point at sof-<platform>-sn624x.tplg. Those monolithic topologies are not shipped in sof-bin, so the SOF probe fails with a missing topology on any system that does not carry the out-of-tree files.

The SN624x jack, amp and mic DAIs map onto the generic SDCA function topologies (sof-sdca-jack, sof-sdca-1amp, sof-sdca-mic) and the HDMI fragments. Use sof-<platform>-dummy.tplg so the card is always built from function topologies and no monolithic topology is needed.

Tested on a Wildcat Lake (PTL match table) laptop with SN6244, with sof-ptl-sn624x.tplg removed: the card probes with sof-sdca-jack-id0, sof-sdca-1amp-id2, sof-sdca-mic-id4 and sof-hdmi-pcm5-id5. Speaker, headset, DMIC and HDMI playback/capture work.

Quoted 5 lines
Fixes 32f9c551a91a ("ASoC: Intel: soc-acpi: add SN624x entries for

ARL/LNL/MTL/PTL")

Thanks for the patch and it is the direction we are inclined towards.

Quoted 110 lines
---
 sound/soc/intel/common/soc-acpi-intel-arl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 4 ++--
 sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
sound/soc/intel/common/soc-acpi-intel-arl-match.c +2 -2
index 310c4b77c..1d5f6677b 100644
@@ -769,14 +769,14 @@ struct snd_soc_acpi_mach
 snd_soc_acpi_intel_arl_sdw_machines[] = {
 		.link_mask = BIT(0),
 		.links = arl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-arl-sn624x.tplg",
+		.sof_tplg_filename = "sof-arl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(0),
 		.links = arl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-arl-sn624x.tplg",
+		.sof_tplg_filename = "sof-arl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
sound/soc/intel/common/soc-acpi-intel-arl-match.c +0 -0
 	{},
sound/soc/intel/common/soc-acpi-intel-lnl-match.c +2 -2
index cbf79eb2e..a9fef394f 100644
@@ -867,14 +867,14 @@ struct snd_soc_acpi_mach
 snd_soc_acpi_intel_lnl_sdw_machines[] = {
 		.link_mask = BIT(0),
 		.links = lnl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-lnl-sn624x.tplg",
+		.sof_tplg_filename = "sof-lnl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(0),
 		.links = lnl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-lnl-sn624x.tplg",
+		.sof_tplg_filename = "sof-lnl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
sound/soc/intel/common/soc-acpi-intel-lnl-match.c +0 -0
 	{},
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +2 -2
index e89c5cfd6..704b4e0d2 100644
@@ -1564,14 +1564,14 @@ struct snd_soc_acpi_mach
 snd_soc_acpi_intel_mtl_sdw_machines[] = {
 		.link_mask = BIT(0),
 		.links = mtl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-mtl-sn624x.tplg",
+		.sof_tplg_filename = "sof-mtl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(0),
 		.links = mtl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-mtl-sn624x.tplg",
+		.sof_tplg_filename = "sof-mtl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +0 -0
 	{},
sound/soc/intel/common/soc-acpi-intel-ptl-match.c +3 -3
index 0ce51c44b..a5896796a 100644
@@ -599,21 +599,21 @@ struct snd_soc_acpi_mach
 snd_soc_acpi_intel_ptl_sdw_machines[] = {
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6242,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-ptl-sn624x.tplg",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6244,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-ptl-sn624x.tplg",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},
 	{
 		.link_mask = BIT(3),
 		.links = ptl_link_sn6247,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-ptl-sn624x.tplg",
+		.sof_tplg_filename = "sof-ptl-dummy.tplg",
 		.get_function_tplg_files = sof_sdw_get_tplg_files,
 	},

{},
--
2.53.0

maintainer
#2 lore raw
In reply to Qianghua Wang
Quoted 1 line · Qianghua Wang

ASoC: Intel: soc-acpi: use dummy topology for SN624x

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.4

Thanks!

[1/1] ASoC: Intel: soc-acpi: use dummy topology for SN624x

      https://git.kernel.org/broonie/sound/c/97d5fbab9e62

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark