From patchwork Tue Apr 29 19:16:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4088721 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E5A1EBFF02 for ; Tue, 29 Apr 2014 19:17:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97736201FB for ; Tue, 29 Apr 2014 19:17:01 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5AE8620114 for ; Tue, 29 Apr 2014 19:17:00 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2EAB1265148; Tue, 29 Apr 2014 21:16:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: 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 99A5D265062; Tue, 29 Apr 2014 21:16:47 +0200 (CEST) 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 667B72650D8; Tue, 29 Apr 2014 21:16:46 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by alsa0.perex.cz (Postfix) with ESMTP id E84E7265055 for ; Tue, 29 Apr 2014 21:16:37 +0200 (CEST) Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue003) with ESMTP (Nemesis) id 0MTc9s-1WWJaF48tE-00QPWB; Tue, 29 Apr 2014 21:16:36 +0200 From: Arnd Bergmann To: Mark Brown Date: Tue, 29 Apr 2014 21:16:35 +0200 Message-ID: <8655908.M1OtjG8JKI@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20140429165630.GD16981@sirena.org.uk> References: <6606961.lAGLvkNsEj@wuerfel> <535FB793.5050200@metafoo.de> <20140429165630.GD16981@sirena.org.uk> MIME-Version: 1.0 X-Provags-ID: V02:K0:LHT21cBAFawdNnuqNb9FRDi/hEBqIZvzENk1+CdQF96 jvk84vc/ZpNAoqPFceexOzo9nRTyEkXVGQhkenDPDv1woCMxgv vm5sLphdBgO6JyXLLcRERb3hcp5kRtuu7V+3KXZhVfaY0OXO9W h9gHrcCeSGOa95/GH/lwMLFh0YFHC1rxZzZxBwYtmqO8B/p4F/ eSHZJ+lmhd88p7bSrdDEKm0F8jALISSqXnazD1bFtqFzH8jg0T 0BYE7Ttd9tUe8rz84TMc0lNq4uETd5Nw50/76IrRIpZi5wST60 3KS+Wr+qMEpCyq2/YQsJfI6P2EbRJc5lGQomo2H9t45cFftKWM tLZWI2kr5+rNA/WNL7Us= Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen , Alexander Shiyan , linux-arm-kernel@lists.infradead.org, Liam Girdwood Subject: Re: [alsa-devel] [PATCH] ASoC: fsl: select SND_SOC_IMX_PCM_DMA where needed 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 On Tuesday 29 April 2014 09:56:30 Mark Brown wrote: > On Tue, Apr 29, 2014 at 04:30:43PM +0200, Lars-Peter Clausen wrote: > > > Yes. The patch should also add a select for SND_SOC_IMX_PCM_FIQ as that is > > used in the same way in the fsl_ssi driver. If anybody is afraid that > > selecting both SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA by default adds > > too much overhead you could add boolean sub-options that allow to > > enable/disable support individually. > > Yes, the overhead should be negligable since the FIQ code is tiny. > Arnd, please CC maintainers on patches - you've sent this to my > Linaro address again and not added Liam. I've tried yet another approach now, this should also work and has simpler dependencies. I'll follow up with the suggested patch and let you pick one or the other. Sorry for using the wrong Cc list, I too the addresses out of the patch that introduced the problem and didn't think about it. Arnd 8<----------- From e07c95b1519c2103a9b42fd12e993440dafba9d6 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 28 Apr 2014 16:28:01 +0200 Subject: [PATCH] ASoC: fsl: select SND_SOC_IMX_PCM_DMA where needed Since commit 204dec93eaa "ASoC: fsl: Allow to select individual common options", it is possible to enable SND_SOC_FSL_SSI and SND_SOC_FSL_SPDIF manually, either as loadable modules or built-in. This unfortunately leads to a link error if one or both of them are built-in, while the imx-pcm-dma framework is a loadable module: sound/built-in.o: In function `fsl_ssi_probe': :(.text+0x51fb8): undefined reference to `imx_pcm_dma_init' sound/built-in.o: In function `fsl_spdif_probe': :(.text+0x52e20): undefined reference to `imx_pcm_dma_init' This changes Kconfig to prevent this case by ensuring the imx-pcm-dma code is built-in if the i.MX SoC support is enabled and at least one of the two drivers is built-in. Signed-off-by: Arnd Bergmann diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index fb26345..5e0a58c 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -34,6 +34,7 @@ config SND_SOC_FSL_UTILS config SND_SOC_IMX_PCM_DMA tristate + default y if SND_IMX_SOC!=n && (SND_SOC_FSL_SSI=y || SND_SOC_FSL_SPDIF=y) select SND_SOC_GENERIC_DMAENGINE_PCM config SND_SOC_IMX_AUDMUX