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

Add a match for 6x CS35L56, 3x on link 0 and 3x on link 1.
To support the CDB35L56-EIGHT-C board using 6 amps.

This is the same as the existing 8-amp configuration
mtl_cs35l56_x8_link0_link1_fb, but reduced to 6 amps.

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-2-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 ec9fd8486c0534532f33019d98ac77309a93617d..f0cf956ffb82fb9759e2e1d69a99bf44107bc862 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -699,6 +699,27 @@ static const struct snd_soc_acpi_adr_device cs35l56_1_fb_adr[] = {
        },
 };
 
+static const struct snd_soc_acpi_adr_device cs35l56_6amp_1_fb_adr[] = {
+       {
+               .adr = 0x00013701FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
+               .endpoints = cs35l56_r_fb_endpoints,
+               .name_prefix = "AMP6"
+       },
+       {
+               .adr = 0x00013601FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
+               .endpoints = cs35l56_3_fb_endpoints,
+               .name_prefix = "AMP5"
+       },
+       {
+               .adr = 0x00013501FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
+               .endpoints = cs35l56_5_fb_endpoints,
+               .name_prefix = "AMP4"
+       },
+};
+
 static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
        {
                .adr = 0x00023201FA355601ull,
@@ -1069,6 +1090,21 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr mtl_cs35l56_x6_link0_link1_fb[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l56_6amp_1_fb_adr),
+               .adr_d = cs35l56_6amp_1_fb_adr,
+       },
+       {
+               .mask = BIT(0),
+               /* First 3 amps in cs35l56_0_fb_adr */
+               .num_adr = 3,
+               .adr_d = cs35l56_0_fb_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {
        {
                .mask = BIT(3),
@@ -1189,6 +1225,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
                .sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = mtl_cs35l56_x6_link0_link1_fb,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-mtl-cs35l56-l01-fb6.tplg"
+       },
        {
                .link_mask = BIT(0),
                .links = mtl_cs42l43_l0,