diff options
| author | Mark Brown <broonie@kernel.org> | 2023-09-26 17:14:44 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-09-26 17:14:44 +0300 |
| commit | af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a (patch) | |
| tree | 5a71f1c4e3099d7cfe4c6f880e707173b6ec9cda /sound/soc/intel/common/soc-acpi-intel-adl-match.c | |
| parent | e952e89b0602aeb856396eac4306098249c43548 (diff) | |
| parent | 2b21207afd06714986a3d22442ed4860ba4f9ced (diff) | |
| download | linux-af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a.tar.xz | |
ASoC: Merge up fixes
For the benefit of CI.
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-adl-match.c')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-adl-match.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index b513eceb60c3..6e712ad954c8 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -675,18 +675,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { .sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg", }, { - .link_mask = 0x3, /* rt1316 on link1 & rt714 on link0 */ - .links = adl_sdw_rt1316_link1_rt714_link0, - .drv_name = "sof_sdw", - .sof_tplg_filename = "sof-adl-rt1316-l1-mono-rt714-l0.tplg", - }, - { .link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */ .links = adl_sdw_rt1316_link12_rt714_link0, .drv_name = "sof_sdw", .sof_tplg_filename = "sof-adl-rt1316-l12-rt714-l0.tplg", }, { + .link_mask = 0x3, /* rt1316 on link1 & rt714 on link0 */ + .links = adl_sdw_rt1316_link1_rt714_link0, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-adl-rt1316-l1-mono-rt714-l0.tplg", + }, + { .link_mask = 0x5, /* 2 active links required */ .links = adl_sdw_rt1316_link2_rt714_link0, .drv_name = "sof_sdw", |