]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support
authorBard Liao <yung-chuan.liao@linux.intel.com>
Tue, 4 Nov 2025 12:16:47 +0000 (14:16 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 17 Nov 2025 11:04:29 +0000 (12:04 +0100)
Add rt722 on SDW link 3 support

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20251104121650.21872-5-peter.ujfalusi@linux.intel.com
sound/soc/intel/common/soc-acpi-intel-nvl-match.c

index b8695d47e55b3f87a570a809235362ca77088ac6..2768dd10aaa08d9be61c68556de9162979559fc5 100644 (file)
@@ -15,6 +15,49 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[] = {
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_machines);
 
+/*
+ * Multi-function codecs with three endpoints created for
+ * headset, amp and dmic functions.
+ */
+static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = {
+       {
+               .num = 0,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       {
+               .num = 1,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       {
+               .num = 2,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+};
+
+static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = {
+       {
+               .adr = 0x000330025d072201ull,
+               .num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
+               .endpoints = rt_mf_endpoints,
+               .name_prefix = "rt722"
+       }
+};
+
+static const struct snd_soc_acpi_link_adr nvl_rt722_l3[] = {
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt722_3_single_adr),
+               .adr_d = rt722_3_single_adr,
+       },
+       {}
+};
+
 /* this table is used when there is no I2S codec present */
 struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {
        /* mockup tests need to be first */
@@ -36,6 +79,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-nvl-rt715-rt711-rt1308-mono.tplg",
        },
+       {
+               .link_mask = BIT(3),
+               .links = nvl_rt722_l3,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-nvl-rt722.tplg",
+       },
        {},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_sdw_machines);