From patchwork Mon Jun 13 15:39:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9173445 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DFC406075D for ; Mon, 13 Jun 2016 15:39:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D091D25404 for ; Mon, 13 Jun 2016 15:39:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C52B326861; Mon, 13 Jun 2016 15:39:57 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52F5025404 for ; Mon, 13 Jun 2016 15:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424703AbcFMPjm (ORCPT ); Mon, 13 Jun 2016 11:39:42 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:63102 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422835AbcFMPjl (ORCPT ); Mon, 13 Jun 2016 11:39:41 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LlFaA-1bjtV52Xw6-00b48g; Mon, 13 Jun 2016 17:39:25 +0200 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Peter Ujfalusi , Jarkko Nikula , Liam Girdwood , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: fix ABE_TWL6040 dependency Date: Mon, 13 Jun 2016 17:39:43 +0200 Message-Id: <1465832422-2998958-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1465832422-2998958-1-git-send-email-arnd@arndb.de> References: <1465832422-2998958-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:uYEXNQy70yilgOWglt8V3ONAQa6zpTN7qTJVyCY/0A7bngrI06c nlJlXxFsh3SHdd8q19M5pkcmLrgWS+VxpTkbjcWd0uudPq7tmGux6YfIwSQT7Lu0yPMUH8Q uRep/xX4Up2q2DA5a9qRg276Dn5BBMGB9y09rltYELKRHtoufj0MdpEVS8IRv39lzBRhS6q lB+xcXMJn39HAPn+QRQew== X-UI-Out-Filterresults: notjunk:1; V01:K0:vXKEKHNCCj8=:2/FnQtkua9wifGUqk1TFvJ 24STu0ldsEJzqMNIJR/+HkX37nyczfTObO2tjf/Y42FAVn0ql4EXYZvVyw6BgIcdSHvwFmmBy /kTxqILsGeeNvLylaGkN9mOJSZKrDHHzm+hj99IsdQneseW6V+3MRKXusiPKaT54wjWdah13h ahw/ImnLWUJmn4wO/EfPd5RtkMhibR/+HHhQ5jI2RUnJ180aFL+VTIjMBbOmOQ122IwBMKI+R 09p/iEf0xGUO34ViPrE2NVijWNVlKDGDatRvDCPo17jVSlwZ0B4WMVXgjjKkeWJ3kY1MHoAjC 1+5gEiXtQNl7e0xG9YGBn8oxnZSS8r7ATsFtOp2ooLMJG1jVn9c17YGIOg9HeE+HJzVEmox4M nD5pK1jX6UL+hnyA9obGeQaIFi+0GXBitLbk8y/otpm0fmLDPQs6SFK1cCxfkF1rnXVFWEC4v 899/aO73bdwNK0JfcW+rPQpnlmsqX8lly7CJR56m3fdsHYWl0oSgtZ2+0vIZlh6caHzbQTYML ziSyXB6NxOLHXrp5JKp2kaJuw1EIuFkvjrxxLgjcjpFMkLfL0q6+XgfC5TyxxK+RiInnHAB/B hYNBDa9aUn0bB7FMBY/O17qw5sUXcYwxFNUF0a3IvO0NNG2pSBcF1hfmjR041TgnwQ8X2SK4p PHZkJJLC6HZYCXMsIWnV3UcPqdz60NDLnZmrcyjGJuAmzdbHBpi4esgcqOtNPyrJNOYU= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The TWL6040 ASoC support has recently started turning on CLK_TWL6040, but that fails to build when CONFIG_COMMON_CLK is disabled: warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects CLK_TWL6040 which has unmet direct dependencies (COMMON_CLK && TWL6040_CORE) 0xF18E38F6 Thu Jun 9 18:57:32 CEST 2016 failed In file included from ../include/linux/clocksource.h:18:0, from ../drivers/clocksource/timer-nps.c:34: ../include/linux/of.h:1005:20: error: comparison of distinct pointer types lacks a cast [-Werror] .data = (fn == (fn_type)NULL) ? fn : fn } ^ This adds a dependency to avoid the invalid configuration. Signed-off-by: Arnd Bergmann Fixes: 443500a3927a ("ASoC: omap: Kconfig: SND_OMAP_SOC_OMAP_ABE_TWL6040 to select CLK_TWL6040") --- sound/soc/omap/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 5c471d920898..f5451c78ede5 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -100,7 +100,7 @@ config SND_OMAP_SOC_OMAP_TWL4030 config SND_OMAP_SOC_OMAP_ABE_TWL6040 tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" - depends on TWL6040_CORE && SND_OMAP_SOC + depends on TWL6040_CORE && SND_OMAP_SOC && COMMON_CLK depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST select SND_OMAP_SOC_DMIC select SND_OMAP_SOC_MCPDM