Skip to content

Commit 3bcdbc2

Browse files
simontrimmerbroonie
authored andcommitted
ASoC: Intel: soc-acpi-intel-ptl-match: Remove cs42l43 match from sdw link3
Removing this match entry ensures that a PTL system comprising of a cs42l43 codec on link3 will use function topologies. Previously the behaviour would be use the monolithic topology associated with this codec match table entry in preference to function topologies and if the system had a number of smart amplifiers then they would not be instantiated. Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> Link: https://patch.msgid.link/20251016112601.187020-1-simont@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent bf6fb4a commit 3bcdbc2

File tree

1 file changed

+0
-52
lines changed

1 file changed

+0
-52
lines changed

sound/soc/intel/common/soc-acpi-intel-ptl-match.c

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -227,33 +227,6 @@ static const struct snd_soc_acpi_endpoint cs42l43_amp_spkagg_endpoints[] = {
227227
},
228228
};
229229

230-
static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
231-
{ /* Jack Playback Endpoint */
232-
.num = 0,
233-
.aggregated = 0,
234-
.group_position = 0,
235-
.group_id = 0,
236-
},
237-
{ /* DMIC Capture Endpoint */
238-
.num = 1,
239-
.aggregated = 0,
240-
.group_position = 0,
241-
.group_id = 0,
242-
},
243-
{ /* Jack Capture Endpoint */
244-
.num = 2,
245-
.aggregated = 0,
246-
.group_position = 0,
247-
.group_id = 0,
248-
},
249-
{ /* Speaker Playback Endpoint */
250-
.num = 3,
251-
.aggregated = 0,
252-
.group_position = 0,
253-
.group_id = 0,
254-
},
255-
};
256-
257230
static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {
258231
{
259232
.adr = 0x00023001fa424301ull,
@@ -305,15 +278,6 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_3amp_adr[] = {
305278
}
306279
};
307280

308-
static const struct snd_soc_acpi_adr_device cs42l43_3_adr[] = {
309-
{
310-
.adr = 0x00033001FA424301ull,
311-
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
312-
.endpoints = cs42l43_endpoints,
313-
.name_prefix = "cs42l43"
314-
}
315-
};
316-
317281
static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
318282
{
319283
.adr = 0x000030025D071101ull,
@@ -486,15 +450,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
486450
{}
487451
};
488452

489-
static const struct snd_soc_acpi_link_adr ptl_cs42l43_l3[] = {
490-
{
491-
.mask = BIT(3),
492-
.num_adr = ARRAY_SIZE(cs42l43_3_adr),
493-
.adr_d = cs42l43_3_adr,
494-
},
495-
{}
496-
};
497-
498453
static const struct snd_soc_acpi_link_adr ptl_rt721_l0[] = {
499454
{
500455
.mask = BIT(0),
@@ -712,13 +667,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
712667
.sof_tplg_filename = "sof-ptl-rt722.tplg",
713668
.get_function_tplg_files = sof_sdw_get_tplg_files,
714669
},
715-
{
716-
.link_mask = BIT(3),
717-
.links = ptl_cs42l43_l3,
718-
.drv_name = "sof_sdw",
719-
.sof_tplg_filename = "sof-ptl-cs42l43-l3.tplg",
720-
.get_function_tplg_files = sof_sdw_get_tplg_files,
721-
},
722670
{
723671
.link_mask = BIT(3),
724672
.links = ptl_sdw_rt712_vb_l3_rt1320_l3,

0 commit comments

Comments
 (0)