Commit 0b383620 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: amd: acp: add ACPI dependency

A newly added function requires CONFIG_ACPI to avoid a build error:

sound/soc/amd/acp/acp-legacy-common.c: In function 'check_acp_pdm':
sound/soc/amd/acp/acp-legacy-common.c:401:19: error: implicit declaration of function 'acpi_find_child_device'; did you mean 'acpi_match_device'? [-Werror=implicit-function-declaration]
  401 |         pdm_dev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), pdm_addr, 0);
      |                   ^~~~~~~~~~~~~~~~~~~~~~
      |                   acpi_match_device

The acp drivers really only work when ACPI is enabled already, so just
avoid the build failure with hard dependency in everything that
enables the acp-legacy-common portion.

Fixes: 3a94c8ad ("ASoC: amd: acp: add code for scanning acp pdm controller")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20231027152403.386257-1-arnd@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 60781d2d
...@@ -30,13 +30,15 @@ config SND_SOC_AMD_ACP_PCM ...@@ -30,13 +30,15 @@ config SND_SOC_AMD_ACP_PCM
config SND_SOC_AMD_ACP_PCI config SND_SOC_AMD_ACP_PCI
tristate "AMD ACP PCI Driver Support" tristate "AMD ACP PCI Driver Support"
select SND_SOC_AMD_ACP_LEGACY_COMMON
depends on X86 && PCI depends on X86 && PCI
depends on ACPI
select SND_SOC_AMD_ACP_LEGACY_COMMON
help help
This options enables generic PCI driver for ACP device. This options enables generic PCI driver for ACP device.
config SND_AMD_ASOC_RENOIR config SND_AMD_ASOC_RENOIR
tristate "AMD ACP ASOC Renoir Support" tristate "AMD ACP ASOC Renoir Support"
depends on ACPI
select SND_SOC_AMD_ACP_PCM select SND_SOC_AMD_ACP_PCM
select SND_SOC_AMD_ACP_I2S select SND_SOC_AMD_ACP_I2S
select SND_SOC_AMD_ACP_PDM select SND_SOC_AMD_ACP_PDM
...@@ -47,6 +49,7 @@ config SND_AMD_ASOC_RENOIR ...@@ -47,6 +49,7 @@ config SND_AMD_ASOC_RENOIR
config SND_AMD_ASOC_REMBRANDT config SND_AMD_ASOC_REMBRANDT
tristate "AMD ACP ASOC Rembrandt Support" tristate "AMD ACP ASOC Rembrandt Support"
depends on ACPI
select SND_SOC_AMD_ACP_PCM select SND_SOC_AMD_ACP_PCM
select SND_SOC_AMD_ACP_I2S select SND_SOC_AMD_ACP_I2S
select SND_SOC_AMD_ACP_PDM select SND_SOC_AMD_ACP_PDM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment