diff options
| author | Mac Chiang <mac.chiang@intel.com> | 2026-02-03 13:00:27 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-02-03 16:47:37 +0300 |
| commit | 754b3dade5ddbfd849e6ca9864cef45ce34cd7f6 (patch) | |
| tree | 25810a26d45aadeebcdd18142ba9dec7ddd27fb1 | |
| parent | 023dfedec1478d506ba42d45f7993578fe38fa11 (diff) | |
| download | linux-754b3dade5ddbfd849e6ca9864cef45ce34cd7f6.tar.xz | |
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>
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 50 |
1 files changed, 0 insertions, 50 deletions
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 1055fb4838f6..ddd919847c1f 100644 --- 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), @@ -736,13 +700,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { }, { .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, .drv_name = "sof_sdw", .sof_tplg_filename = "sof-ptl-rt722.tplg", @@ -765,13 +722,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { }, { .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, .drv_name = "sof_sdw", .sof_tplg_filename = "sof-ptl-rt722.tplg", |