Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82AE238BCE for ; Fri, 27 Oct 2023 16:27:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bzOCpHyB"; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s7aS4m3A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 820C9C433C8 for ; Fri, 27 Oct 2023 16:27:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698424058; bh=kEkw3mT5ax9TK4lledPH/qOgSDVWEicwbZhmX0r6WA0=; h=Resent-From:Resent-Date:Resent-To:From:To:Cc:Date:Subject:From; b=bzOCpHyBYVf6sNn+lsTzZPQ20Ncznhr3YfdhqgPXe9AUvEthb8/FE7RTrElsb/HjD P6QijvOwxmHraLTjmZwf6fF8JFsOU3ZwMKUXmga16oR2tQoXTQMWoY9hr98ShfBYJL i/ZW3NVEkStzFz8Cnq26dKN4JOy0GnY5IZuchrrJZCwzCODKBzc/mqOov/R7/M7HPM eGU4DhgFedE7BMnWw2nYrXY9gi+ERKc7Vz5XLV9COSrOdz03aMYPUaSQ+h/xigF338 VJdeBDuYxD1MhB7FML28RoqH44j4DYyr2LIMaDITNuepB7CbEIjW0GqFJQN6slHolj wDVm2f4N5l7iQ== Resent-From: Mark Brown Resent-Date: Fri, 27 Oct 2023 17:27:34 +0100 Resent-Message-ID: Resent-To: patches@lists.linux.dev Envelope-to: broonie@sirena.co.uk Delivery-date: Fri, 27 Oct 2023 16:24:13 +0100 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by cassiel.sirena.org.uk with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qwOh1-00FfF9-1x for broonie@sirena.co.uk; Fri, 27 Oct 2023 16:24:13 +0100 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 1475561009 for ; Fri, 27 Oct 2023 15:24:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id C8ED0C433C8; Fri, 27 Oct 2023 15:24:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD276C433C7; Fri, 27 Oct 2023 15:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698420249; bh=kEkw3mT5ax9TK4lledPH/qOgSDVWEicwbZhmX0r6WA0=; h=From:To:Cc:Subject:Date:From; b=s7aS4m3AextXHTYeOf7pTDE+cmH03DexsvUQmfE4zI5I/scVBQA2mgziEJ8CU2y3H +hKzuNQpja4BeT9nxPOEpJCvdoUQ+gHLY4seVpQOWqtmjJn5WPBcC51b0BAfeoew+X Xn9hRIrbfyzsIykS25M4iTO7Ac5p962wOukK/cgjb/AVhRcRbg+CVf2ugXHFTD0nLN 9tX709Sx7UGwF6vv53UITcxZpe7sWwfY0+2uqzRdSUGt7ZV0K4ZWP+/Vdcde0nk/Sv p60oVpM/tlltIB5+SZ6yFRXCOQECWkv6Gmyx4KIcbDdXrtzhUrwzSNkQBpPRbhfe5s 4//numtfGvoYQ== From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Syed Saba Kareem , Venkata Prasad Potturu , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 27 Oct 2023 17:23:52 +0200 Message-Id: <20231027152403.386257-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2604:1380:4641:c500::1 X-SA-Exim-Mail-From: arnd@kernel.org Subject: [PATCH 1/3] ASoC: amd: acp: add ACPI dependency X-SA-Exim-Version: 4.2.1 (built Sat, 13 Feb 2021 17:57:42 +0000) X-SA-Exim-Scanned: No (on cassiel.sirena.org.uk); Unknown failure X-TUID: M3df/LhhV3RI From: Arnd Bergmann 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 --- sound/soc/amd/acp/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig index c0b2a2df8f80..b0e4d5117b81 100644 --- a/sound/soc/amd/acp/Kconfig +++ b/sound/soc/amd/acp/Kconfig @@ -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 -- 2.39.2