ASoC: Intel: mtl-match: Add CDB35L56-EIGHT-C 8x CS35L56 without CS42L43

This adds a match entry for using all the amps on a CDB35L56-EIGHT-C board
without the CS42L43 codec. Configuration is:

  SDW0: 4x CS35L56 (OUT1, OUT2, OUT3, OUT4)
  SDW1: 4x CS35L56 (OUT5, OUT6, OUT7, OUT8)

Speaker playback and amp feedback are aggregated.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20241216032721.131227-4-yung-chuan.liao@linux.intel.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 35a2cf85140a451d54ffabd77a0289bc7f82fdc6..770e2194a283e128a57d268659b646d10ab16430 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -539,6 +539,66 @@ static const struct snd_soc_acpi_endpoint cs35l56_3_fb_endpoints[] = {
        },
 };
 
+static const struct snd_soc_acpi_endpoint cs35l56_4_fb_endpoints[] = {
+       { /* Speaker Playback Endpoint */
+               .num = 0,
+               .aggregated = 1,
+               .group_position = 4,
+               .group_id = 1,
+       },
+       { /* Feedback Capture Endpoint */
+               .num = 1,
+               .aggregated = 1,
+               .group_position = 4,
+               .group_id = 2,
+       },
+};
+
+static const struct snd_soc_acpi_endpoint cs35l56_5_fb_endpoints[] = {
+       { /* Speaker Playback Endpoint */
+               .num = 0,
+               .aggregated = 1,
+               .group_position = 5,
+               .group_id = 1,
+       },
+       { /* Feedback Capture Endpoint */
+               .num = 1,
+               .aggregated = 1,
+               .group_position = 5,
+               .group_id = 2,
+       },
+};
+
+static const struct snd_soc_acpi_endpoint cs35l56_6_fb_endpoints[] = {
+       { /* Speaker Playback Endpoint */
+               .num = 0,
+               .aggregated = 1,
+               .group_position = 6,
+               .group_id = 1,
+       },
+       { /* Feedback Capture Endpoint */
+               .num = 1,
+               .aggregated = 1,
+               .group_position = 6,
+               .group_id = 2,
+       },
+};
+
+static const struct snd_soc_acpi_endpoint cs35l56_7_fb_endpoints[] = {
+       { /* Speaker Playback Endpoint */
+               .num = 0,
+               .aggregated = 1,
+               .group_position = 7,
+               .group_id = 1,
+       },
+       { /* Feedback Capture Endpoint */
+               .num = 1,
+               .aggregated = 1,
+               .group_position = 7,
+               .group_id = 2,
+       },
+};
+
 static const struct snd_soc_acpi_adr_device cs35l56_0_adr[] = {
        {
                .adr = 0x00003301FA355601ull,
@@ -584,6 +644,60 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device cs35l56_0_fb_adr[] = {
+       {
+               .adr = 0x00003301FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),
+               .endpoints = cs35l56_l_fb_endpoints,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00003201FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_2_fb_endpoints),
+               .endpoints = cs35l56_2_fb_endpoints,
+               .name_prefix = "AMP2"
+       },
+       {
+               .adr = 0x00003101FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_4_fb_endpoints),
+               .endpoints = cs35l56_4_fb_endpoints,
+               .name_prefix = "AMP3"
+       },
+       {
+               .adr = 0x00003001FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_6_fb_endpoints),
+               .endpoints = cs35l56_6_fb_endpoints,
+               .name_prefix = "AMP4"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56_1_fb_adr[] = {
+       {
+               .adr = 0x00013701FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),
+               .endpoints = cs35l56_r_fb_endpoints,
+               .name_prefix = "AMP8"
+       },
+       {
+               .adr = 0x00013601FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_3_fb_endpoints),
+               .endpoints = cs35l56_3_fb_endpoints,
+               .name_prefix = "AMP7"
+       },
+       {
+               .adr = 0x00013501FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_5_fb_endpoints),
+               .endpoints = cs35l56_5_fb_endpoints,
+               .name_prefix = "AMP6"
+       },
+       {
+               .adr = 0x00013401FA355601ull,
+               .num_endpoints = ARRAY_SIZE(cs35l56_7_fb_endpoints),
+               .endpoints = cs35l56_7_fb_endpoints,
+               .name_prefix = "AMP5"
+       },
+};
+
 static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
        {
                .adr = 0x00023201FA355601ull,
@@ -898,6 +1012,20 @@ static const struct snd_soc_acpi_link_adr cs42l43_link3_cs35l56_x4_link0_link1_s
        {}
 };
 
+static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l56_1_fb_adr),
+               .adr_d = cs35l56_1_fb_adr,
+       },
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs35l56_0_fb_adr),
+               .adr_d = cs35l56_0_fb_adr,
+       },
+       {}
+};
+
 /* this table is used when there is no I2S codec present */
 struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
        /* mockup tests need to be first */
@@ -986,6 +1114,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-mtl-cs42l43-l0-cs35l56-l12.tplg",
        },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = mtl_cs35l56_x8_link0_link1_fb,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg"
+       },
        {
                .link_mask = BIT(0),
                .links = mtl_cs42l43_l0,