ASoC: Intel: soc-acpi: lnl: Add match entries for new cs42l43 laptops

Add some new match table entries on Lunarlake for some coming cs42l43
laptops.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20240827123215.258859-17-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
index e6ffcd5be6c5af5bf31291258ef195e5d71aa7c0..2522e6f11749748ea26376e173b20785d1804f09 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@ -36,6 +36,20 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
        .group_id = 1,
 };
 
+static const struct snd_soc_acpi_endpoint spk_2_endpoint = {
+       .num = 0,
+       .aggregated = 1,
+       .group_position = 2,
+       .group_id = 1,
+};
+
+static const struct snd_soc_acpi_endpoint spk_3_endpoint = {
+       .num = 0,
+       .aggregated = 1,
+       .group_position = 3,
+       .group_id = 1,
+};
+
 static const struct snd_soc_acpi_endpoint rt712_endpoints[] = {
        {
                .num = 0,
@@ -103,6 +117,51 @@ static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
        },
 };
 
+static const struct snd_soc_acpi_adr_device cs35l56_2_l_adr[] = {
+       {
+               .adr = 0x00023001FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00023101FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_2_endpoint,
+               .name_prefix = "AMP2"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56_3_r_adr[] = {
+       {
+               .adr = 0x00033201fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP3"
+       },
+       {
+               .adr = 0x00033301fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_3_endpoint,
+               .name_prefix = "AMP4"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56_3_lr_adr[] = {
+       {
+               .adr = 0x00033001fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00033101fa355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {
        {
                .adr = 0x00003001FA424301ull,
@@ -210,6 +269,39 @@ static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0[] = {
        },
 };
 
+static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l3[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43_0_adr),
+               .adr_d = cs42l43_0_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(cs35l56_3_lr_adr),
+               .adr_d = cs35l56_3_lr_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l23[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43_0_adr),
+               .adr_d = cs42l43_0_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(cs35l56_2_l_adr),
+               .adr_d = cs35l56_2_l_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(cs35l56_3_r_adr),
+               .adr_d = cs35l56_3_r_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr lnl_rvp[] = {
        {
                .mask = BIT(0),
@@ -312,6 +404,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-lnl-rt711-l0-rt1316-l23-rt714-l1.tplg",
        },
+       {
+               .link_mask = BIT(0) | BIT(2) | BIT(3),
+               .links = lnl_cs42l43_l0_cs35l56_l23,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-lnl-cs42l43-l0-cs35l56-l23.tplg",
+       },
+       {
+               .link_mask = BIT(0) | BIT(3),
+               .links = lnl_cs42l43_l0_cs35l56_l3,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-lnl-cs42l43-l0-cs35l56-l3.tplg",
+       },
        {
                .link_mask = BIT(0),
                .links = lnl_cs42l43_l0,