From patchwork Mon Sep 29 15:32:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4997601 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 333A8BEEA6 for ; Mon, 29 Sep 2014 15:34:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63E3B2017D for ; Mon, 29 Sep 2014 15:34:30 +0000 (UTC) Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5ECF820173 for ; Mon, 29 Sep 2014 15:34:29 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s8TFX3H7010478; Mon, 29 Sep 2014 10:33:03 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8TFX0gu026603; Mon, 29 Sep 2014 10:33:01 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 29 Sep 2014 10:33:00 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8TFWwW7026237; Mon, 29 Sep 2014 10:32:58 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id C174380627; Mon, 29 Sep 2014 10:32:58 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv84.itg.ti.com (dlelxv84.itg.ti.com [172.17.0.246]) by linux.omap.com (Postfix) with ESMTP id 2603580626 for ; Mon, 29 Sep 2014 10:32:57 -0500 (CDT) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dlelxv84.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8TFWvhf026330 for ; Mon, 29 Sep 2014 10:32:57 -0500 Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id s8TFWsd7028478 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 29 Sep 2014 10:32:56 -0500 Received: from [216.82.250.99:10157] by server-17.bemta-12.messagelabs.com id 6A/07-10801-6AB79245; Mon, 29 Sep 2014 15:32:54 +0000 X-Env-Sender: arnd@arndb.de X-Msg-Ref: server-15.tower-126.messagelabs.com!1412004772!19606991!1 X-Originating-IP: [212.227.126.130] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27795 invoked from network); 29 Sep 2014 15:32:53 -0000 Received: from mout.kundenserver.de (HELO mout.kundenserver.de) (212.227.126.130) by server-15.tower-126.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 29 Sep 2014 15:32:53 -0000 Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue007) with ESMTP (Nemesis) id 0MLmVT-1XYtma2SJ9-000xc5; Mon, 29 Sep 2014 17:32:19 +0200 From: Arnd Bergmann To: Subject: [PATCH] ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is Date: Mon, 29 Sep 2014 17:32:17 +0200 Message-ID: <2771900.ce8bYznKIN@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:5Hpj/4Re0OPAH28TCGrYxUh0q3dg3qax8Zw+y4S6xw0 C4P4gbw11QT2JiZ4dXDW4K+DOT30zn3LZKy4BVrfYddKWNitRI Tb+OwC5xoPiDTm4PWsh6n+uX71XmtuCO69vLUAPi+0duH8LRZG ha25A+yqg+FpvKtITA3oYtgCUCzKfEvdn8hzwyyINtbS2NH7Sb YSQsK4HATB/7MjomflYGTyhUyNppuL+PPtN6aChP7mRR2j4XYY +/y8jcvymYhI9nRPwSb3b1b/faLcywtwFWS88AMrQJ5iq5dy4R OIO9DDuq1gjmbVSdTUpNoC1bkQPlPVGvGPOY1NulyB1+YF79f0 PFmbX4//z2jwtcWKJs7o= X-UI-Out-Filterresults: notjunk:1; CC: , , , Liam Girdwood , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is possible to configure a kernel with SND_DAVINCI_SOC=m and SND_DM365_VOICE_CODEC=y, which results in a link error: sound/built-in.o: In function `davinci_vcif_probe': sound/soc/davinci/davinci-vcif.c:223: undefined reference to `davinci_soc_platform_register' The best way to avoid this is to make SND_DM365_VOICE_CODEC a tristate option that depends on SND_DAVINCI_SOC, so it can only be a module or disabled when the base driver is a loadable module Signed-off-by: Arnd Bergmann diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index d69510c53239..8e948c63f3d9 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -63,7 +63,8 @@ config SND_DM365_AIC3X_CODEC Say Y if you want to add support for AIC3101 audio codec config SND_DM365_VOICE_CODEC - bool "Voice Codec - CQ93VC" + tristate "Voice Codec - CQ93VC" + depends on SND_DAVINCI_SOC select MFD_DAVINCI_VOICECODEC select SND_DAVINCI_SOC_VCIF select SND_SOC_CQ0093VC