ASoC: amd: acp: add ACPI dependency
authorArnd Bergmann <arnd@arndb.de>
Fri, 27 Oct 2023 15:23:52 +0000 (17:23 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 27 Oct 2023 16:37:32 +0000 (17:37 +0100)
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: 3a94c8ad0aae ("ASoC: amd: acp: add code for scanning acp pdm controller")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20231027152403.386257-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/acp/Kconfig

index c0b2a2df8f80b437090d7d61d6c956fbfa541b33..b0e4d5117b811dbffbf766117240f26f064ef2dc 100644 (file)
@@ -30,13 +30,15 @@ config SND_SOC_AMD_ACP_PCM
 
 config SND_SOC_AMD_ACP_PCI
        tristate "AMD ACP PCI Driver Support"
-       select SND_SOC_AMD_ACP_LEGACY_COMMON
        depends on X86 && PCI
+       depends on ACPI
+       select SND_SOC_AMD_ACP_LEGACY_COMMON
        help
          This options enables generic PCI driver for ACP device.
 
 config SND_AMD_ASOC_RENOIR
        tristate "AMD ACP ASOC Renoir Support"
+       depends on ACPI
        select SND_SOC_AMD_ACP_PCM
        select SND_SOC_AMD_ACP_I2S
        select SND_SOC_AMD_ACP_PDM
@@ -47,6 +49,7 @@ config SND_AMD_ASOC_RENOIR
 
 config SND_AMD_ASOC_REMBRANDT
        tristate "AMD ACP ASOC Rembrandt Support"
+       depends on ACPI
        select SND_SOC_AMD_ACP_PCM
        select SND_SOC_AMD_ACP_I2S
        select SND_SOC_AMD_ACP_PDM