From patchwork Mon Mar 4 20:30:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10838571 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 0ADDB13B5 for ; Mon, 4 Mar 2019 20:32:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5C702B5AB for ; Mon, 4 Mar 2019 20:32:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D407C2B5B8; Mon, 4 Mar 2019 20:32:34 +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 1C1142B5AB for ; Mon, 4 Mar 2019 20:32:34 +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 EF643851; Mon, 4 Mar 2019 21:31:41 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EF643851 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551731552; bh=KmaXuSncbYPLwd6lESky4xPl3zSArIX3DcggomSpxIo=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=HOB6dGP8ix9JyH1jV5Dw5qm2X+Hn8D1DlPHhHZopymiHNv1pVsnqrLceJgFrIaOhN mzHOKnTwZoS4MZgPaLBWd1KSRhajxoEbGdWhipYDdVV3kNIocODQrS/o1a6Y9oN4W8 HGj1BryN9buFVUDMrhhB2SaUPchQtCpZOBcaQIXA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6A493F896ED; Mon, 4 Mar 2019 21:31:41 +0100 (CET) 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 E9B18F896EE; Mon, 4 Mar 2019 21:31:38 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) (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 BC94BF80733 for ; Mon, 4 Mar 2019 21:31:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BC94BF80733 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MqbI0-1hMorl3vvM-00mXxV; Mon, 04 Mar 2019 21:31:26 +0100 From: Arnd Bergmann To: Peter Ujfalusi , Mark Brown Date: Mon, 4 Mar 2019 21:30:50 +0100 Message-Id: <20190304203114.1894822-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:4WHISUG8ocxAAwYPAmZ+zHkTsPViuEM8zA/h9WNrN67zQWO6mKi vczHmqhoMu7KVOHcdco2Hn20CHdsa1p/M4jTbVKGVZYPB3KgFP3VsElBpuO5ecQqIuLaZDu LgbopVZ7+rnSpXbF5nF7bJnKXHOW67J6HjNUy+0Vvj3lkEToYjCkE2vCbnWTy26uesIrsiu Wm3EMudsRZLHhRZLSbs1Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:Q5iJxDzL/lY=:/nX2YjWdXcK6H3+UfEaatQ AW0M1Sl3iqJMSuByNIInJH+fhCmfQzNWc2FyiyWaNSUMsD/qja7h526MKV1G0spYGa9JChtDQ 2WoLZtGNem2SuVQn0bVd+jLNP0tnGhI3k5wyGxo3Zf9Oit9sIXhKRrsF3yzo9p+pujooHGtUA Q5eYocmgBB1dKjXQlJ+xsjlPPgTxyU2CruxSpEC2D945WMAzMtfd7Tedsu4asFqHhC+n+sNoI 4zR2MPovedGZg5fyhkFQm9aAY5BcTn6Ytt0pm0WKMpfPTGpRRp6rofRzhVexjz+ugRlggbSLc xw4VsXuhBKf/zv221wpqqdm2mLJfpB3U+g52/gWyK8D6K3Xd6ZrxRx0R7Afbl9L0mVNzv3o9L VKDdARcBse2ax9SsmyFSPzTNgKIpiHdqgVeTBW0zBEcUkj0A9civCvmzcUswAlsBWKRJuAtMN VtNHceQU3SKIUfZkPbTKyNcWSKgclOPjxU/E1dfc3PVeaOgHL9wTV9Av1VsXlSutIIqYKdXut pbHbisVjVjQXj4NUPRLIoX21ye6IjeK3aE+B/uJ2fNlTTKjpECrS8NYubgwpjhcUoKz/iVYrJ Oq2oJ7Ibnm2g27PzdZzF8CZqH3P69YeNm6W5wNUJNIyPyyzu20WGMUbNxuZI1Ui5/DbGcX9WE jLflRoM5WVflBvwHRl8Dg24YpCUeSUK56KQycu4gIZWmbQid/0WPQXe2YvnwKVVn3rHhh7YWR cvq6tBKRGIpbqBLIC9jtIsjrgftkDg5ZG2CGAg== Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Tony Lindgren , Liam Girdwood , linux-kernel@vger.kernel.org, Jarkko Nikula Subject: [alsa-devel] [PATCH 1/3] ASoC: ti: fix davinci_mcasp_probe 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 The SND_SOC_DAVINCI_MCASP driver can use either edma or sdma as a back-end, and it takes the presence of the respective dma engine drivers in the configuration as an indication to which ones should be built. However, this is flawed in multiple ways: - With CONFIG_TI_EDMA=m and CONFIG_SND_SOC_DAVINCI_MCASP=y, is enabled as =m, and we get a link error: sound/soc/ti/davinci-mcasp.o: In function `davinci_mcasp_probe': davinci-mcasp.c:(.text+0x930): undefined reference to `edma_pcm_platform_register' - When CONFIG_SND_SOC_DAVINCI_MCASP=m has already been selected by another driver, the same link error appears even if CONFIG_TI_EDMA is disabled There are possibly other issues here, but it seems that the only reasonable solution is to always build both SND_SOC_TI_EDMA_PCM and SND_SOC_TI_SDMA_PCM as a dependency here. Both are fairly small and do not have any other compile-time dependencies, so the cost is very small, and makes the configuration stage much more consistent. Fixes: f2055e145f29 ("ASoC: ti: Merge davinci and omap directories") Signed-off-by: Arnd Bergmann Acked-by: Peter Ujfalusi --- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig index 4bf3c15d4e51..ee7c202c69b7 100644 --- a/sound/soc/ti/Kconfig +++ b/sound/soc/ti/Kconfig @@ -21,8 +21,8 @@ config SND_SOC_DAVINCI_ASP config SND_SOC_DAVINCI_MCASP tristate "Multichannel Audio Serial Port (McASP) support" - select SND_SOC_TI_EDMA_PCM if TI_EDMA - select SND_SOC_TI_SDMA_PCM if DMA_OMAP + select SND_SOC_TI_EDMA_PCM + select SND_SOC_TI_SDMA_PCM help Say Y or M here if you want to have support for McASP IP found in various Texas Instruments SoCs like: