Skip to content

Commit 340397d

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 5531774 commit 340397d

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -717,24 +717,28 @@ 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),
@@ -748,12 +752,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
748752
.links = lnl_rvp,
749753
.drv_name = "sof_sdw",
750754
.sof_tplg_filename = "sof-lnl-rt711.tplg",
755+
.get_function_tplg_files = sof_sdw_get_tplg_files,
751756
},
752757
{
753758
.link_mask = BIT(2) | BIT(3),
754759
.links = lnl_712_only,
755760
.drv_name = "sof_sdw",
756761
.sof_tplg_filename = "sof-lnl-rt712-l2-rt1712-l3.tplg",
762+
.get_function_tplg_files = sof_sdw_get_tplg_files,
757763
},
758764
{
759765
.link_mask = BIT(0),
@@ -766,19 +772,22 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
766772
.link_mask = GENMASK(2, 0),
767773
.links = lnl_sdw_rt1318_l12_rt714_l0,
768774
.drv_name = "sof_sdw",
769-
.sof_tplg_filename = "sof-lnl-rt1318-l12-rt714-l0.tplg"
775+
.sof_tplg_filename = "sof-lnl-rt1318-l12-rt714-l0.tplg",
776+
.get_function_tplg_files = sof_sdw_get_tplg_files,
770777
},
771778
{
772779
.link_mask = GENMASK(2, 0),
773780
.links = lnl_sdw_rt1320_l12_rt714_l0,
774781
.drv_name = "sof_sdw",
775-
.sof_tplg_filename = "sof-lnl-rt1320-l12-rt714-l0.tplg"
782+
.sof_tplg_filename = "sof-lnl-rt1320-l12-rt714-l0.tplg",
783+
.get_function_tplg_files = sof_sdw_get_tplg_files,
776784
},
777785
{
778786
.link_mask = BIT(0) | BIT(1),
779787
.links = lnl_sdw_rt713_l0_rt1318_l1,
780788
.drv_name = "sof_sdw",
781-
.sof_tplg_filename = "sof-lnl-rt713-l0-rt1318-l1.tplg"
789+
.sof_tplg_filename = "sof-lnl-rt713-l0-rt1318-l1.tplg",
790+
.get_function_tplg_files = sof_sdw_get_tplg_files,
782791
},
783792
{
784793
.link_mask = BIT(1) | BIT(2),

0 commit comments

Comments
 (0)