From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
To: <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>, <lgirdwood@gmail.com>,
<perex@perex.cz>, <tiwai@suse.com>,
<pierre-louis.bossart@linux.dev>,
<yung-chuan.liao@linux.intel.com>, <Basavaraj.Hiregoudar@amd.com>,
<Sunil-kumar.Dommati@amd.com>, <venkataprasad.potturu@amd.com>,
<Syed.SabaKareem@amd.com>, <Mario.Limonciello@amd.com>,
<Richard.Gong@amd.com>, <Vijendar.Mukunda@amd.com>,
<Poojitha.N@amd.com>, <linux-sound@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 1/2] ASoC: amd: acp: fix adr_device naming in ACP7.x ACPI match table
Date: Fri, 6 Nov 2026 18:37:28 +0530 [thread overview]
Message-ID: <20261106130801.506026-2-Vijendar.Mukunda@amd.com> (raw)
In-Reply-To: <20261106130801.506026-1-Vijendar.Mukunda@amd.com>
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@amd.com>
---
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
next prev parent reply other threads:[~2026-11-06 13:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-06 13:07 [PATCH 0/2] ASoC: amd: acp: supplement patches for ACP7.B/7.F SoundWire machine driver series Vijendar Mukunda
2026-11-06 13:07 ` Vijendar Mukunda [this message]
2026-11-06 13:07 ` [PATCH 2/2] ASoC: amd: acp: document PDM controller topology for ACP7.B/7.F Vijendar Mukunda
2026-11-06 13:11 ` [PATCH 0/2] ASoC: amd: acp: supplement patches for ACP7.B/7.F SoundWire machine driver series Pierre-Louis Bossart
2026-11-06 14:20 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2026-10-30 9:45 [PATCH v4 00/16] ASoC: amd: acp: ACP7.B/7.F SoundWire machine driver support Vijendar Mukunda
2026-11-06 11:46 ` [PATCH 0/2] ASoC: amd: acp: supplement patches for ACP7.B/7.F SoundWire machine driver series Vijendar Mukunda
2026-11-06 11:46 ` [PATCH 1/2] ASoC: amd: acp: fix adr_device naming in ACP7.x ACPI match table Vijendar Mukunda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261106130801.506026-2-Vijendar.Mukunda@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=Basavaraj.Hiregoudar@amd.com \
--cc=Mario.Limonciello@amd.com \
--cc=Poojitha.N@amd.com \
--cc=Richard.Gong@amd.com \
--cc=Sunil-kumar.Dommati@amd.com \
--cc=Syed.SabaKareem@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.dev \
--cc=tiwai@suse.com \
--cc=venkataprasad.potturu@amd.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®