]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Intel: adl: add 2xrt1316 audio configuration
authorBard Liao <yung-chuan.liao@linux.intel.com>
Wed, 5 Mar 2025 13:54:35 +0000 (21:54 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 5 Mar 2025 14:05:36 +0000 (14:05 +0000)
That is a speaker only configuration and 2 rt1316 are on link 0 and 2.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://patch.msgid.link/20250305135443.201884-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/soc-acpi-intel-adl-match.c

index bb1324fb588e976fdc7df1d3aeb1086a6d735be0..a68efbe98948f47dbab1242a1187e7fe491f0979 100644 (file)
@@ -214,6 +214,15 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt1316_2_group2_adr[] = {
+       {
+               .adr = 0x000232025D131601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1316-2"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device rt1316_1_single_adr[] = {
        {
                .adr = 0x000130025D131601ull,
@@ -547,6 +556,20 @@ static const struct snd_soc_acpi_link_adr adl_chromebook_base[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link02[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt1316_0_group2_adr),
+               .adr_d = rt1316_0_group2_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(rt1316_2_group2_adr),
+               .adr_d = rt1316_2_group2_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
        .num_codecs = 1,
        .codecs = {"MX98357A"}
@@ -749,6 +772,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-adl-sdw-max98373-rt5682.tplg",
        },
+       {
+               .link_mask = BIT(0) | BIT(2),
+               .links = adl_sdw_rt1316_link02,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-adl-rt1316-l02.tplg",
+       },
        {},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_sdw_machines);