ASoC: Intel: soc-acpi-intel-mtl-match: add rt712 ID
authorBard Liao <yung-chuan.liao@linux.intel.com>
Fri, 2 Jun 2023 20:22:09 +0000 (15:22 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 5 Jun 2023 13:00:18 +0000 (14:00 +0100)
Add rt712 ID for MTL.

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://lore.kernel.org/r/20230602202225.249209-13-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/soc-acpi-intel-mtl-match.c

index 8fd4d0d..2c2bece 100644 (file)
@@ -65,6 +65,21 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
        .group_id = 1,
 };
 
+static const struct snd_soc_acpi_endpoint rt712_endpoints[] = {
+       {
+               .num = 0,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       {
+               .num = 1,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+};
+
 static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
        {
                .adr = 0x000030025D071101ull,
@@ -74,6 +89,24 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt712_0_single_adr[] = {
+       {
+               .adr = 0x000030025D071201ull,
+               .num_endpoints = ARRAY_SIZE(rt712_endpoints),
+               .endpoints = rt712_endpoints,
+               .name_prefix = "rt712"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device rt1712_3_single_adr[] = {
+       {
+               .adr = 0x000330025D171201ull,
+               .num_endpoints = 1,
+               .endpoints = &single_endpoint,
+               .name_prefix = "rt712-dmic"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device mx8373_0_adr[] = {
        {
                .adr = 0x000023019F837300ull,
@@ -125,6 +158,20 @@ static const struct snd_soc_acpi_adr_device rt714_1_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_link_adr mtl_712_only[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt712_0_single_adr),
+               .adr_d = rt712_0_single_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt1712_3_single_adr),
+               .adr_d = rt1712_3_single_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {
        /* Expected order: jack -> amp */
        {
@@ -194,6 +241,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-mtl-rt715-rt711-rt1308-mono.tplg",
        },
+       {
+               .link_mask = BIT(3) | BIT(0),
+               .links = mtl_712_only,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-mtl-rt712-l0-rt1712-l3.tplg",
+       },
        {
                .link_mask = GENMASK(3, 0),
                .links = mtl_3_in_1_sdca,