From patchwork Mon Oct 10 12:33:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101710 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1176077qge; Mon, 10 Oct 2016 05:34:33 -0700 (PDT) X-Received: by 10.202.89.136 with SMTP id n130mr3671929oib.29.1476102873120; Mon, 10 Oct 2016 05:34:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l125si2403301oia.86.2016.10.10.05.34.28; Mon, 10 Oct 2016 05:34:33 -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 S1752161AbcJJMe0 (ORCPT + 27 others); Mon, 10 Oct 2016 08:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:58528 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041AbcJJMeZ (ORCPT ); Mon, 10 Oct 2016 08:34:25 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0LuYaa-1atwfG0hoO-00zm6o; Mon, 10 Oct 2016 14:33:50 +0200 From: Arnd Bergmann To: Mark Brown Cc: John Keeping , Genki Marshall , Tom Rini , Arnd Bergmann , Liam Girdwood , Vinod Koul , Pierre-Louis Bossart , Jie Yang , Jeeja KP , Sathyanarayana Nujella , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: Intel: haswell depends on sst-firmware Date: Mon, 10 Oct 2016 14:33:20 +0200 Message-Id: <20161010123345.1363113-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:nqCHJiZWJBKB+Si1Ilu5HowRShwAnWYXOpBb08DNTLPsKHCsWyP O3PxJ+BAyfI+KIzB2a3OeOvGKn17ok9VvU3nARXKvT5zAxeuzUcT86GzwCetOOiOKlsgbkb KqUFjh8/k/1LAkWBxlx23jXYJVpNFaEXSDQGLpWXGf9CcruR/SA5wNKFw7tVx5qK4+e8WIA UAj2g402NiPOpwSxtTnyw== X-UI-Out-Filterresults: notjunk:1; V01:K0:VzNvP46p1C0=:4pnsP0nlj7vLkL2ZzrFBs6 jdNkbkE8ktiO4ptbFz3TDgDqVBNKAOd/YlkwxMhc7vxGlccChUtC7C7BI47jtQABNXa38OyBu QpQFNSqMYcWLYx2KQ3wnPQh0G+lKFgPvIrHJUfi2iKlUvl0rvcW3Ksym7b6k1NXy3w8zwA7hb AFXpo37D5PBXtNVcIwa9iIbVKcUFmhlph35u6XICOledZf2ankwdMY42wTIXhHieHZqZhCzIX 05+iUPmnf0qqc+xiLVEHwOs9VsE8aaMwp8gltl60+uN2inMgEjUKBlXIsmJ7pFzqkBsGMXTnx growB9mxfLd7Ia5sW0Mtcc+5G37bSzWKcezG1TaA3qSiVSRhGU8fl1DHIqeDsj22wRYxMdXto kPgYAE88SZe5OEsn4tQV0xJDQ5gYSBvYtQqsBxVYXWJTC05irRpVocih4HxKcwMYswN0RXrZJ /Q3M8G4xRqBMF/scg5iLIBlFWevFK2sddljcUisXPISMVqRbKyJ44Ib6fwEYh83gf3gKigJBy dxM4FU2KWRYY6zx6yJ+3v7v1UwDaCQCMcp/tVRL3qrK169IvTAGpDVnyacd8I/nLPysplBB2F 86pVrJrUCZUWn8aPqTJsDyktunwI1WWxfvdBVBG7oouwT6cgugBaJyVYX2zgu4DgwiP/v2E33 Xjd2MHrZJyT4D0ddlYT0g458VlXymVm9YDarS2XcraeNlU9DM6f+u//uT7UC7YqXf/3w= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Intel Haswell audio support fails to link if CONFIG_SND_SOC_INTEL_SST_FIRMWARE is disabled: sst-haswell-dsp.c: undefined reference to `sst_mem_block_register' sst-haswell-dsp.c: undefined reference to `sst_mem_block_unregister_all' sst-haswell-dsp.c: undefined reference to `sst_module_alloc_blocks' sst-haswell-dsp.c: undefined reference to `sst_module_free' sst-haswell-dsp.c: undefined reference to `sst_module_new' sst-haswell-pcm.c: undefined reference to `sst_module_get_from_id' sst-haswell-pcm.c: undefined reference to `sst_module_runtime_restore' sst-haswell-pcm.c: undefined reference to `sst_module_runtime_save' ERROR: "sst_block_alloc_scratch" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_block_free_scratch" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_copyfrom" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_copyto" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_get_channel" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_dma_put_channel" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_free" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_get_offset" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_dsp_new" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_free_all" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_new" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_reload" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_fw_unload" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_module_runtime_alloc_blocks" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_module_runtime_get_from_id" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! ERROR: "sst_module_runtime_new" [sound/soc/intel/haswell/snd-soc-sst-haswell-pcm.ko] undefined! This moves the 'select' statement from two of the three haswell based users into the line that is used by all of them, so make it harder to get wrong and to fix the existing randconfig regressions. Fixes: 2d995e5dc283 ("ASoC: Intel: boards: Add bdw-rt5677 machine driver") Signed-off-by: Arnd Bergmann --- sound/soc/intel/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.0 diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 26eb5a0a5575..fd5d1e091038 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -47,6 +47,7 @@ config SND_SOC_INTEL_SST_MATCH config SND_SOC_INTEL_HASWELL tristate + select SND_SOC_INTEL_SST_FIRMWARE config SND_SOC_INTEL_BAYTRAIL tristate @@ -56,7 +57,6 @@ config SND_SOC_INTEL_HASWELL_MACH depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM depends on DW_DMAC_CORE select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help @@ -138,7 +138,6 @@ config SND_SOC_INTEL_BROADWELL_MACH I2C_DESIGNWARE_PLATFORM depends on DW_DMAC_CORE select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT286 help