ASoC: Intel: soc-acpi-intel-tgl-match: add cs42l43 and cs35l56 support

This is a test configuration for UpExtreme with Cirrus Logic
CS35L56-EIGHT-C board.

The codec layout is configured as:
    - Link3: CS42L43 Jack
    - Link0: 2x CS35L56 Speaker (amps 1 and 2)
    - Link1: 2x CS35L56 Speaker (amps 7 and 8)

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231204135614.2169624-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 5804926c8b566b246635c3b0df31a473e73348b7..e5f721ba5ed478cdb108cc7be1564566aa53bb0a 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -41,6 +41,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,
@@ -400,6 +414,64 @@ static const struct snd_soc_acpi_link_adr tgl_712_only[] = {
        {}
 };
 
+static const struct snd_soc_acpi_adr_device cs42l43_3_adr[] = {
+       {
+               .adr = 0x00033001FA424301ull,
+               .num_endpoints = 1,
+               .endpoints = &single_endpoint,
+               .name_prefix = "cs42l43"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56_0_adr[] = {
+       {
+               .adr = 0x00003301FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00003201FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_3_endpoint,
+               .name_prefix = "AMP2"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56_1_adr[] = {
+       {
+               .adr = 0x00013701FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP8"
+       },
+       {
+               .adr = 0x00013601FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_2_endpoint,
+               .name_prefix = "AMP7"
+       }
+};
+
+static const struct snd_soc_acpi_link_adr tgl_cs42l43_cs35l56[] = {
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(cs42l43_3_adr),
+               .adr_d = cs42l43_3_adr,
+       },
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs35l56_0_adr),
+               .adr_d = cs35l56_0_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l56_1_adr),
+               .adr_d = cs35l56_1_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_codecs tgl_max98373_amp = {
        .num_codecs = 1,
        .codecs = {"MX98373"}
@@ -494,6 +566,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-tgl-rt715-rt711-rt1308-mono.tplg",
        },
+       {
+               .link_mask = 0xB,
+               .links = tgl_cs42l43_cs35l56,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-tgl-cs42l43-l3-cs35l56-l01.tplg",
+       },
        {
                .link_mask = 0xF, /* 4 active links required */
                .links = tgl_3_in_1_default,