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: 117782 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp1919462edm; Thu, 2 Nov 2017 04:09:42 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RUa1ariSzUKXc1zvi1JY27BvplBJRX/Jz9+mguy4fouKw5UWeSxLUXrGnwQ6BhFxQonAK1 X-Received: by 10.98.79.200 with SMTP id f69mr3336153pfj.159.1509620982783; Thu, 02 Nov 2017 04:09:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509620982; cv=none; d=google.com; s=arc-20160816; b=b1wglVYxoipCuy7+f6gIm07qIb98X6moUxVOvmhS1qNQuS78tYVGO8W6HJKjryqQ9K Sa1nyunM9W33Dj8IIxRJ4wNTC5Oc8eGTRh4KxFk2BaYdI3g1i0el+ptHSiSq54dlASek SPIr2yM7qtp9aEOR8Oeeuwc9H7JLCsYvcjbP+hKFsTQnxvK7ZmQvEBC2T6Z56f6D8FHi OxKtL6HAr3QT8vLXzuLO0VOJFN/yHwXX+d9sbpfxo5stqU2dr9bPcvEcwmYD0jkByPAb nwZHqsuJjQj2/rsfi73myYWmEMGBVEfN7EmhX6GUAI0rNHoh5Ro0hRrgxi2ZdkueKBkI gORw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=QSbcnXCBsqEEj4q74ZYeXT8Phxgf6HeTxgpz21uvnzQ=; b=HZveuSEXpc1EFP7VJfJejZk4ei/mvVmvSXGIdJ3p1I/w/oK5+XebZC9ANnlGqiaKpe 6++dFIH27W1EDmUlni3Bg1tkq69hd1gDrh9OZVnz44ryWkshPOgeIsOpL2+Ut10a9XEq WG5QTENoaLFhN1PUDRoSHBr/LJ+VKKnm2AHn5ZDuGZ75ALYxpRqImHZkGLP2EI/BlIqI Dd6lCTzzQJGJFHmA95f/swzZR90VmQIPuZGj+mi3UZmGLEsPHcFTBqqC5VSydMxXU5Vx z+qM585XVLcfzC4whtwu231MlCjlVFNCfnmj0WtLGNr3kWKLWicUuQxpyUGJ4Jx6W4Wu RxNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q5si3296377pgp.196.2017.11.02.04.09.42; Thu, 02 Nov 2017 04:09:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755840AbdKBLJl (ORCPT + 26 others); Thu, 2 Nov 2017 07:09:41 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:56933 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755536AbdKBLIP (ORCPT ); Thu, 2 Nov 2017 07:08:15 -0400 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 Cc: Arnd Bergmann , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Pierre-Louis Bossart , Vinod Koul , Andy Shevchenko , Harsha Priya N , Naveen M , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: Intel: fix Kconfig dependencies 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 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