ASoC: Intel: soc-acpi-intel-ptl-match: Add rt722 support
authorBard Liao <yung-chuan.liao@linux.intel.com>
Fri, 2 Aug 2024 12:40:11 +0000 (14:40 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 2 Aug 2024 13:04:58 +0000 (14:04 +0100)
This patch adds match table for rt722 multiple function codec on link
0 and link3.

The topology does not internally refer to link0 or link3, so we can
simplify and use the same topology file name. We do need different
tables though.

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240802124011.173820-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/soc-acpi-intel-ptl-match.c

index ce4234f..90f97a4 100644 (file)
@@ -22,6 +22,31 @@ static const struct snd_soc_acpi_endpoint single_endpoint = {
        .group_id = 0,
 };
 
+/*
+ * RT722 is a multi-function codec, three endpoints are created for
+ * its headset, amp and dmic functions.
+ */
+static const struct snd_soc_acpi_endpoint rt722_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 rt711_sdca_0_adr[] = {
        {
                .adr = 0x000030025D071101ull,
@@ -31,6 +56,42 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {
+       {
+               .adr = 0x000030025d072201ull,
+               .num_endpoints = ARRAY_SIZE(rt722_endpoints),
+               .endpoints = rt722_endpoints,
+               .name_prefix = "rt722"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = {
+       {
+               .adr = 0x000330025d072201ull,
+               .num_endpoints = ARRAY_SIZE(rt722_endpoints),
+               .endpoints = rt722_endpoints,
+               .name_prefix = "rt722"
+       }
+};
+
+static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt722_0_single_adr),
+               .adr_d = rt722_0_single_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr ptl_rt722_l3[] = {
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt722_3_single_adr),
+               .adr_d = rt722_3_single_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr ptl_rvp[] = {
        {
                .mask = BIT(0),
@@ -67,6 +128,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-ptl-rt711.tplg",
        },
+       {
+               .link_mask = BIT(0),
+               .links = ptl_rt722_only,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-ptl-rt722.tplg",
+       },
+       {
+               .link_mask = BIT(3),
+               .links = ptl_rt722_l3,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-ptl-rt722.tplg",
+       },
        {},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_ptl_sdw_machines);