From patchwork Wed Mar 19 19:29:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3860621 Return-Path: X-Original-To: patchwork-davinci@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 BFA309F334 for ; Wed, 19 Mar 2014 19:31:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E0835201F5 for ; Wed, 19 Mar 2014 19:31:58 +0000 (UTC) Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05374201E7 for ; Wed, 19 Mar 2014 19:31:57 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2JJUh0Z002858; Wed, 19 Mar 2014 14:30:43 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2JJUgVd021537; Wed, 19 Mar 2014 14:30:43 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Wed, 19 Mar 2014 14:30:42 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2JJUfDP021165; Wed, 19 Mar 2014 14:30:41 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 8188180627; Wed, 19 Mar 2014 13:30:41 -0600 (CST) 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 C057580626 for ; Wed, 19 Mar 2014 13:30:39 -0600 (CST) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dlelxv84.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2JJUdoc028810 for ; Wed, 19 Mar 2014 14:30:39 -0500 Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2JJUcrc018167 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Mar 2014 14:30:38 -0500 Received: from [216.82.250.51:2293] by server-10.bemta-12.messagelabs.com id 10/BE-19645-E50F9235; Wed, 19 Mar 2014 19:30:38 +0000 X-Env-Sender: arnd@arndb.de X-Msg-Ref: server-14.tower-108.messagelabs.com!1395257436!9711180!1 X-Originating-IP: [212.227.17.10] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjEwID0+IDY3OTMx\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjEwID0+IDY3OTMx\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15742 invoked from network); 19 Mar 2014 19:30:37 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.10) by server-14.tower-108.messagelabs.com with DHE-RSA-AES128-SHA encrypted SMTP; 19 Mar 2014 19:30:37 -0000 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0LrsY2-1X7Zxc14j0-013dZw; Wed, 19 Mar 2014 20:30:34 +0100 From: Arnd Bergmann To: Subject: [PATCH 08/62] ARM: davinci: use explicit 'select' for DA850_EVM Date: Wed, 19 Mar 2014 20:29:05 +0100 Message-ID: <1395257399-359545-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:Bo6SsUZ5On5P/L74q5A4tShm9ZXsaIhHXv1lvXPpXnL gAHpe0PfAA4rVNneZep0h+IFqCG1zeo7L6Q5BNgiUPc2t3SQRs Sjo9MskgiPg8A4DH+zzrkmPuihgsjKglTthllAhRxn25ssqsT+ 8RkAvzT22yqpeZhbsU1l+eH4eaUuuSCogEyi6L12fUqQ1hkeiJ na2YoL1eeigFxx7U9aVtOC5D8zjnrp+VsTscMTDRrwFr11Libw ZekVhUTlRCg+xtqLP7o22f91/rOImjuaoASPu5k4HaSuiNFJqc RM/cA4DBQGi9nxH4bIFDmJecNuALPvfhk52stMWcL6eSS5AzGP AE4CBbanLaItD/q2zPhXslt+UB8Gjg3SFSsFnvu2l CC: Kevin Hilman , , Arnd Bergmann , 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: , MIME-Version: 1.0 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=ham 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 The DAVINCI_DA850_EVM board uses an unusual method to enable the GPIO_PCA953X and KEYBOARD_GPIO_POLLED symbols, which leads to the dependencies on these symbols being ignored. As GPIO_PCA953X actually requires I2C, that can lead to build failures when I2C is disabled. This patch removes the duplicate symbol definitions and instead adds equivalent 'select' statements that are conditional on the underlying dependencies. A different question whether we actually want to automatically enable them at all or rather put them into defconfig, but that should be a separate patch. Signed-off-by: Arnd Bergmann Cc: Sekhar Nori Cc: Kevin Hilman Cc: davinci-linux-open-source@linux.davincidsp.com --- arch/arm/mach-davinci/Kconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 3b98e34..df794e9 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -163,6 +163,8 @@ config MACH_DAVINCI_DA850_EVM bool "TI DA850/OMAP-L138/AM18x Reference Platform" default ARCH_DAVINCI_DA850 depends on ARCH_DAVINCI_DA850 + select GPIO_PCA953X if I2C + select KEYBOARD_GPIO_POLLED if GPIOLIB help Say Y here to select the TI DA850/OMAP-L138/AM18x Evaluation Module. @@ -209,11 +211,6 @@ config DA850_WL12XX Say Y if you want to use a wl1271 expansion card connected to the AM18x EVM. -config GPIO_PCA953X - default MACH_DAVINCI_DA850_EVM - -config KEYBOARD_GPIO_POLLED - default MACH_DAVINCI_DA850_EVM config MACH_MITYOMAPL138 bool "Critical Link MityDSP-L138/MityARM-1808 SoM"