ASoC: Intel: soc-acpi-intel-ptl-match: Remove unnecessary cs42l43 match

For PTL onwards Cirrus are intending to rely on function topologies,
rather than using a match table for each system type. Remove this
unnecessary match table entry. Having the match entries can
mean that systems match when they should use function topologies
instead, resulting in incorrect audio configurations. Although,
admittedly this is not too likely with this 6x amp configuration
as those are quite rare, but best to follow best practice.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20260520163631.3300102-3-ckeepax@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 c6bf70e393975fa7d7c1398621f88729d4481617..f7694b2a2b02e8bfe689e3f4938e30bf546db8b7 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -92,48 +92,6 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
        .group_id = 1,
 };
 
-static const struct snd_soc_acpi_endpoint spk_1_endpoint = {
-       .num = 0,
-       .aggregated = 1,
-       .group_position = 1,
-       .group_id = 1,
-};
-
-static const struct snd_soc_acpi_endpoint spk_2_endpoint = {
-       .num = 0,
-       .aggregated = 1,
-       .group_position = 2,
-       .group_id = 1,
-};
-
-static const struct snd_soc_acpi_endpoint spk_3_endpoint = {
-       .num = 0,
-       .aggregated = 1,
-       .group_position = 3,
-       .group_id = 1,
-};
-
-static const struct snd_soc_acpi_endpoint spk_4_endpoint = {
-       .num = 0,
-       .aggregated = 1,
-       .group_position = 4,
-       .group_id = 1,
-};
-
-static const struct snd_soc_acpi_endpoint spk_5_endpoint = {
-       .num = 0,
-       .aggregated = 1,
-       .group_position = 5,
-       .group_id = 1,
-};
-
-static const struct snd_soc_acpi_endpoint spk_6_endpoint = {
-       .num = 0,
-       .aggregated = 1,
-       .group_position = 6,
-       .group_id = 1,
-};
-
 static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
        /* Jack Endpoint */
        {
@@ -202,15 +160,6 @@ static const struct snd_soc_acpi_endpoint cs42l43_amp_spkagg_endpoints[] = {
        },
 };
 
-static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {
-       {
-               .adr = 0x00023001fa424301ull,
-               .num_endpoints = ARRAY_SIZE(cs42l43_amp_spkagg_endpoints),
-               .endpoints = cs42l43_amp_spkagg_endpoints,
-               .name_prefix = "cs42l43"
-       }
-};
-
 static const struct snd_soc_acpi_adr_device cs42l43_3_agg_adr[] = {
        {
                .adr = 0x00033001FA424301ull,
@@ -235,48 +184,6 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_lr_adr[] = {
        }
 };
 
-static const struct snd_soc_acpi_adr_device cs35l56_1_3amp_adr[] = {
-       {
-               .adr = 0x00013001fa355601ull,
-               .num_endpoints = 1,
-               .endpoints = &spk_1_endpoint,
-               .name_prefix = "AMP1"
-       },
-       {
-               .adr = 0x00013101fa355601ull,
-               .num_endpoints = 1,
-               .endpoints = &spk_2_endpoint,
-               .name_prefix = "AMP2"
-       },
-       {
-               .adr = 0x00013201fa355601ull,
-               .num_endpoints = 1,
-               .endpoints = &spk_3_endpoint,
-               .name_prefix = "AMP3"
-       }
-};
-
-static const struct snd_soc_acpi_adr_device cs35l56_3_3amp_adr[] = {
-       {
-               .adr = 0x00033301fa355601ull,
-               .num_endpoints = 1,
-               .endpoints = &spk_4_endpoint,
-               .name_prefix = "AMP4"
-       },
-       {
-               .adr = 0x00033401fa355601ull,
-               .num_endpoints = 1,
-               .endpoints = &spk_5_endpoint,
-               .name_prefix = "AMP5"
-       },
-       {
-               .adr = 0x00033501fa355601ull,
-               .num_endpoints = 1,
-               .endpoints = &spk_6_endpoint,
-               .name_prefix = "AMP6"
-       }
-};
-
 static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
        {
                .adr = 0x000030025D071101ull,
@@ -408,25 +315,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_agg_l3_cs35l56_l2[] = {
        {}
 };
 
-static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
-       {
-               .mask = BIT(2),
-               .num_adr = ARRAY_SIZE(cs42l43_2_adr),
-               .adr_d = cs42l43_2_adr,
-       },
-       {
-               .mask = BIT(1),
-               .num_adr = ARRAY_SIZE(cs35l56_1_3amp_adr),
-               .adr_d = cs35l56_1_3amp_adr,
-       },
-       {
-               .mask = BIT(3),
-               .num_adr = ARRAY_SIZE(cs35l56_3_3amp_adr),
-               .adr_d = cs35l56_3_3amp_adr,
-       },
-       {}
-};
-
 static const struct snd_soc_acpi_link_adr ptl_rt722_l0_rt1320_l23[] = {
        {
                .mask = BIT(0),
@@ -599,12 +487,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
                .sof_tplg_filename = "sof-ptl-rt713-l3-rt1320-l1.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
-       {
-               .link_mask = BIT(1) | BIT(2) | BIT(3),
-               .links = ptl_cs42l43_l2_cs35l56x6_l13,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-ptl-cs42l43-l2-cs35l56x6-l13.tplg",
-       },
        {
                .link_mask = BIT(0) | BIT(2) | BIT(3),
                .links = ptl_rt722_l0_rt1320_l23,