From patchwork Wed Jan 28 21:30:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5730881 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E9EAA9F38B for ; Wed, 28 Jan 2015 21:30:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E81820221 for ; Wed, 28 Jan 2015 21:30:28 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id EB1EB20218 for ; Wed, 28 Jan 2015 21:30:26 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1B85026164D; Wed, 28 Jan 2015 22:30:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id C95B926156A; Wed, 28 Jan 2015 22:30:21 +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 24EA726156A; Wed, 28 Jan 2015 22:30:20 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by alsa0.perex.cz (Postfix) with ESMTP id 7B882264F50 for ; Wed, 28 Jan 2015 22:30:10 +0100 (CET) Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0M4rAD-1XSro61jHJ-00yypm; Wed, 28 Jan 2015 22:30:03 +0100 From: Arnd Bergmann To: broonie@kernel.org Date: Wed, 28 Jan 2015 22:30:01 +0100 Message-ID: <12284641.mhX5PHEsR2@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:cffQFnt/daDjz5fmODmy7/bv3nVGmrVI8oUSOI+EyVJk3UOUAU5 B5LCLxFN/EtCgLMDAe9WzJozYLVaUSMMYM4TCtjRn1EARCuyKNsnKihtx30upcBFfsiAw52 kb0Ykl9uAizJ90/LNy1uwWtP8EOZh+FfVsD5edaO8Txf498WUvJuxioEbr6fnbleKBoMSvi 8Qh6tWfIlP68vHIylifgg== X-UI-Out-Filterresults: notjunk:1; Cc: Kevin Hilman , alsa-devel@alsa-project.org, Sekhar Nori , lgirdwood@gmail.com, linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH] ASoC: davinci: fix DM365_EVM codec selection 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP An earlier bug fix of mine made the SND_DM365_VOICE_CODEC symbol tristate to avoid creating an undefined reference from the davinci-vcif.c driver to the davinci_soc_platform_register function that may be in a module. However, this may now lead to a different error on randconfig kernels: "warning: SND_DM365_VOICE_CODEC creates inconsistent choice state" This happens because we now have a choice statement with one bool and one tristate option, and the latter might not support being set to 'y' because of dependencies. This new change turns the other option into 'tristate' as well, which avoids the problem. Signed-off-by: Arnd Bergmann Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is") diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 8e948c63f3d9..2b81ca418d2a 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -58,13 +58,12 @@ choice depends on MACH_DAVINCI_DM365_EVM config SND_DM365_AIC3X_CODEC - bool "Audio Codec - AIC3101" + tristate "Audio Codec - AIC3101" help Say Y if you want to add support for AIC3101 audio codec config SND_DM365_VOICE_CODEC tristate "Voice Codec - CQ93VC" - depends on SND_DAVINCI_SOC select MFD_DAVINCI_VOICECODEC select SND_DAVINCI_SOC_VCIF select SND_SOC_CQ0093VC