From patchwork Fri Feb 27 22:46:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 9249 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1RMkIVV014378 for ; Fri, 27 Feb 2009 22:46:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753417AbZB0WqN (ORCPT ); Fri, 27 Feb 2009 17:46:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753602AbZB0WqN (ORCPT ); Fri, 27 Feb 2009 17:46:13 -0500 Received: from mho-01-bos.mailhop.org ([63.208.196.178]:60094 "EHLO mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753417AbZB0WqM (ORCPT ); Fri, 27 Feb 2009 17:46:12 -0500 Received: from c-69-181-40-92.hsd1.ca.comcast.net ([69.181.40.92] helo=localhost.localdomain) by mho-01-bos.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1LdBT7-000FKd-Cl; Fri, 27 Feb 2009 22:46:09 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 69.181.40.92 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+oGuZBTs7KWJKx6Key0Bjp Date: Fri, 27 Feb 2009 14:46:08 -0800 From: Tony Lindgren To: David Brownell Cc: OMAP , Manikandan Pillai Subject: Re: [patch 2.6.29-rc3-omap-git] omap3: gpio pin config bugfixes Message-ID: <20090227224607.GN11594@atomide.com> References: <200902082055.08954.david-b@pacbell.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <200902082055.08954.david-b@pacbell.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org * David Brownell [090208 20:55]: > From: David Brownell > > Bugfix several GPIO mux configurations which didn't enable the > input drivers, but weren't named as e.g. ..._GPIO141_OUT. > These bugs were added quite recently, for OMAP3 EVM support. > > To help avoid such bugs in the future, update the comment to > clarify the rule: always use PIN_INPUT, unless the name uses > that name suffix, to be crystal-clear on the signal's use as > output-only. > > (Also adds GPIO-63, for the EVM's MMC-1 writeprotect switch. > Presumably that works right...) Here's this refreshed to apply against l-o. Tony From: David Brownell To: OMAP Subject: [patch 2.6.29-rc3-omap-git] omap3: gpio pin config bugfixes From: David Brownell Bugfix several GPIO mux configurations which didn't enable the input drivers, but weren't named as e.g. ..._GPIO141_OUT. These bugs were added quite recently, for OMAP3 EVM support. To help avoid such bugs in the future, update the comment to clarify the rule: always use PIN_INPUT, unless the name uses that name suffix, to be crystal-clear on the signal's use as output-only. (Also adds GPIO-63, for the EVM's MMC-1 writeprotect switch. Presumably that works right...) Signed-off-by: David Brownell --- arch/arm/mach-omap2/mux.c | 13 ++++++++----- arch/arm/plat-omap/include/mach/mux.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -453,6 +453,7 @@ MUX_CFG_34XX("AC1_3430_USB3FS_PHY_MM3_TX /* 34XX GPIO - bidirectional, unless the name has an "_OUT" suffix. + * (Always specify PIN_INPUT, except for names suffixed by "_OUT".) * No internal pullup/pulldown without "_UP" or "_DOWN" suffix. */ MUX_CFG_34XX("AH8_34XX_GPIO29", 0x5fa, @@ -460,17 +461,19 @@ MUX_CFG_34XX("AH8_34XX_GPIO29", 0x5fa, MUX_CFG_34XX("J25_34XX_GPIO170", 0x1c6, OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) MUX_CFG_34XX("AF26_34XX_GPIO0", 0x1e0, - OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) MUX_CFG_34XX("AF22_34XX_GPIO9", 0xa18, - OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("L8_34XX_GPIO63", 0x0ce, + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) MUX_CFG_34XX("AF6_34XX_GPIO140_UP", 0x16c, OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT_PULLUP) MUX_CFG_34XX("AE6_34XX_GPIO141", 0x16e, - OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) MUX_CFG_34XX("AF5_34XX_GPIO142", 0x170, - OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) MUX_CFG_34XX("AE5_34XX_GPIO143", 0x172, - OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) MUX_CFG_34XX("AG4_34XX_GPIO134", 0x160, OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) MUX_CFG_34XX("U8_34XX_GPIO54", 0x0b4, --- a/arch/arm/plat-omap/include/mach/mux.h +++ b/arch/arm/plat-omap/include/mach/mux.h @@ -792,6 +792,7 @@ enum omap34xx_index { J25_34XX_GPIO170, AF26_34XX_GPIO0, AF22_34XX_GPIO9, + L8_34XX_GPIO63, AF6_34XX_GPIO140_UP, AE6_34XX_GPIO141, AF5_34XX_GPIO142,