Skip to content

Commit 3dae1cf

Browse files
macchianMac Chiang
authored andcommitted
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>
1 parent d3af4d8 commit 3dae1cf

File tree

1 file changed

+0
-50
lines changed

1 file changed

+0
-50
lines changed

sound/soc/intel/common/soc-acpi-intel-ptl-match.c

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -356,33 +356,6 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group1_adr[] = {
356356
}
357357
};
358358

359-
static const struct snd_soc_acpi_adr_device rt721_0_single_adr[] = {
360-
{
361-
.adr = 0x000030025d072101ull,
362-
.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
363-
.endpoints = rt_mf_endpoints,
364-
.name_prefix = "rt721"
365-
}
366-
};
367-
368-
static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = {
369-
{
370-
.adr = 0x000330025d072101ull,
371-
.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
372-
.endpoints = rt_mf_endpoints,
373-
.name_prefix = "rt721"
374-
}
375-
};
376-
377-
static const struct snd_soc_acpi_link_adr ptl_rt721_l3[] = {
378-
{
379-
.mask = BIT(3),
380-
.num_adr = ARRAY_SIZE(rt721_3_single_adr),
381-
.adr_d = rt721_3_single_adr,
382-
},
383-
{},
384-
};
385-
386359
static const struct snd_soc_acpi_adr_device rt722_0_agg_adr[] = {
387360
{
388361
.adr = 0x000030025d072201ull,
@@ -506,15 +479,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {
506479
{}
507480
};
508481

509-
static const struct snd_soc_acpi_link_adr ptl_rt721_l0[] = {
510-
{
511-
.mask = BIT(0),
512-
.num_adr = ARRAY_SIZE(rt721_0_single_adr),
513-
.adr_d = rt721_0_single_adr,
514-
},
515-
{}
516-
};
517-
518482
static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = {
519483
{
520484
.mask = BIT(0),
@@ -734,13 +698,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
734698
.drv_name = "sof_sdw",
735699
.sof_tplg_filename = "sof-ptl-rt711.tplg",
736700
},
737-
{
738-
.link_mask = BIT(0),
739-
.links = ptl_rt721_l0,
740-
.drv_name = "sof_sdw",
741-
.sof_tplg_filename = "sof-ptl-rt721.tplg",
742-
.get_function_tplg_files = sof_sdw_get_tplg_files,
743-
},
744701
{
745702
.link_mask = BIT(0),
746703
.links = ptl_rt722_only,
@@ -763,13 +720,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
763720
.sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l3.tplg",
764721
.get_function_tplg_files = sof_sdw_get_tplg_files,
765722
},
766-
{
767-
.link_mask = BIT(3),
768-
.links = ptl_rt721_l3,
769-
.drv_name = "sof_sdw",
770-
.sof_tplg_filename = "sof-ptl-rt721.tplg",
771-
.get_function_tplg_files = sof_sdw_get_tplg_files,
772-
},
773723
{
774724
.link_mask = BIT(3),
775725
.links = ptl_rt722_l3,

0 commit comments

Comments
 (0)