From: Syed Saba Kareem <syed.sabakareem@amd.com>
To: <broonie@kernel.org>
Cc: <Sunil-kumar.Dommati@amd.com>, <vijendar.mukunda@amd.com>,
<Mario.Limonciello@amd.com>, <venkataprasad.potturu@amd.com>,
"Syed Saba Kareem" <Syed.SabaKareem@amd.com>,
Siva Subramanian Ravi Saravanan <sravisar@amd.com>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, "Takashi Iwai" <tiwai@suse.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>,
"open list:AMD ASoC DRIVERS" <linux-sound@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 6/6] ASoC: amd: acp: enable function topologies for ACP7.F SoundWire
Date: Sun, 8 Nov 2026 00:57:02 +0530 [thread overview]
Message-ID: <20261107192744.2027264-7-syed.sabakareem@amd.com> (raw)
In-Reply-To: <20261107192744.2027264-1-syed.sabakareem@amd.com>
From: Syed Saba Kareem <Syed.SabaKareem@amd.com>
From: Siva Subramanian Ravi Saravanan <sravisar@amd.com>
Set get_function_tplg_files for all the ACP7.B and ACP7.F SoundWire
machine entries. The SOF core tries the function topologies first and
falls back to the monolithic topology if any of them is missing, so
existing setups keep working. The monolithic topology is still required
as its presence is checked when the SOF firmware file profile is set up.
Signed-off-by: Siva Subramanian Ravi Saravanan <sravisar@amd.com>
Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com>
---
sound/soc/amd/acp/amd-acp7x-acpi-match.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/sound/soc/amd/acp/amd-acp7x-acpi-match.c b/sound/soc/amd/acp/amd-acp7x-acpi-match.c
index 217b11f9dfc3..068b11400a41 100644
--- a/sound/soc/amd/acp/amd-acp7x-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp7x-acpi-match.c
@@ -8,6 +8,7 @@
#include <sound/soc-acpi.h>
#include "../mach-config.h"
+#include "amd-sof-function-topology-lib.h"
static const struct snd_soc_acpi_endpoint single_endpoint = {
.num = 0,
@@ -513,6 +514,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7b_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7b-rt721-l0-rt1320-l3.tplg",
.fw_filename = "sof-acp7b.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{},
};
@@ -525,6 +527,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-rt721-l0-rt1320-l3.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0) | BIT(1),
@@ -532,6 +535,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-rt721-l0-rt1320-l1.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0),
@@ -539,6 +543,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-rt721-l0.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0),
@@ -546,12 +551,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-rt722-l0.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
}, {
.link_mask = BIT(0) | BIT(1),
.links = acp7x_cs42l43_l0u0_cs35l56x4_l1u3210,
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l43-l0u0-cs35l56x4-l1u3210.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0) | BIT(1),
@@ -559,6 +566,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l45-l1u0-cs35l63x4-l0u0246.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0) | BIT(1),
@@ -566,6 +574,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l45-l0u0-cs35l63x2-l1u01.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0) | BIT(1),
@@ -573,6 +582,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l45-l0u0-cs35l63x2-l1u13.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0) | BIT(1),
@@ -580,6 +590,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l45-l1u0-cs35l63x2-l0u01.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(1),
@@ -587,6 +598,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l43-l1u0-cs35l56x4-l1u0123.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(1),
@@ -594,6 +606,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs35l56x4-l1u3210.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0),
@@ -601,6 +614,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l43-l0u1.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0),
@@ -608,6 +622,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l43b-l0u1.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(0),
@@ -615,6 +630,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l45-l0u0.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(1),
@@ -622,6 +638,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp7f_sof_sdw_machines[] = {
.drv_name = "amd_sof_sdw",
.sof_tplg_filename = "sof-acp7f-cs42l45-l1u0.tplg",
.fw_filename = "sof-acp7f.ri",
+ .get_function_tplg_files = amd_sof_sdw_get_tplg_files,
},
{},
};
--
2.43.0
prev parent reply other threads:[~2026-11-07 19:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20261107192744.2027264-1-syed.sabakareem@amd.com>
2026-11-07 19:26 ` [PATCH v2 1/6] ASoC: amd: acp: add Cirrus SoundWire configs for ACP7.F Syed Saba Kareem
2026-11-07 19:26 ` [PATCH v2 2/6] ASoC: amd: acp: add SoundWire speaker quirks for Dell platforms Syed Saba Kareem
2026-11-07 19:26 ` [PATCH v2 3/6] ASoC: soc-acpi: move common function topology helpers Syed Saba Kareem
2026-11-08 16:23 ` kernel test robot
2026-11-07 19:27 ` [PATCH v2 4/6] ASoC: amd: acp: add SOF function topology support Syed Saba Kareem
2026-11-07 19:27 ` [PATCH v2 5/6] ASoC: amd: acp: always append the DAI type to SoundWire DAI link names Syed Saba Kareem
2026-11-07 19:27 ` Syed Saba Kareem [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261107192744.2027264-7-syed.sabakareem@amd.com \
--to=syed.sabakareem@amd.com \
--cc=Mario.Limonciello@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.dev \
--cc=sravisar@amd.com \
--cc=tiwai@suse.com \
--cc=venkataprasad.potturu@amd.com \
--cc=vijendar.mukunda@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®