diff mbox series

[SRU,OEM-5.6/G,4/5] ASoC: amd: add ACPI dependency check

Message ID 20200716012429.11957-5-hui.wang@canonical.com
State New
Headers show
Series improve the amd renoir audio driver to prepare to work with ucm3 | expand

Commit Message

Hui Wang July 16, 2020, 1:24 a.m. UTC 
From: Vijendar Mukunda <Vijendar.Mukunda@amd.com>

BugLink: https://bugs.launchpad.net/bugs/1887734

Add ACPI dependency for evaluating DMIC hardware
runtime.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/1594118813-18689-1-git-send-email-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 68d1abe186d1c865923d3b97414906f4697daf58
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 sound/soc/amd/renoir/rn-pci-acp3x.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c
index d1faea545f45..165c93fd89e4 100644
--- a/sound/soc/amd/renoir/rn-pci-acp3x.c
+++ b/sound/soc/amd/renoir/rn-pci-acp3x.c
@@ -218,6 +218,7 @@  static int snd_rn_acp_probe(struct pci_dev *pci,
 		ret = -ENODEV;
 		goto de_init;
 	} else if (dmic_acpi_check == ACP_DMIC_AUTO) {
+#if defined(CONFIG_ACPI)
 		handle = ACPI_HANDLE(&pci->dev);
 		ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);
 		if (ACPI_FAILURE(ret)) {
@@ -228,6 +229,7 @@  static int snd_rn_acp_probe(struct pci_dev *pci,
 			ret = -ENODEV;
 			goto de_init;
 		}
+#endif
 	}
 
 	adata->res = devm_kzalloc(&pci->dev,