ASoC: Intel: soc-acpi-intel-ptl-match: drop rt722 monolithic match tables

Use functional topologies to support RT722 topologies with/without
amplifiers,
e.g. sof-ptl-rt722.tplg, sof-ptl-rt722-rt1320.tplg...

If these entries are not removed, they will find the first same link of
sof-ptl-rt722.tplg.

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Co-developed-by: Derek Fang <derek.fang@realtek.com>
Signed-off-by: Derek Fang <derek.fang@realtek.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20260326075303.1083567-2-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 ddd919847c1f2a66b81ac6e2e245f0bc5085931e..3b7818355ff645392a53105cc2709459ad9f33a2 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c
@@ -134,31 +134,6 @@ static const struct snd_soc_acpi_endpoint spk_6_endpoint = {
        .group_id = 1,
 };
 
-/*
- * Multi-function codecs with three endpoints created for
- * headset, amp and dmic functions.
- */
-static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = {
-       {
-               .num = 0,
-               .aggregated = 0,
-               .group_position = 0,
-               .group_id = 0,
-       },
-       {
-               .num = 1,
-               .aggregated = 0,
-               .group_position = 0,
-               .group_id = 0,
-       },
-       {
-               .num = 2,
-               .aggregated = 0,
-               .group_position = 0,
-               .group_id = 0,
-       },
-};
-
 static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
        /* Jack Endpoint */
        {
@@ -365,33 +340,6 @@ static const struct snd_soc_acpi_adr_device rt722_0_agg_adr[] = {
        }
 };
 
-static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {
-       {
-               .adr = 0x000030025d072201ull,
-               .num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
-               .endpoints = rt_mf_endpoints,
-               .name_prefix = "rt722"
-       }
-};
-
-static const struct snd_soc_acpi_adr_device rt722_1_single_adr[] = {
-       {
-               .adr = 0x000130025d072201ull,
-               .num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
-               .endpoints = rt_mf_endpoints,
-               .name_prefix = "rt722"
-       }
-};
-
-static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = {
-       {
-               .adr = 0x000330025d072201ull,
-               .num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
-               .endpoints = rt_mf_endpoints,
-               .name_prefix = "rt722"
-       }
-};
-
 static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = {
        {
                .adr = 0x000130025D132001ull,
@@ -479,33 +427,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
        {}
 };
 
-static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = {
-       {
-               .mask = BIT(0),
-               .num_adr = ARRAY_SIZE(rt722_0_single_adr),
-               .adr_d = rt722_0_single_adr,
-       },
-       {}
-};
-
-static const struct snd_soc_acpi_link_adr ptl_rt722_l1[] = {
-       {
-               .mask = BIT(1),
-               .num_adr = ARRAY_SIZE(rt722_1_single_adr),
-               .adr_d = rt722_1_single_adr,
-       },
-       {}
-};
-
-static const struct snd_soc_acpi_link_adr ptl_rt722_l3[] = {
-       {
-               .mask = BIT(3),
-               .num_adr = ARRAY_SIZE(rt722_3_single_adr),
-               .adr_d = rt722_3_single_adr,
-       },
-       {}
-};
-
 static const struct snd_soc_acpi_link_adr ptl_rt722_l0_rt1320_l23[] = {
        {
                .mask = BIT(0),
@@ -698,20 +619,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_rt722_only,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-ptl-rt722.tplg",
-               .get_function_tplg_files = sof_sdw_get_tplg_files,
-       },
-       {
-               .link_mask = BIT(1),
-               .links = ptl_rt722_l1,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-ptl-rt722.tplg",
-               .get_function_tplg_files = sof_sdw_get_tplg_files,
-       },
        {
                .link_mask = BIT(3),
                .links = ptl_sdw_rt712_vb_l3_rt1320_l3,
@@ -720,13 +627,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_rt722_l3,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-ptl-rt722.tplg",
-               .get_function_tplg_files = sof_sdw_get_tplg_files,
-       },
        {},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_ptl_sdw_machines);