ASoC: Intel: soc-acpi-intel-mtl-match: Add 6 amp CS35L63 with feedback

Add match for 6x CS35L63, 3x on link 2 and 3x on link 3.

This is to support 6 amps on the CDB35L63-CB8 board.

Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20251217163227.1186373-3-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index f0cf956ffb82fb9759e2e1d69a99bf44107bc862..1270ee21ee7217e102ddfa0dc0e939e8992f8d8f 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -720,6 +720,48 @@ static const struct snd_soc_acpi_adr_device cs35l56_6amp_1_fb_adr[] = {
        },
 };
 
+static const struct snd_soc_acpi_adr_device cs35l63_6amp_3_fb_adr[] = {
+       {
+               .adr = 0x00033001FA356301ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),
+               .endpoints = cs35l56_l_fb_endpoints,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00033201FA356301ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_2_fb_endpoints),
+               .endpoints = cs35l56_2_fb_endpoints,
+               .name_prefix = "AMP3"
+       },
+       {
+               .adr = 0x00033401FA356301ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_4_fb_endpoints),
+               .endpoints = cs35l56_4_fb_endpoints,
+               .name_prefix = "AMP5"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs35l63_6amp_2_fb_adr[] = {
+       {
+               .adr = 0x00023101FA356301ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
+               .endpoints = cs35l56_r_fb_endpoints,
+               .name_prefix = "AMP2"
+       },
+       {
+               .adr = 0x00023301FA356301ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
+               .endpoints = cs35l56_3_fb_endpoints,
+               .name_prefix = "AMP4"
+       },
+       {
+               .adr = 0x00023501FA356301ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
+               .endpoints = cs35l56_5_fb_endpoints,
+               .name_prefix = "AMP6"
+       },
+};
+
 static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
        {
                .adr = 0x00023201FA355601ull,
@@ -1105,6 +1147,20 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x6_link0_link1_fb[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr mtl_cs35l63_x6_link2_link3_fb[] = {
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(cs35l63_6amp_3_fb_adr),
+               .adr_d = cs35l63_6amp_3_fb_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(cs35l63_6amp_2_fb_adr),
+               .adr_d = cs35l63_6amp_2_fb_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
        {
                .mask = BIT(3),
@@ -1244,6 +1300,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
        },
+       {
+               .link_mask = BIT(2) | BIT(3),
+               .links = mtl_cs35l63_x6_link2_link3_fb,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-mtl-cs35l56-l01-fb6.tplg",
+       },
        {
                .link_mask = GENMASK(3, 0),
                .links = mtl_3_in_1_sdca,