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>

diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
index 3c8b10e21ceb83087f3b1ee236bcd6b8c9d63557..4853f4f31786f82c8ff22c18d095dc4000b8329d 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -227,33 +227,6 @@ static const struct snd_soc_acpi_endpoint cs42l43_amp_spkagg_endpoints[] = {
        },
 };
 
-static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
-       { /* Jack Playback Endpoint */
-               .num = 0,
-               .aggregated = 0,
-               .group_position = 0,
-               .group_id = 0,
-       },
-       { /* DMIC Capture Endpoint */
-               .num = 1,
-               .aggregated = 0,
-               .group_position = 0,
-               .group_id = 0,
-       },
-       { /* Jack Capture Endpoint */
-               .num = 2,
-               .aggregated = 0,
-               .group_position = 0,
-               .group_id = 0,
-       },
-       { /* Speaker Playback Endpoint */
-               .num = 3,
-               .aggregated = 0,
-               .group_position = 0,
-               .group_id = 0,
-       },
-};
-
 static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {
        {
                .adr = 0x00023001fa424301ull,
@@ -305,15 +278,6 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_3amp_adr[] = {
        }
 };
 
-static const struct snd_soc_acpi_adr_device cs42l43_3_adr[] = {
-       {
-               .adr = 0x00033001FA424301ull,
-               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
-               .endpoints = cs42l43_endpoints,
-               .name_prefix = "cs42l43"
-       }
-};
-
 static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
        {
                .adr = 0x000030025D071101ull,
@@ -486,15 +450,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
        {}
 };
 
-static const struct snd_soc_acpi_link_adr ptl_cs42l43_l3[] = {
-       {
-               .mask = BIT(3),
-               .num_adr = ARRAY_SIZE(cs42l43_3_adr),
-               .adr_d = cs42l43_3_adr,
-       },
-       {}
-};
-
 static const struct snd_soc_acpi_link_adr ptl_rt721_l0[] = {
        {
                .mask = BIT(0),
@@ -712,13 +667,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
                .sof_tplg_filename = "sof-ptl-rt722.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
-       {
-               .link_mask = BIT(3),
-               .links = ptl_cs42l43_l3,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-ptl-cs42l43-l3.tplg",
-               .get_function_tplg_files = sof_sdw_get_tplg_files,
-       },
        {
                .link_mask = BIT(3),
                .links = ptl_sdw_rt712_vb_l3_rt1320_l3,