From patchwork Wed Jul 4 14:29:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1156401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 52397DFF0F for ; Wed, 4 Jul 2012 14:36:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmQaq-00013X-Vh; Wed, 04 Jul 2012 14:30:13 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmQag-00011u-NA for linux-arm-kernel@lists.infradead.org; Wed, 04 Jul 2012 14:30:04 +0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LhpBu-1S0jZ40aPK-00n7wJ; Wed, 04 Jul 2012 16:29:53 +0200 From: Arnd Bergmann To: Barry Song <21cnbao@gmail.com> Subject: Re: [GIT PULL] prima2 GPIO support in pinmux Date: Wed, 4 Jul 2012 14:29:46 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0-rc1+; KDE/4.3.2; x86_64; ; ) References: In-Reply-To: MIME-Version: 1.0 Message-Id: <201207041429.47124.arnd@arndb.de> X-Provags-ID: V02:K0:IEaJUl3QXGSdnNCFrgcO66dVgcpviVz8dcxcOEqH3PD I6PYuzCaLrZC9yksai76gT256ygcL6Rav26XzCAtodG4bNgVL1 0terG1YC7b/oBiNmR8HKeNQLVCVRhjojkf4fXZU9vFaOX+N6XU U8IhvUnSCG24/r9mpjm0LXiCBaqDDAUqPlcJesdCpPzaTcjl5Z iDb/MRI+aoFoGuGyW02Lfb/QmDaHW7lqSkVLolGI5PiBojE4Ez 3JAARxXlUscULyxM5y5xm94etXLpR+Ezajhm0oJMaMnbVezOkx t7c+9poax0rVj+Xcp1QslYT2PelcvQgmENdHM7YdGkoFuROAoz ZqpQnfYmRzr3HJSLJiz8= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Olof Johansson , Linus Walleij , DL-SHA-WorkGroupLinux , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Monday 02 July 2012, Barry Song wrote: > Hi Olof, Arnd, > > Please pull the following GPIO support in pinmux for 3.6. I noticed that the driver now requires gpiolib, so we need one of these two patches. I think the first one is safer, but the second one allows you to build without GPIOLIB if you want to disable PINCTRL_SIRF. Arnd diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8bcda59..adef0da 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -389,7 +389,7 @@ config ARCH_PRIMA2 bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" select CPU_V7 select NO_IOPORT - select ARCH_WANT_OPTIONAL_GPIOLIB + select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select CLKDEV_LOOKUP select GENERIC_IRQ_CHIP diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 4c05fe8..5b51199 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -104,7 +104,7 @@ config PINCTRL_PXA910 config PINCTRL_SIRF bool "CSR SiRFprimaII pin controller driver" - depends on ARCH_PRIMA2 + depends on ARCH_PRIMA2 && GPIOLIB select PINMUX config PINCTRL_TEGRA