From patchwork Tue Apr 16 13:12:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10902987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DA8217E1 for ; Tue, 16 Apr 2019 13:13:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E96AE28358 for ; Tue, 16 Apr 2019 13:13:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA0D8288DA; Tue, 16 Apr 2019 13:13:49 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AD56628358 for ; Tue, 16 Apr 2019 13:13:47 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1697E85B; Tue, 16 Apr 2019 15:12:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1697E85B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1555420425; bh=IM8psFF4onnIVfMvfM9SRTYdv6TSBeELSPJPqT+iKfU=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=uMGo6PFYo0Rfz+A3yhWhKBHfQnKXYcZoYDlN7N80oZqQ013uFhvCU22ZXSti6MCMF YZuVjNtkMyslbIqWe4gWBaX0GfEuf1yOYq3XD1wTCSkI+Y1famQ9yudNy3gKDCHIj7 lylZRImD8+X5IN/wmKV73mqtW19dDhHU6f/cw7vE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6ACEBF896E3; Tue, 16 Apr 2019 15:12:54 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 21188F896E4; Tue, 16 Apr 2019 15:12:50 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 710E0F89614 for ; Tue, 16 Apr 2019 15:12:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 710E0F89614 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MDyoU-1h6W081KSK-009x0E; Tue, 16 Apr 2019 15:12:44 +0200 From: Arnd Bergmann To: Mark Brown Date: Tue, 16 Apr 2019 15:12:23 +0200 Message-Id: <20190416131242.1232143-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:lo7UpILhnUjahKQUzMx0hhOZaj8tlRqnUxInMnO4970rBZihFAd Q6+qcs5UL6fqyp38A5oD5MoWREFXriz25NtTWSn9o36XmxUvbVBJd2SgIuyOxhOWUxdX2DP cp0cS4OCK+ARYNPXyBW7chp6PbVGTpLugO4uu/Kq6B1zpWbaTa6EF+CtzMxBZe9CDqI338Z v+LVzlWrAINohJAcg85uA== X-UI-Out-Filterresults: notjunk:1;V03:K0:W7rEIcSTWOs=:tV2qJnFWm4UexhcqSh3KJX NBaEOlR9+H+7g0BC5yzESIW5OPA+E986MFpN2HQlwELuwsntUJAzv7w4NOgKjrVnu+dbO4tra 2xri4956DU37qJoxybc32+M2bU/aX68aLTPlhPmdm4gQJZCb6lAypA6tmi6riM/5Lvk4vkH2G IYS4tYV8MtTP/noNbkbYy0rKwVNLiYIg8FeRhQUrihtY+tZbrq/RdtozHJReWeIyd72sHEEoe jsh6PkmUPkDMTbgMD1WZ2aHODRtIu/Cdk4xny6qeKfexMdvVe6C21yYSuQJ3aeFXoDdyNYEvH Ijs1FMCuABxGbQ4l1V6sSAgwoclijevqwTZrnwcthae4DRIY0+XO9kpYJL0KFwLuPcJwQIvpJ pkjFJDlSU0uUbfHNHSVJi96qg/cKW8gzzkACd8SP7pzl0kGxAOEo82VoGlwbtm95iyFHR50ea CgJZPvvBHAUC3+8WM+pkght3/DjZwbW7Ryo/ZIM7JAdu6PiTBWh9XqXcTyYpKJkpoQPCCWjOJ sQErxqL91TBdoy7NqhkfFGJsr1Syt5vI91R12jFslUJbThIxoG3btOSk2MGx4NTIh5ERq5CVb 6kQrZJFMkR6NxWk8sT9bgdzYA8FLXvdR++eALMuggRh+PWOP+19VgF0DA3cLmNK057mpueAX0 /Ua7ksicjfE2+hqNnlH1sgONSiVhUOPtF6nzdEmv6nPVGAgfesTJdAjcv4i8gRBFKvpDWUYob bpDg2ZSJHjW4SPmzc0NxbFdeiSMD0bP67igstQ== Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Shawn Guo , Shengjiu Wang , Liam Girdwood , linux-kernel@vger.kernel.org, Cosmin Samoila , Fabio Estevam Subject: [alsa-devel] [PATCH] ASoC: imx: fix fiq dependencies X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP During randconfig builds, I occasionally run into an invalid configuration of the freescale FIQ sound support: WARNING: unmet direct dependencies detected for SND_SOC_IMX_PCM_FIQ Depends on [m]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_IMX_SOC [=m] Selected by [y]: - SND_SOC_FSL_SPDIF [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_IMX_SOC [=m]!=n && (MXC_TZIC [=n] || MXC_AVIC [=y]) sound/soc/fsl/imx-ssi.o: In function `imx_ssi_remove': imx-ssi.c:(.text+0x28): undefined reference to `imx_pcm_fiq_exit' sound/soc/fsl/imx-ssi.o: In function `imx_ssi_probe': imx-ssi.c:(.text+0xa64): undefined reference to `imx_pcm_fiq_init' The Kconfig warning is a result of the symbol being defined inside of the "if SND_IMX_SOC" block, and is otherwise harmless. The link error is more tricky and happens with SND_SOC_IMX_SSI=y, which may or may not imply FIQ support. However, if SND_SOC_FSL_SSI is set to =m at the same time, that selects SND_SOC_IMX_PCM_FIQ as a loadable module dependency, which then causes a link failure from imx-ssi. The solution here is to make SND_SOC_IMX_PCM_FIQ built-in whenever one of its potential users is built-in. Fixes: ff40260f79dc ("ASoC: fsl: refine DMA/FIQ dependencies") Signed-off-by: Arnd Bergmann --- sound/soc/fsl/Kconfig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 7b1d9970be8b..1f65cf555ebe 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -182,16 +182,17 @@ config SND_MPC52xx_SOC_EFIKA endif # SND_POWERPC_SOC +config SND_SOC_IMX_PCM_FIQ + tristate + default y if SND_SOC_IMX_SSI=y && (SND_SOC_FSL_SSI=m || SND_SOC_FSL_SPDIF=m) && (MXC_TZIC || MXC_AVIC) + select FIQ + if SND_IMX_SOC config SND_SOC_IMX_SSI tristate select SND_SOC_FSL_UTILS -config SND_SOC_IMX_PCM_FIQ - tristate - select FIQ - comment "SoC Audio support for Freescale i.MX boards:" config SND_MXC_SOC_WM1133_EV1