ASoC: Intel: soc-acpi-intel-lnl-match: add rt713_vb_l2_rt1320_l13 support

Add rt713_vb on SoundWire link 2 and rt1320 on SoundWire link 1 and 3
configuration support.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://patch.msgid.link/20241206075903.195730-8-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 98a9c36d7a4cd03c3e26f1c4c5840df800a7af1e..0b4a9c27c47e4f04a3a38080913ff9308a347b2a 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-lnl-match.c
@@ -91,6 +91,23 @@ static const struct snd_soc_acpi_endpoint rt722_endpoints[] = {
        },
 };
 
+static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
+       /* Jack Endpoint */
+       {
+               .num = 0,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       /* DMIC Endpoint */
+       {
+               .num = 1,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+};
+
 static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints_endpoints[] = {
        /* Jack Endpoint */
        {
@@ -295,6 +312,24 @@ static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt1320_1_group2_adr[] = {
+       {
+               .adr = 0x000130025D132001ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "rt1320-1"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = {
+       {
+               .adr = 0x000330025D132001ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "rt1320-2"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device rt713_0_adr[] = {
        {
                .adr = 0x000031025D071301ull,
@@ -304,6 +339,15 @@ static const struct snd_soc_acpi_adr_device rt713_0_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt713_vb_2_adr[] = {
+       {
+               .adr = 0x000230025d071301ull,
+               .num_endpoints = ARRAY_SIZE(jack_dmic_endpoints),
+               .endpoints = jack_dmic_endpoints,
+               .name_prefix = "rt713"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device rt714_0_adr[] = {
        {
                .adr = 0x000030025D071401ull,
@@ -453,6 +497,25 @@ static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_l0_rt1318_l1[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_vb_l2_rt1320_l13[] = {
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(rt713_vb_2_adr),
+               .adr_d = rt713_vb_2_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt1320_1_group2_adr),
+               .adr_d = rt1320_1_group2_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt1320_3_group2_adr),
+               .adr_d = rt1320_3_group2_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr lnl_sdw_rt712_vb_l2_rt1320_l1[] = {
        {
                .mask = BIT(2),
@@ -550,6 +613,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = {
                .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb,
                .sof_tplg_filename = "sof-lnl-rt712-l2-rt1320-l1.tplg"
        },
+       {
+               .link_mask = BIT(1) | BIT(2) | BIT(3),
+               .links = lnl_sdw_rt713_vb_l2_rt1320_l13,
+               .drv_name = "sof_sdw",
+               .machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb,
+               .sof_tplg_filename = "sof-lnl-rt713-l2-rt1320-l13.tplg"
+       },
        {},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_lnl_sdw_machines);