Skip to content

Commit b3f3fc4

Browse files
committed
ASoC: soc-acpi-intel-mtl-match: use function topology by default
With commit c84179a ("ASoC: Intel: sof_sdw: append dai type to dai link name unconditionally"), function topology can apply to all SoundWire codec configurations. Set .get_function_tplg_files callback to use function topology by default. If any required function topology can not be found in the file system, it will fallback to use the monolithic topology. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 1927a1b commit b3f3fc4

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,60 +1321,70 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
13211321
.links = tac5572_l0,
13221322
.drv_name = "sof_sdw",
13231323
.sof_tplg_filename = "sof-mtl-tac5572.tplg",
1324+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13241325
},
13251326
{
13261327
.link_mask = BIT(0),
13271328
.links = tac5672_l0,
13281329
.drv_name = "sof_sdw",
13291330
.sof_tplg_filename = "sof-mtl-tac5672.tplg",
1331+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13301332
},
13311333
{
13321334
.link_mask = BIT(0),
13331335
.links = tac5682_l0,
13341336
.drv_name = "sof_sdw",
13351337
.sof_tplg_filename = "sof-mtl-tac5682.tplg",
1338+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13361339
},
13371340
{
13381341
.link_mask = BIT(0),
13391342
.links = tas2783_link0,
13401343
.drv_name = "sof_sdw",
13411344
.sof_tplg_filename = "sof-mtl-tas2783.tplg",
1345+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13421346
},
13431347
{
13441348
.link_mask = BIT(0),
13451349
.links = tas2883_l0,
13461350
.drv_name = "sof_sdw",
13471351
.sof_tplg_filename = "sof-mtl-tas2883.tplg",
1352+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13481353
},
13491354
{
13501355
.link_mask = GENMASK(3, 0),
13511356
.links = mtl_rt713_l0_rt1316_l12_rt1713_l3,
13521357
.drv_name = "sof_sdw",
13531358
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg",
1359+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13541360
},
13551361
{
13561362
.link_mask = GENMASK(3, 0),
13571363
.links = mtl_rt713_l0_rt1318_l12_rt1713_l3,
13581364
.drv_name = "sof_sdw",
13591365
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1318-l12-rt1713-l3.tplg",
1366+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13601367
},
13611368
{
13621369
.link_mask = BIT(0) | BIT(1) | BIT(3),
13631370
.links = mtl_rt713_l0_rt1318_l1_rt1713_l3,
13641371
.drv_name = "sof_sdw",
13651372
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1318-l1-rt1713-l3.tplg",
1373+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13661374
},
13671375
{
13681376
.link_mask = GENMASK(2, 0),
13691377
.links = mtl_rt713_l0_rt1316_l12,
13701378
.drv_name = "sof_sdw",
13711379
.sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12.tplg",
1380+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13721381
},
13731382
{
13741383
.link_mask = BIT(3) | BIT(0),
13751384
.links = mtl_712_l0_1712_l3,
13761385
.drv_name = "sof_sdw",
13771386
.sof_tplg_filename = "sof-mtl-rt712-l0-rt1712-l3.tplg",
1387+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13781388
},
13791389
{
13801390
.link_mask = BIT(0),
@@ -1396,6 +1406,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
13961406
.links = mtl_sdw_rt1318_l12_rt714_l0,
13971407
.drv_name = "sof_sdw",
13981408
.sof_tplg_filename = "sof-mtl-rt1318-l12-rt714-l0.tplg"
1409+
.get_function_tplg_files = sof_sdw_get_tplg_files,
13991410
},
14001411
{
14011412
.link_mask = BIT(0) | BIT(2) | BIT(3),
@@ -1455,12 +1466,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
14551466
.links = mtl_3_in_1_sdca,
14561467
.drv_name = "sof_sdw",
14571468
.sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l23-rt714-l1.tplg",
1469+
.get_function_tplg_files = sof_sdw_get_tplg_files,
14581470
},
14591471
{
14601472
.link_mask = 0x9, /* 2 active links required */
14611473
.links = mtl_rt711_l0_rt1316_l3,
14621474
.drv_name = "sof_sdw",
14631475
.sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l3.tplg",
1476+
.get_function_tplg_files = sof_sdw_get_tplg_files,
14641477
},
14651478
{
14661479
.link_mask = BIT(0),
@@ -1474,18 +1487,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
14741487
.links = mtl_rvp,
14751488
.drv_name = "sof_sdw",
14761489
.sof_tplg_filename = "sof-mtl-rt711.tplg",
1490+
.get_function_tplg_files = sof_sdw_get_tplg_files,
14771491
},
14781492
{
14791493
.link_mask = BIT(0) | BIT(2),
14801494
.links = rt5682_link2_max98373_link0,
14811495
.drv_name = "sof_sdw",
14821496
.sof_tplg_filename = "sof-mtl-sdw-rt5682-l2-max98373-l0.tplg",
1497+
.get_function_tplg_files = sof_sdw_get_tplg_files,
14831498
},
14841499
{
14851500
.link_mask = BIT(0) | BIT(2),
14861501
.links = cs42l42_link0_max98363_link2,
14871502
.drv_name = "sof_sdw",
14881503
.sof_tplg_filename = "sof-mtl-sdw-cs42l42-l0-max98363-l2.tplg",
1504+
.get_function_tplg_files = sof_sdw_get_tplg_files,
14891505
},
14901506
{},
14911507
};

0 commit comments

Comments
 (0)