From patchwork Thu Nov 2 11:07:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10038443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB3FB60291 for ; Thu, 2 Nov 2017 11:08:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D10F928DD6 for ; Thu, 2 Nov 2017 11:08:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5B2728F06; Thu, 2 Nov 2017 11:08:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C27128DD6 for ; Thu, 2 Nov 2017 11:08:32 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4258E267446; Thu, 2 Nov 2017 12:08:10 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2775C267438; Thu, 2 Nov 2017 12:08:08 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by alsa0.perex.cz (Postfix) with ESMTP id D0E67267439 for ; Thu, 2 Nov 2017 12:08:04 +0100 (CET) Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MPXo9-1e64bv3Ryr-004oBQ; Thu, 02 Nov 2017 12:07:42 +0100 From: Arnd Bergmann To: Mark Brown Date: Thu, 2 Nov 2017 12:07:04 +0100 Message-Id: <20171102110737.2813128-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:SBUpVqyVYv6FpHB7qmKnYMn2D5+JfiSDgLa9STewXFAJ+xwK+t4 R8e+s78tuZW7ptVhSU0rq71U2J0dFFF24p3Jv7d5D9KQ3QAdg9hSNc6aAoT/HYPvSKM+dX4 r2ELg9+MSFz1ldjYccmK/NuMA5rpc0hXyay+IYXh4ozm9f6R15ag6/A3mftCv8a1fcpey50 D4LcE5ZgCWW1SWtji6gJg== X-UI-Out-Filterresults: notjunk:1; V01:K0:hDW37wINtiY=:nPYHQJvHgBHEi3iP/r59l8 qENXuSr/Nyr3J3+qFf+BhymHDG8USm5Ua0fDyZdaX68s4BXB5ZE5R9npIpVTMEiA2JP44J3LO eWTc39qsf/bmkDLOH+19smomKJhp/T6GKu/GYkPdFjKFYv+8st6hoBus4TT1gCcgFPJlaZd/P rAIbuLNDWYiVmZjV3eQMS5Ak08mrQvwrj9tnOo1czvNsARGaRm4r/AyjJaBN/03JSRHvoPYb+ myXJmHnqlIUcdGjer/duAeuvbXXMNg/c/r00xVKoQzoXo00NVQw31OLu5uSw8jP68vHyaX0XA Ax8tu/cy1XfMK0vDj6CUoIbd0hgtGR3kFKehGGr+kmsoss3vdKj59fX+chC+NF6q6wuyfdbjL UYnevwsrpP0IWOPO55wt+4bHeGmeToa8QBYkUzLzD5ANgHPqWESRGroIeCDdr/pumpS7gME7z k6hh29GTsN5fzuZF3D/N7VddIfR3kORUrHaWsiWDxoKKUVEa0TbtOpSPqjq9ruLcCdBq0TzKl Kq9+rBYkgr8Y2B9/YF1AcQBCHORd/vgOpw1ksvlnmqXy1RRCbK9O0LjYP8KgxiJzv6Se7NssH SpQZpMECRFMBRToaYb0oTXK7S+VgZqcMsmW15f1HaJBxYznN6mTI2pLe7pGkk7L5ynqiIV0W7 j8Eqsv2XEBLsTDC22mmJJBFo4RCA1XrQcZeJ9dh96qwiWosTRJmDMsgN4e09+Uxf7d7nLyGJN KH/gejoyC4MIuzQIJu0qJjuaQP7I/aN+igpsSA== Cc: alsa-devel@alsa-project.org, Andy Shevchenko , Arnd Bergmann , Liam Girdwood , Vinod Koul , linux-kernel@vger.kernel.org, Pierre-Louis Bossart , Takashi Iwai , Harsha Priya N , Naveen M Subject: [alsa-devel] [PATCH] ASoC: Intel: fix Kconfig dependencies X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP I ran into multiple problems during randconfig builds of the recently changed Kconfig logic for Intel ASoC drivers: - Building without DMADEVICES doesn't work in general - With that dependency added, we can relax the 'depends on X86' again and allow compile-testing, except for SND_SST_ATOM_HIFI2_PLATFORM, which depends on X86 for asm/platform_sst_audio.h - Skylake requires SND_SOC_INTEL_SST_ACPI, so we have to depend on ACPI in turn - Haswell needs SND_DMA_SGBUF for snd_sgbuf_aligned_pages() With the new set of dependencies, I no longer get any build failures. Signed-off-by: Arnd Bergmann --- sound/soc/intel/Kconfig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index a59dda39007e..e18118209b75 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -31,13 +31,14 @@ config SND_SOC_ACPI_INTEL_MATCH config SND_SOC_INTEL_SST_TOPLEVEL tristate "Intel ASoC SST drivers" - depends on X86 + depends on X86 || COMPILE_TEST + depends on DMADEVICES select SND_SOC_INTEL_MACH select SND_SOC_INTEL_COMMON config SND_SOC_INTEL_HASWELL tristate "Intel ASoC SST driver for Haswell/Broadwell" - depends on SND_SOC_INTEL_SST_TOPLEVEL + depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_FIRMWARE @@ -49,12 +50,12 @@ config SND_SOC_INTEL_BAYTRAIL config SND_SST_ATOM_HIFI2_PLATFORM tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)" - depends on SND_SOC_INTEL_SST_TOPLEVEL + depends on SND_SOC_INTEL_SST_TOPLEVEL && X86 select SND_SOC_COMPRESS config SND_SOC_INTEL_SKYLAKE tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL" - depends on SND_SOC_INTEL_SST_TOPLEVEL + depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI select SND_HDA_EXT_CORE select SND_HDA_DSP_LOADER select SND_SOC_TOPOLOGY