From patchwork Sat Jul 5 17:01:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 4488641 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 314C09F26C for ; Sat, 5 Jul 2014 17:02:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F89C2026C for ; Sat, 5 Jul 2014 17:02:05 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 2444520268 for ; Sat, 5 Jul 2014 17:02:03 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A317B265543; Sat, 5 Jul 2014 19:02:01 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: 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 9E846265535; Sat, 5 Jul 2014 19:01:50 +0200 (CEST) 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 0CA70265537; Sat, 5 Jul 2014 19:01:49 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id C5E4C265532 for ; Sat, 5 Jul 2014 19:01:40 +0200 (CEST) Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante.sirena.org.uk) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1X3TL8-0006pt-2g; Sat, 05 Jul 2014 17:01:34 +0000 Received: from broonie by debutante.sirena.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1X3TL5-0002Da-7h; Sat, 05 Jul 2014 18:01:27 +0100 From: Mark Brown To: alsa-devel@alsa-project.org Date: Sat, 5 Jul 2014 18:01:26 +0100 Message-Id: <1404579686-8491-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.0 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Cc: linaro-kernel@lists.linaro.org, Mark Brown , Lars-Peter Clausen , =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Subject: [alsa-devel] [PATCH] ASoC: s6105-ipcam: Fix build for I2C dependencies 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mark Brown The s6105-ipcam driver calls i2c_register_board_info() which means that not only does it need I2C to be enabled to be built but since that symbol is not exported it means that the driver also can't be linked as a module. Use a bool instead of a tristate and add a dependency on I2C to fix these issues. Commit b5dd60fd263 (ASoC: s6000: Allow to build when COMPILE_TEST is enabled) made this problem more visible since it enabled build of the driver on more common architectures but this has always been an issue. Signed-off-by: Mark Brown --- sound/soc/s6000/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/s6000/Kconfig b/sound/soc/s6000/Kconfig index 4823e1e4daef..f244a2566f20 100644 --- a/sound/soc/s6000/Kconfig +++ b/sound/soc/s6000/Kconfig @@ -15,8 +15,9 @@ config SND_S6000_SOC_I2S tristate config SND_S6000_SOC_S6IPCAM - tristate "SoC Audio support for Stretch 6105 IP Camera" - depends on SND_S6000_SOC + bool "SoC Audio support for Stretch 6105 IP Camera" + depends on SND_S6000_SOC=y + depends on I2C=y depends on XTENSA_PLATFORM_S6105 || COMPILE_TEST select SND_S6000_SOC_I2S select SND_SOC_TLV320AIC3X