ASoC: Intel: soc-acpi-intel-ptl-match: drop rt721 related match tables

Use functional topologies to support all RT721-related topology and
amplifier combinations,
e.g. sof-ptl-rt721.tplg, sof-ptl-rt721-l3-rt1320-l3.tplg.

If these entries are not removed, they will all use the sof-ptl-rt721.tplg.

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20260203100027.3741754-1-yung-chuan.liao@linux.intel.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 1055fb4838f612c0bed95e1e54d663360de02802..ddd919847c1f2a66b81ac6e2e245f0bc5085931e 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -356,33 +356,6 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group1_adr[] = {
        }
 };
 
-static const struct snd_soc_acpi_adr_device rt721_0_single_adr[] = {
-       {
-               .adr = 0x000030025d072101ull,
-               .num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
-               .endpoints = rt_mf_endpoints,
-               .name_prefix = "rt721"
-       }
-};
-
-static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = {
-       {
-               .adr = 0x000330025d072101ull,
-               .num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
-               .endpoints = rt_mf_endpoints,
-               .name_prefix = "rt721"
-       }
-};
-
-static const struct snd_soc_acpi_link_adr ptl_rt721_l3[] = {
-       {
-               .mask = BIT(3),
-               .num_adr = ARRAY_SIZE(rt721_3_single_adr),
-               .adr_d = rt721_3_single_adr,
-       },
-       {},
-};
-
 static const struct snd_soc_acpi_adr_device rt722_0_agg_adr[] = {
        {
                .adr = 0x000030025d072201ull,
@@ -506,15 +479,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
        {}
 };
 
-static const struct snd_soc_acpi_link_adr ptl_rt721_l0[] = {
-       {
-               .mask = BIT(0),
-               .num_adr = ARRAY_SIZE(rt721_0_single_adr),
-               .adr_d = rt721_0_single_adr,
-       },
-       {}
-};
-
 static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = {
        {
                .mask = BIT(0),
@@ -734,13 +698,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-ptl-rt711.tplg",
        },
-       {
-               .link_mask = BIT(0),
-               .links = ptl_rt721_l0,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-ptl-rt721.tplg",
-               .get_function_tplg_files = sof_sdw_get_tplg_files,
-       },
        {
                .link_mask = BIT(0),
                .links = ptl_rt722_only,
@@ -763,13 +720,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
                .sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l3.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
-       {
-               .link_mask = BIT(3),
-               .links = ptl_rt721_l3,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-ptl-rt721.tplg",
-               .get_function_tplg_files = sof_sdw_get_tplg_files,
-       },
        {
                .link_mask = BIT(3),
                .links = ptl_rt722_l3,