From patchwork Wed Nov 8 13:03:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118254 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5261382qgn; Wed, 8 Nov 2017 05:05:17 -0800 (PST) X-Google-Smtp-Source: ABhQp+S6XW/BeU9wJXWO5yZqWlgeTg7ykdBCJLEgrp9kTppStlG12A7icCqX7/nbJxr2zyboPg1x X-Received: by 10.98.163.84 with SMTP id s81mr484854pfe.64.1510146317204; Wed, 08 Nov 2017 05:05:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510146317; cv=none; d=google.com; s=arc-20160816; b=rCg/RVLAhEG0dz9IYRmljKvne0kYGUrWuGrRJ45awQgqca2ak8v8sMOA/odn0tmC9d lcPZCR4jK6WAXDgduxpNbEqFwmEKL4ueh54uh4azaI/wZYo4X4u4gw1rN+VisRea+8UF fny3Q6FSSzFJGdkf0lfL9xAvKkRmFFafgEkZNseL+zf1T8Ak9wVM2riaXF3RQa7zuOqf 2tmdLH81x6MLP9hVORqgbebu9MsmrTQyaTxNerTXdLzJzeG39zkxGv5kWaUQNW6j5Te9 OfiZXx9Pn7l738O0r0Lgk60HToAnU+gRMrOm3HPbcLj/3IW3dnwsfjpI/W4OkHbkV69q sdhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=5oxCRqe0pMXztU+wPM2sENFqrudtZodliqOfbqImQgQ=; b=NfxPUn8dWbl3BSnguLYxo99tRYkqIhucDJsP5Bll6cITDFRmb5CHCX6ESwozb7wNZa q4ntwAw83qR/SRqMSY3MCexfoF8gbRo/XNe5rd3hJTO3JojNXGm0WRwM8FsZzZn/5FRJ 36RrJzvDmFRMp2NaDaQB0Jv+bIPlzXryyXILxp2YylEtBYW9lIdmSmEdoTT2WThDB42R 8q/usQhi9rrjGLdLilq2BaAhdr3vpzrwe0p+sDwVNcpf+ImLsQQ/xL0hSAn+RKVCZsoF //6iR0cDQzFoyT5rVxiZ3zs+0wsU2M8Fd5C0YqSO4Bi9eaYwsR1dB7cwp16+ZaYftDn7 V3kw== 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 d6si3663356plo.114.2017.11.08.05.05.16; Wed, 08 Nov 2017 05:05:17 -0800 (PST) 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 S1752606AbdKHNFP (ORCPT + 21 others); Wed, 8 Nov 2017 08:05:15 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:55512 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752076AbdKHNFN (ORCPT ); Wed, 8 Nov 2017 08:05:13 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MNN9N-1eIlob0Rdx-006v5u; Wed, 08 Nov 2017 14:04:20 +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 2/2] ASoC: Intel: improve SND_SOC_INTEL_MACH dependencies Date: Wed, 8 Nov 2017 14:03:20 +0100 Message-Id: <20171108130354.86106-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171108130354.86106-1-arnd@arndb.de> References: <20171108130354.86106-1-arnd@arndb.de> X-Provags-ID: V03:K0:ONgflCtY3eKw5wxMzyppcNu5koytx/RIQPHFYdnwjeMZa6ujw2Z hRAxzgKCEDHX1zz94Llcd4mQLHuXWfNXMJiN0rtjRDhmk1l2f0Ki7+C2sY7LyS8GgAmjPT4 aOq0M1QSEPge2pFU4Dm9O7dnXu9rOCA//FCYenWlqieZk/OQrys2KjA3p2UoMhFz+QqGwTP SvHrgFkXA9SprCvOL9WeQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:dZnBVejxmXc=:j8PTrsQpLJEL2IpZREHYup EZCixpqy/Sy1bEb4N9VcekGBo8kt3m5oNduEqzWig40k6ZrEhJSiYEggF0AtySfgEp9EuFCxQ nGw7tT7PztnMmxtZ9qLe7CfN1nulv8aRPakr25s83+tI58Lq4tVr9QjezvIcoKHWwj/J8O8zs noyO6+hkyE9ArjnwQkYQyrMt5t7B7jR1HfzK5V2ZkJeU4axTWTAzTHCzd6b/qBldA4ls5Plgt xstLipH/SPrMCkPaWSwoAz6PIzH0c/+nqPPr7XB9hlJLw0Ev1Y1rO1T4pxx1H/Zp8dtpf+YBF p/hBdAe6pQS+CJbAQxSFfW6o08aIeYTI9TKaE5frFx3GlBkxVkUqKdlWdxeXs8WJTo6VJcfTh ezqjIHnmGYwuOqC5cLSDbkNoE54ZBzH9BnT+WzP2Zxt4BRH76WTM7yhWqApSaNhDf/2bGdMCJ cE0vfEAsbl5g5T7ekpCGUM5xzuKZ3ssW3dtdoG/rjpUU3JVbp3ki8GwLRNX+4j73yBbE+dYlv /LMfv2JqQqU1NfrGJuS0Eef8s3CbIy3Ew6rNqBugwPLYzw0ywh6s3zhaCpZ0YaIXEtDceH725 YSrU9ksaBxJxSdxYDIEMFGbHhZGkB2ppt2/Z6qnlPrwFI8nq3VwLksNfyoAndVJlXq3XT5H/M A6IiOTbgrBh5QW+/gCo3rp0ddoUBUmyZdmKo6D0+RclI1v868sHjz43Swdy8XZak1GQePyrQ4 qKYBzMNCS0Q5xK77fkLpEsQoSH7jpOq3argURg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I ran into a build error with CONFIG_SND_SOC_INTEL_COMMON=m and SND_SOC_INTEL_MACH=y: ERROR: "snd_soc_acpi_intel_broadwell_machines" [sound/soc/intel/common/snd-soc-sst-acpi.ko] undefined! ERROR: "snd_soc_acpi_intel_haswell_machines" [sound/soc/intel/common/snd-soc-sst-acpi.ko] undefined! ERROR: "snd_soc_acpi_intel_cherrytrail_machines" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "snd_soc_acpi_intel_baytrail_machines" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! The problem here is that the sound/soc/intel/common/ directory is then entered only for building modules, but the sst-acpi.o never gets built since it depends on a built-in Kconfig symbol. That configuration obviously makes no sense since all options below SND_SOC_INTEL_MACH also depend on something else that in turn depends on CONFIG_SND_SOC_INTEL_COMMON. Adding a SND_SOC_INTEL_SST_TOPLEVEL dependency to SND_SOC_INTEL_MACH solves the build error. I notice we can also consolidate the 'depends on SND_SOC_INTEL_MACH' lines by using an 'if' block to simplify it further and make sure the configuration stays sane. Signed-off-by: Arnd Bergmann --- sound/soc/intel/boards/Kconfig | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) -- 2.9.0 Acked-By: Vinod Koul Reviewed-by: Pierre-Louis Bossart diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 5063f15b4ca4..6f754708a48c 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -1,10 +1,12 @@ config SND_SOC_INTEL_MACH tristate "Intel Audio machine drivers" + depends on SND_SOC_INTEL_SST_TOPLEVEL select SND_SOC_ACPI_INTEL_MATCH if ACPI +if SND_SOC_INTEL_MACH + config SND_MFLD_MACHINE tristate "SOC Machine Audio driver for Intel Medfield MID platform" - depends on SND_SOC_INTEL_MACH depends on INTEL_SCU_IPC select SND_SOC_SN95031 depends on SND_SST_ATOM_HIFI2_PLATFORM @@ -17,7 +19,6 @@ config SND_MFLD_MACHINE config SND_SOC_INTEL_HASWELL_MACH tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM depends on SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 @@ -29,7 +30,6 @@ config SND_SOC_INTEL_HASWELL_MACH config SND_SOC_INTEL_BDW_RT5677_MACH tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && GPIOLIB && I2C depends on SND_SOC_INTEL_HASWELL select SND_SOC_RT5677 @@ -39,7 +39,6 @@ config SND_SOC_INTEL_BDW_RT5677_MACH config SND_SOC_INTEL_BROADWELL_MACH tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM depends on SND_SOC_INTEL_HASWELL select SND_SOC_RT286 @@ -51,7 +50,6 @@ config SND_SOC_INTEL_BROADWELL_MACH config SND_SOC_INTEL_BYT_MAX98090_MACH tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C depends on SND_SST_IPC_ACPI = n depends on SND_SOC_INTEL_BAYTRAIL @@ -62,7 +60,6 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH config SND_SOC_INTEL_BYT_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C depends on SND_SST_IPC_ACPI = n depends on SND_SOC_INTEL_BAYTRAIL @@ -74,7 +71,6 @@ config SND_SOC_INTEL_BYT_RT5640_MACH config SND_SOC_INTEL_BYTCR_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec" - depends on SND_SOC_INTEL_MACH depends on X86 && I2C && ACPI select SND_SOC_RT5640 depends on SND_SST_ATOM_HIFI2_PLATFORM @@ -87,7 +83,6 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH config SND_SOC_INTEL_BYTCR_RT5651_MACH tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec" - depends on SND_SOC_INTEL_MACH depends on X86 && I2C && ACPI select SND_SOC_RT5651 depends on SND_SST_ATOM_HIFI2_PLATFORM @@ -100,7 +95,6 @@ config SND_SOC_INTEL_BYTCR_RT5651_MACH config SND_SOC_INTEL_CHT_BSW_RT5672_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_RT5670 depends on SND_SST_ATOM_HIFI2_PLATFORM @@ -113,7 +107,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5672_MACH config SND_SOC_INTEL_CHT_BSW_RT5645_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_RT5645 depends on SND_SST_ATOM_HIFI2_PLATFORM @@ -125,7 +118,6 @@ config SND_SOC_INTEL_CHT_BSW_RT5645_MACH config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_MAX98090 select SND_SOC_TS3A227E @@ -138,7 +130,6 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH config SND_SOC_INTEL_BYT_CHT_DA7213_MACH tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_DA7213 depends on SND_SST_ATOM_HIFI2_PLATFORM @@ -150,7 +141,6 @@ config SND_SOC_INTEL_BYT_CHT_DA7213_MACH config SND_SOC_INTEL_BYT_CHT_ES8316_MACH tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && ACPI select SND_SOC_ES8316 depends on SND_SST_ATOM_HIFI2_PLATFORM @@ -162,7 +152,6 @@ config SND_SOC_INTEL_BYT_CHT_ES8316_MACH config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && ACPI depends on SND_SST_ATOM_HIFI2_PLATFORM select SND_SST_IPC_ACPI @@ -174,7 +163,6 @@ config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH config SND_SOC_INTEL_SKL_RT286_MACH tristate "ASoC Audio driver for SKL with RT286 I2S mode" - depends on SND_SOC_INTEL_MACH depends on X86 && ACPI && I2C depends on SND_SOC_INTEL_SKYLAKE select SND_SOC_RT286 @@ -188,7 +176,6 @@ config SND_SOC_INTEL_SKL_RT286_MACH config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C depends on SND_SOC_INTEL_SKYLAKE select SND_SOC_NAU8825 @@ -203,7 +190,6 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C depends on SND_SOC_INTEL_SKYLAKE select SND_SOC_NAU8825 @@ -218,7 +204,6 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode" - depends on SND_SOC_INTEL_MACH depends on X86 && ACPI && I2C depends on SND_SOC_INTEL_SKYLAKE select SND_SOC_DA7219 @@ -234,7 +219,6 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH config SND_SOC_INTEL_BXT_RT298_MACH tristate "ASoC Audio driver for Broxton with RT298 I2S mode" - depends on SND_SOC_INTEL_MACH depends on X86 && ACPI && I2C depends on SND_SOC_INTEL_SKYLAKE select SND_SOC_RT298 @@ -249,7 +233,6 @@ config SND_SOC_INTEL_BXT_RT298_MACH config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C select SND_SOC_INTEL_SST depends on SND_SOC_INTEL_SKYLAKE @@ -265,7 +248,6 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode" - depends on SND_SOC_INTEL_MACH depends on X86_INTEL_LPSS && I2C && SPI select SND_SOC_INTEL_SST depends on SND_SOC_INTEL_SKYLAKE @@ -279,3 +261,5 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH create an alsa sound card for RT5663 + RT5514 + MAX98927. Say Y if you have such a device. If unsure select "N". + +endif