tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Mac Chiang and committed by
Mark Brown 754b3dad 023dfede

-50
-50
sound/soc/intel/common/soc-acpi-intel-ptl-match.c
··· 356 356 } 357 357 }; 358 358 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 - 386 359 static const struct snd_soc_acpi_adr_device rt722_0_agg_adr[] = { 387 360 { 388 361 .adr = 0x000030025d072201ull, ··· 475 502 .mask = BIT(3), 476 503 .num_adr = ARRAY_SIZE(cs35l56_3_3amp_adr), 477 504 .adr_d = cs35l56_3_3amp_adr, 478 - }, 479 - {} 480 - }; 481 - 482 - static const struct snd_soc_acpi_link_adr ptl_rt721_l0[] = { 483 - { 484 - .mask = BIT(0), 485 - .num_adr = ARRAY_SIZE(rt721_0_single_adr), 486 - .adr_d = rt721_0_single_adr, 487 505 }, 488 506 {} 489 507 }; ··· 700 736 }, 701 737 { 702 738 .link_mask = BIT(0), 703 - .links = ptl_rt721_l0, 704 - .drv_name = "sof_sdw", 705 - .sof_tplg_filename = "sof-ptl-rt721.tplg", 706 - .get_function_tplg_files = sof_sdw_get_tplg_files, 707 - }, 708 - { 709 - .link_mask = BIT(0), 710 739 .links = ptl_rt722_only, 711 740 .drv_name = "sof_sdw", 712 741 .sof_tplg_filename = "sof-ptl-rt722.tplg", ··· 718 761 .drv_name = "sof_sdw", 719 762 .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb, 720 763 .sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l3.tplg", 721 - .get_function_tplg_files = sof_sdw_get_tplg_files, 722 - }, 723 - { 724 - .link_mask = BIT(3), 725 - .links = ptl_rt721_l3, 726 - .drv_name = "sof_sdw", 727 - .sof_tplg_filename = "sof-ptl-rt721.tplg", 728 764 .get_function_tplg_files = sof_sdw_get_tplg_files, 729 765 }, 730 766 {