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: From patchwork Mon Mar 4 20:30:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10838577 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 BCDB214DE for ; Mon, 4 Mar 2019 20:33:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5DF12B5BB for ; Mon, 4 Mar 2019 20:33:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 998272B5C1; Mon, 4 Mar 2019 20:33:31 +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=unavailable 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 E7FAD2B5BB for ; Mon, 4 Mar 2019 20:33:30 +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 12B3B86F; Mon, 4 Mar 2019 21:32:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 12B3B86F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551731609; bh=r3UMItAScy4zIDzBsRxu1IK93IEjZ+xNVf783W5XPIc=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=rDzWIH0mAPfG+p2kOPryl8TfWysD9rugOCPMytM/dz9sImzk6VN9mrka4ahM1lRgN E4m0Tz46IQkZ1e/JX0yYpmvMtKOVHt9J0oLjuK69gjLMtSTkz/Sjoor9WI6DY6wVEW OD+EW8FPV3WdKjTNuCd+d5sSQzO6jVS/SgjhsTME= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BB3BFF896F5; Mon, 4 Mar 2019 21:32:02 +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 29E3FF896F5; Mon, 4 Mar 2019 21:32:02 +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 5C23FF896EB for ; Mon, 4 Mar 2019 21:31:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5C23FF896EB Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MofLl-1hKKoo0TY9-00p0vk; Mon, 04 Mar 2019 21:31:51 +0100 From: Arnd Bergmann To: Peter Ujfalusi , Mark Brown Date: Mon, 4 Mar 2019 21:30:51 +0100 Message-Id: <20190304203114.1894822-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190304203114.1894822-1-arnd@arndb.de> References: <20190304203114.1894822-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:23zV7yiwQbGvoR6NSOw+FcqidDd3dA6fErRuKWTjmyD7MdmC+nw XwIU2b9OhxTFai7Wzym7Ww+fjFwr3EQzIMc7oDopmtD5TtPhxri+q3tZjaL7TadR2OXFOA3 UpWqjGInXBBsWPR+vfFM5BmKUT1pCWCV3WetpsNNKM2Un2aojuWibWescy2dp5tfhvVLNJL bpkx+3U+AuU9p9/wZlt6A== X-UI-Out-Filterresults: notjunk:1;V03:K0:NWqV2wJR8PE=:0+AF6lWNa0GjvFa6H71OYu gtLjM0pjCayaUSg/tF7w3giEbH4JU/YfXsmEKoJA61xIT/qRCXA9jca7zuwRa/KIe1MOJczBQ Fm5xVUJblS9fCOKbyHqZPSUw0I0MvDF3MEN6fI6x85/aUVZ0csqZNJHvC1uCd133PF4w4P0i0 M89LqJfULpebVOXTam7701GBYHxCVA0hGLqNFLRucWI2+uD+WJTDfyH7L2gwJffhed+7pnHVf dlNJajKHq1EKswxTUvij4uNWZqo4M92A9qOufmgX409PGszONYPEuMR1m2XfxWfNSZa+AbcX3 ekumBnSMbSM7uhqZjeO8tSOo/UfGf2gqJizx6OGYOJQ2s+Zvm6I+yHuX+Wl7KbjrZcu7wWey6 Gli7mM7GrKwokRs2Fu0jgnkbv9pqjfxfFsGUllRaHvKiStgWYzGwEl06KGLv72TMZ1h4k7JWM JSmyZSCpokIThna0VmV+J9fQAEiW9pcqfg8OIt4u6iiF23tUmpf0gti2wIliZapiva8tw4WNL zMH1QR46CtAv5o/pot7hK4ddJwc7ajjxgb8PeF/XlGb+YksT6upSogjixF9H/vXjekGpKHzDI 7fveZBjSI1ZKzGnt+8WbuVHLVDg04YO5Plpbjc9a7ikNv1iGk5MBGZ6v5plCpXD4vIHqaRA5/ nnNp0xo7zYYGjBya0VNuAIau7XthX7OmPxod2C2/7ipuJF3S3r3PjjBu7+n1nPkVgVmHgHsjs iH0mN0fyILGQtn0TbWOJQA8SHW4zWZYejb1I4g== Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, Arnd Bergmann , Tony Lindgren , linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Jarkko Nikula Subject: [alsa-devel] [PATCH 2/3] ASoC: ti: remove compat dma probing 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 After running into a link error: sound/soc/ti/edma-pcm.o:(.rodata+0x18): undefined reference to `edma_filter_fn' I checked all users of this, and they have new-style 'dma_slave_map' tables, so none of them should still need it. Removing the associated lines simplifies the code and avoids the build-time dependency on the respective dmaengine drivers. Signed-off-by: Arnd Bergmann Acked-by: Peter Ujfalusi --- sound/soc/ti/edma-pcm.c | 4 +--- sound/soc/ti/sdma-pcm.c | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/ti/edma-pcm.c b/sound/soc/ti/edma-pcm.c index 59e588abe54b..5b9e341309f0 100644 --- a/sound/soc/ti/edma-pcm.c +++ b/sound/soc/ti/edma-pcm.c @@ -43,14 +43,12 @@ static const struct snd_pcm_hardware edma_pcm_hardware = { static const struct snd_dmaengine_pcm_config edma_dmaengine_pcm_config = { .pcm_hardware = &edma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = edma_filter_fn, .prealloc_buffer_size = 128 * 1024, }; int edma_pcm_platform_register(struct device *dev) { - return devm_snd_dmaengine_pcm_register(dev, &edma_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_COMPAT); + return devm_snd_dmaengine_pcm_register(dev, &edma_dmaengine_pcm_config, 0); } EXPORT_SYMBOL_GPL(edma_pcm_platform_register); diff --git a/sound/soc/ti/sdma-pcm.c b/sound/soc/ti/sdma-pcm.c index 21a9c2499d48..3e83a3920dc7 100644 --- a/sound/soc/ti/sdma-pcm.c +++ b/sound/soc/ti/sdma-pcm.c @@ -31,7 +31,6 @@ static const struct snd_pcm_hardware sdma_pcm_hardware = { static const struct snd_dmaengine_pcm_config sdma_dmaengine_pcm_config = { .pcm_hardware = &sdma_pcm_hardware, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, - .compat_filter_fn = omap_dma_filter_fn, .prealloc_buffer_size = 128 * 1024, }; @@ -39,13 +38,12 @@ int sdma_pcm_platform_register(struct device *dev, char *txdmachan, char *rxdmachan) { struct snd_dmaengine_pcm_config *config; - unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT; + unsigned int flags = 0; /* Standard names for the directions: 'tx' and 'rx' */ if (!txdmachan && !rxdmachan) return devm_snd_dmaengine_pcm_register(dev, - &sdma_dmaengine_pcm_config, - flags); + &sdma_dmaengine_pcm_config, 0); config = devm_kzalloc(dev, sizeof(*config), GFP_KERNEL); if (!config) @@ -65,7 +63,7 @@ int sdma_pcm_platform_register(struct device *dev, config->chan_names[0] = txdmachan; config->chan_names[1] = rxdmachan; - return devm_snd_dmaengine_pcm_register(dev, config, flags); + return devm_snd_dmaengine_pcm_register(dev, config, 0); } EXPORT_SYMBOL_GPL(sdma_pcm_platform_register); From patchwork Mon Mar 4 20:30:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10838581 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 25B441399 for ; Mon, 4 Mar 2019 20:35:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 109882AAFC for ; Mon, 4 Mar 2019 20:35:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 014C22AB46; Mon, 4 Mar 2019 20:35:09 +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 469F32AAC9 for ; Mon, 4 Mar 2019 20:35:09 +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 75CF185B; Mon, 4 Mar 2019 21:34:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 75CF185B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551731707; bh=E7l1h/1C+8bSqznDTTtYUXQdBbjjdBzPClrfi1ceJ/8=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=blPSPRt3uHYefuJ7KBqonmGCgR+DOluCjX9Bvs2UmMec/vIrMMTjetMF2qzGMUwLF t32s8RRwmliaQk35Du6gSGQm/jXmGAxEW9TZPQBVpLlO/GOLgDW+wUWYia08CMEhJS T1G6OL7J8O8JHB3DlThxGvQpaT72VSN7LCs6sht0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 10D51F896F2; Mon, 4 Mar 2019 21:32:52 +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 D5A04F8970B; Mon, 4 Mar 2019 21:32:50 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.135]) (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 5FB0EF896ED for ; Mon, 4 Mar 2019 21:32:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5FB0EF896ED Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mn2Fb-1hQNWG3esB-00k5WM; Mon, 04 Mar 2019 21:32:12 +0100 From: Arnd Bergmann To: Patrick Lai , Banajit Goswami , Mark Brown Date: Mon, 4 Mar 2019 21:30:52 +0100 Message-Id: <20190304203114.1894822-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190304203114.1894822-1-arnd@arndb.de> References: <20190304203114.1894822-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:tBuF72psa/NjOA4ImcigyUb6Ot+NZsUOvCekfqjHPkTj2QruFEM g/imKAiIKcYkVAahnvGt6pbZpZbJG0VnC4WOtUOT5tPrvAeWR2HB6qCAPC1XhgHW986zcOe XwhB2AmmvnP9csyaXe6WlJ1p9jDAmA9CVoxtw2mjavjqr9GgbHF74DyuoT+JPQNIMogazoY EfjWPpdQqTotPRs5AFIBA== X-UI-Out-Filterresults: notjunk:1;V03:K0:rUNdEgz872I=:T7XPFCgLsuDdO/UaHLH/Vo f42hTtUS/FohIPuSkpLsN0UZpSPij2uQYGeWfieb+C1+miFQnb8cczTR+tCBjHzyTmrdTPeBP 8A5DJmzbC+WRM/5HAyrREb8dJVXIVIQu9cgGazJnY7z3bX9n7MkLHgFeD50mrOeNJS6jTR622 /ZMnXm2aHsRKN7n0r/xgWNm+28looj7uJzMSzQAr5N8mMiPp0die56NVFtJF/sqKiiAR/byN5 MAAy9KefBgCGPfRv552uTQtw28wzNOfkMYYD17PGrMK+AUCE3vhbjbKc4PMMGJ38OoPFtP7Cs TmMknHSVcB/oqDGKJcOi8WiVQpx6sXe7yr6CpFp2jNHm6Rx4GD4z++p7+itdoqF2XQmgYVC88 qhMlSA3bWoAQHXqA0Zfv63xGunLYDB+AO2MaMpboEmeAouMiaxYxtbxjs+YCgaWTLUXNKHm7y ROkfxhF7ZaI3nsVDer5FDjLQFLsTjad7loFQt/J3e3/CP4Nz+lRtErBqQ++OuAsIhAmphDso8 8ZpGSAkbXO9WxOk36VTU291vnuM9RviRJESG3s9O3Awe7B4M2R7PVlWiZqg+0KhBxRt2KA+ud TMh8Qw6IYOm5CuVKPnSy1zKe0KP9Th8twtEBi5MayUXXi4b86NrKqe+uaokjyPawfNCed182B Rc4dsxBWvQuu2hSIK/A6+vjMNlYFuhA1kZdQ0zbxp265Jk+Qh19AZ95bnXwUQTJI15DTKKKho sAckxZQNXonIX3yiHEmdIVQ6gkdgWiE/eaaDnQ== Cc: alsa-devel@alsa-project.org, Arnd Bergmann , linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Rohit kumar , Srinivas Kandagatla , Cheng-Yi Chiang Subject: [alsa-devel] [PATCH 3/3] ASoC: qcom: add i2c dependency for SND_SOC_SDM845 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 We must not select SND_SOC_MAX98927 unless CONFIG_I2C is also enabled: WARNING: unmet direct dependencies detected for SND_SOC_MAX98927 Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=n] Selected by [y]: - SND_SOC_SDM845 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && QCOM_APR [=y] && MFD_CROS_EC [=y] Signed-off-by: Arnd Bergmann Acked-by: Cheng-Yi Chiang --- sound/soc/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 75ceb04d8bf0..b1764af858ba 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -98,7 +98,7 @@ config SND_SOC_MSM8996 config SND_SOC_SDM845 tristate "SoC Machine driver for SDM845 boards" - depends on QCOM_APR && MFD_CROS_EC + depends on QCOM_APR && MFD_CROS_EC && I2C select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON select SND_SOC_RT5663