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: 159610 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4182521jad; Mon, 4 Mar 2019 12:31:46 -0800 (PST) X-Google-Smtp-Source: AHgI3IbG/CB7hQKzLZ52m6eKRFq+vKaor0hCavpSqjHB24UlfMpxin+3GOjfeHm44J4m1rxNmyve X-Received: by 2002:aa7:854d:: with SMTP id y13mr21621551pfn.175.1551731506708; Mon, 04 Mar 2019 12:31:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551731506; cv=none; d=google.com; s=arc-20160816; b=P4Hn9TbexuyimyRwbWahts9EP9S6aXCiZr0AVZMqr3sCfr8GzJkF1KAAXTxCohmbuN a/OxF3rJfG9P7BJXGYQP4gkr38v6vDcHocnU+3MTF8cVBjwPDYjCNMoiqYfJOdPPCjDd JPUAZtnd8klcsGq5MZjWmwbdX3uxnqpDa0Xq7BHjKNsmfJMq6GEo6sGUbhFguGnDHJoU KOKPPKOnaQQthFMCtbxtgVPLlh1riV06e//n+uRci7Mfj/SkvKzcVkjAZKD6VjFz5cbg rBrrfb5z6qTVNxWircQTw8jfZg5azXeFN0X/tVTgNTlCKqfMT0NX8Z0PjZi3jYRprvt5 pDbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=3c5xU+b+7HutRwxna0zlwDL4cZs/QDshxA1Ean0n9GE=; b=YJ3BhxaoyGXzJ1v8R2agUpm/XAxFBjMPTKya19e5YPFUEOn1NuOnEYksSq0CMrkoUP uy7viZGw6IXoDP0JzYIssVqLb0KLaD3+PJGYy/n/okdmf6hFR3VZtypuyyxgp5314tsu EtmgqT7hk565TfhxjfS8eW6Oub9/ge0aEivLD6443qXWSkwYteQ0jLDMtzOXG9S/qACZ K7xzhh54OgVPcMJJuuA6/c9pmZUS2mI9EeMQQIOgUfWQDReN13bokoiAHVNghKBeBIjF jwzQFtrmLjAlz0XUNGZ0q4rFqv7qw0jfuRLXsfmXBAo5iBByyWKMBV0/2QLp1g49HN7A Mv0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g186si6092157pfc.58.2019.03.04.12.31.46; Mon, 04 Mar 2019 12:31:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726737AbfCDUbo (ORCPT + 31 others); Mon, 4 Mar 2019 15:31:44 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:57981 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726095AbfCDUbk (ORCPT ); Mon, 4 Mar 2019 15:31:40 -0500 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 Cc: Arnd Bergmann , Liam Girdwood , Tony Lindgren , Jarkko Nikula , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] ASoC: ti: fix davinci_mcasp_probe dependencies 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-Spam-Flag: NO 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.0 Acked-by: Peter Ujfalusi 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: