Skip to content

Commit cba19c0

Browse files
committed
ASoC: soc-acpi-intel-lnl-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 3a0f2ae commit cba19c0

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,68 +717,79 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
717717
.links = lnl_3_in_1_sdca,
718718
.drv_name = "sof_sdw",
719719
.sof_tplg_filename = "sof-lnl-rt711-l0-rt1316-l23-rt714-l1.tplg",
720+
.get_function_tplg_files = sof_sdw_get_tplg_files,
720721
},
721722
{
722723
.link_mask = BIT(0) | BIT(2) | BIT(3),
723724
.links = lnl_cs42l43_l0_cs35l56_l23,
724725
.drv_name = "sof_sdw",
725726
.sof_tplg_filename = "sof-lnl-cs42l43-l0-cs35l56-l23.tplg",
727+
.get_function_tplg_files = sof_sdw_get_tplg_files,
726728
},
727729
{
728730
.link_mask = BIT(1) | BIT(2) | BIT(3),
729731
.links = lnl_cs42l43_l2_cs35l56x6_l13,
730732
.drv_name = "sof_sdw",
731733
.sof_tplg_filename = "sof-lnl-cs42l43-l2-cs35l56x6-l13.tplg",
734+
.get_function_tplg_files = sof_sdw_get_tplg_files,
732735
},
733736
{
734737
.link_mask = BIT(0) | BIT(3),
735738
.links = lnl_cs42l43_l0_cs35l56_l3,
736739
.drv_name = "sof_sdw",
737740
.sof_tplg_filename = "sof-lnl-cs42l43-l0-cs35l56-l3.tplg",
741+
.get_function_tplg_files = sof_sdw_get_tplg_files,
738742
},
739743
{
740744
.link_mask = BIT(0),
741745
.links = lnl_cs42l43_l0,
742746
.drv_name = "sof_sdw",
743747
.sof_tplg_filename = "sof-lnl-cs42l43-l0.tplg",
744748
.get_function_tplg_files = sof_sdw_get_tplg_files,
749+
.get_function_tplg_files = sof_sdw_get_tplg_files,
745750
},
746751
{
747752
.link_mask = BIT(0),
748753
.links = lnl_rvp,
749754
.drv_name = "sof_sdw",
750755
.sof_tplg_filename = "sof-lnl-rt711.tplg",
756+
.get_function_tplg_files = sof_sdw_get_tplg_files,
751757
},
752758
{
753759
.link_mask = BIT(2) | BIT(3),
754760
.links = lnl_712_only,
755761
.drv_name = "sof_sdw",
756762
.sof_tplg_filename = "sof-lnl-rt712-l2-rt1712-l3.tplg",
763+
.get_function_tplg_files = sof_sdw_get_tplg_files,
757764
},
758765
{
759766
.link_mask = BIT(0),
760767
.links = lnl_rt722_only,
761768
.drv_name = "sof_sdw",
762769
.sof_tplg_filename = "sof-lnl-rt722-l0.tplg",
763770
.get_function_tplg_files = sof_sdw_get_tplg_files,
771+
.get_function_tplg_files = sof_sdw_get_tplg_files,
764772
},
765773
{
766774
.link_mask = GENMASK(2, 0),
767775
.links = lnl_sdw_rt1318_l12_rt714_l0,
768776
.drv_name = "sof_sdw",
769777
.sof_tplg_filename = "sof-lnl-rt1318-l12-rt714-l0.tplg"
778+
.get_function_tplg_files = sof_sdw_get_tplg_files,
770779
},
771780
{
772781
.link_mask = GENMASK(2, 0),
773782
.links = lnl_sdw_rt1320_l12_rt714_l0,
774783
.drv_name = "sof_sdw",
775784
.sof_tplg_filename = "sof-lnl-rt1320-l12-rt714-l0.tplg"
785+
.get_function_tplg_files = sof_sdw_get_tplg_files,
776786
},
777787
{
778788
.link_mask = BIT(0) | BIT(1),
779789
.links = lnl_sdw_rt713_l0_rt1318_l1,
780790
.drv_name = "sof_sdw",
781791
.sof_tplg_filename = "sof-lnl-rt713-l0-rt1318-l1.tplg"
792+
.get_function_tplg_files = sof_sdw_get_tplg_files,
782793
},
783794
{
784795
.link_mask = BIT(1) | BIT(2),

0 commit comments

Comments
 (0)