From patchwork Tue Nov 24 22:21:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7693561 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 5793F9F2EC for ; Tue, 24 Nov 2015 22:21:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8FE10208A6 for ; Tue, 24 Nov 2015 22:21:40 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6A01B208A4 for ; Tue, 24 Nov 2015 22:21:39 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A91C4265A84; Tue, 24 Nov 2015 23:21:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B864F261629; Tue, 24 Nov 2015 23:21:29 +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 BCA30264F23; Tue, 24 Nov 2015 23:21:27 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by alsa0.perex.cz (Postfix) with ESMTP id 902FF26155D for ; Tue, 24 Nov 2015 23:21:20 +0100 (CET) Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0MXkot-1ZnnQM1tF1-00Wmu5; Tue, 24 Nov 2015 23:21:13 +0100 From: Arnd Bergmann To: Mark Brown Date: Tue, 24 Nov 2015 23:21:10 +0100 Message-ID: <2830784.Nrm81IgjTt@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:JyUuTgcz4OcpsQ58tAcgfoRxDGsgcDbO9Ef0aQYycwkAsY+satY L25oE7/GIR9oRhD9luVzxpThAaXD01TKD5xEkq1U+Eqf54g/ZWQcqhK5sDIgyA//KRXixj8 ghqutHaxoQLouqoVJNlL8T0npyT3b1E3NhUDTuYzIiAZ0B0QItL68uNYaUGcfW/dOK0M2cw Vmkwq6MeqCjqNbr1RDSOw== X-UI-Out-Filterresults: notjunk:1; V01:K0:3Rb4RkWnZYU=:yIJRg44MmwA9IEoGmZ/AQD Pb18hUW2z617yOKKojpAjuWBgN9pcq0A5s7txD14X5rqNSRXf8LXD4hTTVyBNScWyscZ6C1MN vP3iLoRBo3EmzLMc6aOLzgBfByNbo4XISa2N8HPEwzSd7YDaOM0dZPt9P60C4x6HKStiZZSgG Cai0XSfmVYsO5EfX/AdLZOePcp6XkOAeeFe/KGFCLX3jTWC+zKjd6T8t7jXSKYb4ZxHTae0i/ +RAYVRnFB5oSRMwJFVB5asymfibyo0kpNzTRcXxnQqheutmH83cfz2XMtcK+K0fJPUs+cRQO4 o1lwLxws0Mn2SBr3OhI7bZ8hA8S7sLINwtuvaBS2AqSJ0weCPA2XesUoje2lCWEQ4sZsd7bWX UwJXdHGCUVEILGbkUfhvyouz3y3NqYzDArQLyog3YuT1xs3vwbb546joy9/nObnu+d1Sfy4aw PidI4yQvpKDvEUGf9B1AnogWTPacBu05pjVO56t6AnoKVc1xw6EpkFqD1rFCdpjo4AUYnRgvk uEgHTuQ/uV8pYZH/Hjl5ERrEc9QgznZyTr5ewTu3hMGCF8HwE06aVXKcMEFzhgbxHTQKMosnq dQAbaFdo9o3jerNeAGmUziAD2m5yTw91AGXIcDjDcUB3MZ3GKkL82rGlrLj3WyDqfeRg6HypJ QOQ0xyhNrM57gW4SCgs4zOnD3lUsVM4RAO11jcnOyeTuHD1NkFvTqT8SWIOO2Y79fHz3Zv2P/ HfZIMFOzG0rVP1hA Cc: Fabio Estevam , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, "Maciej S. Szmigiero" , Liam Girdwood , Nicolin Chen Subject: [alsa-devel] [PATCH] ASoC: fsl: clarify ac97 dependency 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 A new randconfig build failure shows that the fsl-asoc-card module must not be built-in when the AC97 driver is a loadable module: sound/built-in.o: In function `fsl_asoc_card_late_probe': :(.text+0x571d8): undefined reference to `snd_ac97_update_bits' I couldn't come up with a nice solution, so this adds another dependency on "X || !X", which is the Kconfig way of saying that we have an optional dependency on something that might be a loadable module. Signed-off-by: Arnd Bergmann Fixes: 50760cad9de9 ("ASoC: fsl-asoc-card: add AC'97 support") Acked-by: Nicolin Chen --- The commit that introduced this was merged for 4.4-rc1, so we might want the fix to go into 4.4 as well. diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 19c302b0d763..14dfdee05fd5 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -283,6 +283,8 @@ config SND_SOC_IMX_MC13783 config SND_SOC_FSL_ASOC_CARD tristate "Generic ASoC Sound Card with ASRC support" depends on OF && I2C + # enforce SND_SOC_FSL_ASOC_CARD=m if SND_AC97_CODEC=m: + depends on SND_AC97_CODEC || SND_AC97_CODEC=n select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_PCM_DMA select SND_SOC_FSL_ESAI