[PATCH 1/2] ASoC: amd: acp: fix adr_device naming in ACP7.x ACPI match table
From: Vijendar Mukunda
Date: Fri Nov 06 2026 - 07:07:17 EST
Rename the three rt721/rt722 adr_device arrays to encode their
endpoint set rather than their structural role:
rt721_l0_single_adr -> rt721_l0_jack_dmic_adr
rt721_l0_only -> rt721_l0_jack_amp_dmic_adr
rt722_l0_single_adr -> rt722_l0_jack_amp_dmic_adr
The old names (_single_adr vs _only) did not indicate which endpoint
set each entry uses. The new names make it immediately clear that
rt721_l0_jack_dmic_adr carries jack+dmic endpoints (used in combo
configs where RT1320 provides amplification) while both
*_jack_amp_dmic_adr variants carry the full jack+amp+dmic set for
standalone configurations. Update all four call sites accordingly.
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
---
sound/soc/amd/acp/amd-acp7x-acpi-match.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sound/soc/amd/acp/amd-acp7x-acpi-match.c b/sound/soc/amd/acp/amd-acp7x-acpi-match.c
index 830c59966a35..bf11ceb7478b 100644
--- a/sound/soc/amd/acp/amd-acp7x-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp7x-acpi-match.c
@@ -57,7 +57,7 @@ static const struct snd_soc_acpi_endpoint jack_amp_dmic_endpoints[] = {
},
};
-static const struct snd_soc_acpi_adr_device rt721_l0_single_adr[] = {
+static const struct snd_soc_acpi_adr_device rt721_l0_jack_dmic_adr[] = {
{
.adr = 0x000030025d072101ull,
.num_endpoints = ARRAY_SIZE(jack_dmic_endpoints),
@@ -66,7 +66,7 @@ static const struct snd_soc_acpi_adr_device rt721_l0_single_adr[] = {
}
};
-static const struct snd_soc_acpi_adr_device rt721_l0_only[] = {
+static const struct snd_soc_acpi_adr_device rt721_l0_jack_amp_dmic_adr[] = {
{
.adr = 0x000030025d072101ull,
.num_endpoints = ARRAY_SIZE(jack_amp_dmic_endpoints),
@@ -78,13 +78,13 @@ static const struct snd_soc_acpi_adr_device rt721_l0_only[] = {
static const struct snd_soc_acpi_link_adr acp7x_rt721_only[] = {
{
.mask = BIT(0),
- .num_adr = ARRAY_SIZE(rt721_l0_only),
- .adr_d = rt721_l0_only,
+ .num_adr = ARRAY_SIZE(rt721_l0_jack_amp_dmic_adr),
+ .adr_d = rt721_l0_jack_amp_dmic_adr,
},
{}
};
-static const struct snd_soc_acpi_adr_device rt722_l0_single_adr[] = {
+static const struct snd_soc_acpi_adr_device rt722_l0_jack_amp_dmic_adr[] = {
{
.adr = 0x000030025d072201ull,
.num_endpoints = ARRAY_SIZE(jack_amp_dmic_endpoints),
@@ -96,8 +96,8 @@ static const struct snd_soc_acpi_adr_device rt722_l0_single_adr[] = {
static const struct snd_soc_acpi_link_adr acp7x_rt722_only[] = {
{
.mask = BIT(0),
- .num_adr = ARRAY_SIZE(rt722_l0_single_adr),
- .adr_d = rt722_l0_single_adr,
+ .num_adr = ARRAY_SIZE(rt722_l0_jack_amp_dmic_adr),
+ .adr_d = rt722_l0_jack_amp_dmic_adr,
},
{}
};
@@ -123,8 +123,8 @@ static const struct snd_soc_acpi_adr_device rt1320_l3_single_adr[] = {
static const struct snd_soc_acpi_link_adr acp7x_rt721_l0_rt1320_l1[] = {
{
.mask = BIT(0),
- .num_adr = ARRAY_SIZE(rt721_l0_single_adr),
- .adr_d = rt721_l0_single_adr,
+ .num_adr = ARRAY_SIZE(rt721_l0_jack_dmic_adr),
+ .adr_d = rt721_l0_jack_dmic_adr,
},
{
.mask = BIT(1),
@@ -137,8 +137,8 @@ static const struct snd_soc_acpi_link_adr acp7x_rt721_l0_rt1320_l1[] = {
static const struct snd_soc_acpi_link_adr acp7x_rt721_l0_rt1320_l3[] = {
{
.mask = BIT(0),
- .num_adr = ARRAY_SIZE(rt721_l0_single_adr),
- .adr_d = rt721_l0_single_adr,
+ .num_adr = ARRAY_SIZE(rt721_l0_jack_dmic_adr),
+ .adr_d = rt721_l0_jack_dmic_adr,
},
{
.mask = BIT(3),
--
2.53.0