[PATCH 0/2] ASoC: amd: acp: update dmic_num logic for acp pdm dmic

[PATCH 0/2] ASoC: amd: acp: update dmic_num logic for acp pdm dmic

[Vijendar Mukunda]

This patch series updates the dmic_num logic for acp pdm dmic and
renames the dmic component name in acp soundwire legacy machine driver.

Vijendar Mukunda (2):
  ASoC: amd: acp: update dmic_num logic for acp pdm dmic
  ASoC: amd: acp-sdw-legacy: rename the dmic component name

 sound/soc/amd/acp/acp-sdw-legacy-mach.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.48.1

[PATCH 1/2] ASoC: amd: acp: update dmic_num logic for acp pdm dmic

[Vijendar Mukunda]

Currently there is no mechanism to read dmic_num in mach_params
structure. In this scenario mach_params->dmic_num check always
returns 0 which fails to add component string for dmic.
Update the condition check with acp pdm dmic quirk check and
pass the dmic_num as 1.

Fixes: 2981d9b0789c ("ASoC: amd: acp: add soundwire machine driver for legacy stack")

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/amd/acp/acp-sdw-legacy-mach.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/amd/acp/acp-sdw-legacy-mach.c b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
index 6388cd7cb28e..fa9b4b994e41 100644
--- a/sound/soc/amd/acp/acp-sdw-legacy-mach.c
+++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
@@ -535,11 +535,11 @@ static int mc_probe(struct platform_device *pdev)
 					  " cfg-amp:%d", amp_num);
 	if (!card->components)
 		return -ENOMEM;
-	if (mach->mach_params.dmic_num) {
+	if (soc_sdw_quirk & ASOC_SDW_ACP_DMIC) {
 		card->components = devm_kasprintf(card->dev, GFP_KERNEL,
 						  "%s mic:dmic cfg-mics:%d",
 						  card->components,
-						  mach->mach_params.dmic_num);
+						  1);
 		if (!card->components)
 			return -ENOMEM;
 	}
-- 
2.48.1

[PATCH 2/2] ASoC: amd: acp-sdw-legacy: rename the dmic component name

[Vijendar Mukunda]

For acp pdm dmic use case, user space needs a reliable identifier
to select the correct UCM configuration. Rename component string
as acp-dmic to select the correct UCM configuration for acp pdm dmic.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/amd/acp/acp-sdw-legacy-mach.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/amd/acp/acp-sdw-legacy-mach.c b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
index fa9b4b994e41..05484c72f9a8 100644
--- a/sound/soc/amd/acp/acp-sdw-legacy-mach.c
+++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
@@ -537,7 +537,7 @@ static int mc_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	if (soc_sdw_quirk & ASOC_SDW_ACP_DMIC) {
 		card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-						  "%s mic:dmic cfg-mics:%d",
+						  "%s mic:acp-dmic cfg-mics:%d",
 						  card->components,
 						  1);
 		if (!card->components)
-- 
2.48.1

Re: [PATCH 1/2] ASoC: amd: acp: update dmic_num logic for acp pdm dmic

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

On Mon, Mar 30, 2026 at 12:50:27PM +0530, Vijendar Mukunda wrote:

> +++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
> @@ -535,11 +535,11 @@ static int mc_probe(struct platform_device *pdev)
>  					  " cfg-amp:%d", amp_num);
>  	if (!card->components)
>  		return -ENOMEM;
> -	if (mach->mach_params.dmic_num) {
> +	if (soc_sdw_quirk & ASOC_SDW_ACP_DMIC) {

soc_card_dai_links_create() (which could perhaps use better namespacing)
checks both dmic_num and the quirk.  This doesn't seem properly joined
up (and perhaps the code shouldn't be as spread out as it is)?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 1/2] ASoC: amd: acp: update dmic_num logic for acp pdm dmic

[Mukunda,Vijendar]

On 30/03/26 19:13, Mark Brown wrote:
> On Mon, Mar 30, 2026 at 12:50:27PM +0530, Vijendar Mukunda wrote:
>
>> +++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
>> @@ -535,11 +535,11 @@ static int mc_probe(struct platform_device *pdev)
>>  					  " cfg-amp:%d", amp_num);
>>  	if (!card->components)
>>  		return -ENOMEM;
>> -	if (mach->mach_params.dmic_num) {
>> +	if (soc_sdw_quirk & ASOC_SDW_ACP_DMIC) {
> soc_card_dai_links_create() (which could perhaps use better namespacing)
> checks both dmic_num and the quirk.  This doesn't seem properly joined
> up (and perhaps the code shouldn't be as spread out as it is)?
Need to drop the mach_params->dmic_num check in soc_card_dai_links_create().
Will push a separate patch for the same.

Re: [PATCH 0/2] ASoC: amd: acp: update dmic_num logic for acp pdm dmic

[Mark Brown]

On Mon, 30 Mar 2026 12:50:26 +0530, Vijendar Mukunda wrote:
> ASoC: amd: acp: update dmic_num logic for acp pdm dmic
> 
> This patch series updates the dmic_num logic for acp pdm dmic and
> renames the dmic component name in acp soundwire legacy machine driver.
> 
> Vijendar Mukunda (2):
>   ASoC: amd: acp: update dmic_num logic for acp pdm dmic
>   ASoC: amd: acp-sdw-legacy: rename the dmic component name
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.1

Thanks!

[1/2] ASoC: amd: acp: update dmic_num logic for acp pdm dmic
      https://git.kernel.org/broonie/sound/c/5902e1f3c501
[2/2] ASoC: amd: acp-sdw-legacy: rename the dmic component name
      https://git.kernel.org/broonie/sound/c/371f6a1d2a97

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark