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: Remove cs42l43 match from sdw link3

Removing this match entry ensures that a PTL system comprising of a
cs42l43 codec on link3 will use function topologies.

Previously the behaviour would be use the monolithic topology associated
with this codec match table entry in preference to function topologies
and if the system had a number of smart amplifiers then they would not
be instantiated.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20251016112601.187020-1-simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Simon Trimmer and committed by
Mark Brown 3bcdbc22 bf6fb4a2

-52
-52
sound/soc/intel/common/soc-acpi-intel-ptl-match.c
··· 227 227 }, 228 228 }; 229 229 230 - static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = { 231 - { /* Jack Playback Endpoint */ 232 - .num = 0, 233 - .aggregated = 0, 234 - .group_position = 0, 235 - .group_id = 0, 236 - }, 237 - { /* DMIC Capture Endpoint */ 238 - .num = 1, 239 - .aggregated = 0, 240 - .group_position = 0, 241 - .group_id = 0, 242 - }, 243 - { /* Jack Capture Endpoint */ 244 - .num = 2, 245 - .aggregated = 0, 246 - .group_position = 0, 247 - .group_id = 0, 248 - }, 249 - { /* Speaker Playback Endpoint */ 250 - .num = 3, 251 - .aggregated = 0, 252 - .group_position = 0, 253 - .group_id = 0, 254 - }, 255 - }; 256 - 257 230 static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = { 258 231 { 259 232 .adr = 0x00023001fa424301ull, ··· 275 302 .num_endpoints = 1, 276 303 .endpoints = &spk_6_endpoint, 277 304 .name_prefix = "AMP6" 278 - } 279 - }; 280 - 281 - static const struct snd_soc_acpi_adr_device cs42l43_3_adr[] = { 282 - { 283 - .adr = 0x00033001FA424301ull, 284 - .num_endpoints = ARRAY_SIZE(cs42l43_endpoints), 285 - .endpoints = cs42l43_endpoints, 286 - .name_prefix = "cs42l43" 287 305 } 288 306 }; 289 307 ··· 446 482 .mask = BIT(3), 447 483 .num_adr = ARRAY_SIZE(cs35l56_3_3amp_adr), 448 484 .adr_d = cs35l56_3_3amp_adr, 449 - }, 450 - {} 451 - }; 452 - 453 - static const struct snd_soc_acpi_link_adr ptl_cs42l43_l3[] = { 454 - { 455 - .mask = BIT(3), 456 - .num_adr = ARRAY_SIZE(cs42l43_3_adr), 457 - .adr_d = cs42l43_3_adr, 458 485 }, 459 486 {} 460 487 }; ··· 665 710 .links = ptl_rt722_l1, 666 711 .drv_name = "sof_sdw", 667 712 .sof_tplg_filename = "sof-ptl-rt722.tplg", 668 - .get_function_tplg_files = sof_sdw_get_tplg_files, 669 - }, 670 - { 671 - .link_mask = BIT(3), 672 - .links = ptl_cs42l43_l3, 673 - .drv_name = "sof_sdw", 674 - .sof_tplg_filename = "sof-ptl-cs42l43-l3.tplg", 675 713 .get_function_tplg_files = sof_sdw_get_tplg_files, 676 714 }, 677 715 {