From patchwork Wed Feb 25 15:42:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5881181 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CF666BF440 for ; Wed, 25 Feb 2015 15:42:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18E5C20382 for ; Wed, 25 Feb 2015 15:42:48 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id A4E5120384 for ; Wed, 25 Feb 2015 15:42:46 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 27AEA261521; Wed, 25 Feb 2015 16:42:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org 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 97C0B26070E; Wed, 25 Feb 2015 16:42:37 +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 B59202610A7; Wed, 25 Feb 2015 16:42:35 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.10]) by alsa0.perex.cz (Postfix) with ESMTP id C841C2606F9 for ; Wed, 25 Feb 2015 16:42:28 +0100 (CET) Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0M2v1a-1XZ5hw3zOQ-00scq9; Wed, 25 Feb 2015 16:42:15 +0100 From: Arnd Bergmann To: Peter Ujfalusi , broonie@kernel.org, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, lgirdwood@gmail.com Date: Wed, 25 Feb 2015 16:42:12 +0100 Message-ID: <2707228.SKhEXovzW4@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <54EDEAE3.6080605@ti.com> References: <22890811.0MuvZ4MxOU@wuerfel> <54EDEAE3.6080605@ti.com> MIME-Version: 1.0 X-Provags-ID: V03:K0:r/cHunlpb3u9MF/Uh5Z11qwHy2YPFIl0kd/OSpHpefQakH92Ski Gf27/umTtc07XkX4cXQw2H+Q56/TAso2nvKZGw3fTNl/AI5vwinJ7UXRt986kfCe2pW1KJm MMksreRtVxinhX6R/Wypyzc5cJFWWEfIzQR9gbqc1TMYHEFDHLfOlrWWaq+1AHY2oQTqXVy 2uIAQL4tAK3zMXVfYMDFg== X-UI-Out-Filterresults: notjunk:1; Subject: [alsa-devel] [PATCH v2] ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 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 The change to enable OMAP5 support on this platform was a little too eager in adding a 'select' for a particular clock driver that might not be enabled in all configurations, which in turn leads to a build error: warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS) drivers/built-in.o: In function `palmas_clks_probe': drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config' I do not see a strong dependency here, so it's probably better to drop this select and to avoid adding more complexity here. Signed-off-by: Arnd Bergmann Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio") Acked-by: Peter Ujfalusi --- v2: change the dependency as suggested by Peter diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index e7c78b0406b5..6768e4f7d7d0 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -105,7 +105,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 select SND_OMAP_SOC_MCPDM select SND_SOC_TWL6040 select SND_SOC_DMIC - select COMMON_CLK_PALMAS if SOC_OMAP5 + select COMMON_CLK_PALMAS if MFD_PALMAS help Say Y if you want to add support for SoC audio on OMAP boards using ABE and twl6040 codec. This driver currently supports: