On 27. 11. 24 12:22, Venkata Prasad Potturu wrote:
Add condition check to register ACP PDM sound card by reading _WOV acpi entry.
Fixes: 5426f506b584 ("ASoC: amd: Add support for enabling DMIC on acp6x via _DSD")
Signed-off-by: Venkata Prasad Potturu venkataprasad.potturu@amd.com
sound/soc/amd/yc/acp6x-mach.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 438865d5e376..c301dac8b979 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -523,8 +523,14 @@ static int acp6x_probe(struct platform_device *pdev) struct acp6x_pdm *machine = NULL; struct snd_soc_card *card; struct acpi_device *adev;
acpi_handle handle;
acpi_integer dmic_status; int ret;
bool is_dmic_enable, wov_en;
/* IF WOV entry not found, enable dmic based on AcpDmicConnected entry*/
is_dmic_enable = false;
wov_en = true; /* check the parent device's firmware node has _DSD or not */ adev = ACPI_COMPANION(pdev->dev.parent); if (adev) {
@@ -532,9 +538,19 @@ static int acp6x_probe(struct platform_device *pdev)
if (!acpi_dev_get_property(adev, "AcpDmicConnected", ACPI_TYPE_INTEGER, &obj) && obj->integer.value == 1)
platform_set_drvdata(pdev, &acp6x_card);
is_dmic_enable = true;}
handle = ACPI_HANDLE(pdev->dev.parent);
ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);
if (!ACPI_FAILURE(ret))
wov_en = dmic_status;if (is_dmic_enable && wov_en)
platform_set_drvdata(pdev, &acp6x_card);else
return 0;
The logic seems wrong. The overrides code bellow won't be executed when ACPI _WOV data are not set. I think that it may cause regressions for some BIOS versions.
Also, the return code should be probably -ENODEV.
Jaroslav