ASoC: soc-acpi-intel-arl-match: change rt722 amp endpoint to aggregated

rt722 is aggregated with rt1320 amp in arl_rt722_l0_rt1320_l2 and it is
the only audio configuration in the ARL platform. Set .aggregated = 1 to
represent the fact and avoid unexpected issue.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20260119091749.1752088-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
index 6bf7a6250ddc32eb3bee367fa12fa1af355c7e0c..c952f7d2b2c0e0bab877ea5df387f2107cf7a80e 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
@@ -45,23 +45,22 @@ static const struct snd_soc_acpi_endpoint spk_3_endpoint = {
        .group_id = 1,
 };
 
-/*
- * RT722 is a multi-function codec, three endpoints are created for
- * its headset, amp and dmic functions.
- */
-static const struct snd_soc_acpi_endpoint rt722_endpoints[] = {
+static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints[] = {
+       /* Jack Endpoint */
        {
                .num = 0,
                .aggregated = 0,
                .group_position = 0,
                .group_id = 0,
        },
+       /* Amp Endpoint, work as spk_l_endpoint */
        {
                .num = 1,
-               .aggregated = 0,
+               .aggregated = 1,
                .group_position = 0,
-               .group_id = 0,
+               .group_id = 1,
        },
+       /* DMIC Endpoint */
        {
                .num = 2,
                .aggregated = 0,
@@ -229,11 +228,11 @@ static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] = {
        }
 };
 
-static const struct snd_soc_acpi_adr_device rt722_0_single_adr[] = {
+static const struct snd_soc_acpi_adr_device rt722_0_agg_adr[] = {
        {
                .adr = 0x000030025D072201ull,
-               .num_endpoints = ARRAY_SIZE(rt722_endpoints),
-               .endpoints = rt722_endpoints,
+               .num_endpoints = ARRAY_SIZE(jack_amp_g1_dmic_endpoints),
+               .endpoints = jack_amp_g1_dmic_endpoints,
                .name_prefix = "rt722"
        }
 };
@@ -394,8 +393,8 @@ static const struct snd_soc_acpi_link_adr arl_rt711_l0_rt1316_l3[] = {
 static const struct snd_soc_acpi_link_adr arl_rt722_l0_rt1320_l2[] = {
        {
                .mask = BIT(0),
-               .num_adr = ARRAY_SIZE(rt722_0_single_adr),
-               .adr_d = rt722_0_single_adr,
+               .num_adr = ARRAY_SIZE(rt722_0_agg_adr),
+               .adr_d = rt722_0_agg_adr,
        },
        {
                .mask = BIT(2),