From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/13] omap2: Fix GPIO numbers and smc91x for 2430sdp
Date: Thu, 08 Jul 2010 16:54:35 +0300 [thread overview]
Message-ID: <20100708135435.26276.28828.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100708135342.26276.80936.stgit@baageli.muru.com>
Fix GPIO numbers and smc91x for 2430sdp. The earlier code
had cut and paste errors from 3430sdp code. Also, 2430
has five GPIO banks for a total of 160 GPIO lines.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-2430sdp.c | 6 +-----
arch/arm/plat-omap/gpio.c | 4 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 71bf509..ba188cf 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -122,11 +122,7 @@ static struct omap_smc91x_platform_data board_smc91x_data = {
static void __init board_smc91x_init(void)
{
- if (omap_rev() > OMAP3430_REV_ES1_0)
- board_smc91x_data.gpio_irq = 6;
- else
- board_smc91x_data.gpio_irq = 29;
-
+ omap_mux_init_gpio(149, OMAP_PIN_INPUT);
gpmc_smc91x_init(&board_smc91x_data);
}
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 9b7e354..7951eef 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -390,7 +390,9 @@ static inline int gpio_valid(int gpio)
return 0;
if (cpu_is_omap7xx() && gpio < 192)
return 0;
- if (cpu_is_omap24xx() && gpio < 128)
+ if (cpu_is_omap2420() && gpio < 128)
+ return 0;
+ if (cpu_is_omap2430() && gpio < 160)
return 0;
if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && gpio < 192)
return 0;
next prev parent reply other threads:[~2010-07-08 13:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-08 13:54 [PATCH 00/13] omap updates for 2.6.36 merge window Tony Lindgren
2010-07-08 13:54 ` [PATCH 01/13] omap: Add back UART MDR1 check into uncompress.h Tony Lindgren
2010-07-08 13:54 ` [PATCH 02/13] omap1: omap7xx clocks, mux, serial fixes Tony Lindgren
2010-07-08 13:54 ` Tony Lindgren [this message]
2010-07-08 13:54 ` [PATCH 04/13] omap: Overo: Fix support for second ethernet port Tony Lindgren
2010-07-08 13:54 ` [PATCH 05/13] omap2/3: id: fix sparse warning Tony Lindgren
2010-07-08 13:54 ` [PATCH 06/13] omap3: Unify omap2_set_globals_3[43,6x]x functions Tony Lindgren
2010-07-08 13:54 ` [PATCH 07/13] omap3: introduce omap3_map_io Tony Lindgren
2010-07-08 13:54 ` [PATCH 08/13] omap: mux: fix multipath gpio handling Tony Lindgren
2010-07-08 13:54 ` [PATCH 09/13] omap: dma: Support for prefetch in destination synchronizedtransfer Tony Lindgren
2010-07-08 13:55 ` [PATCH 10/13] OMAP3: AM3505/3517 do not have IO wakeup capability Tony Lindgren
2010-07-08 13:55 ` [PATCH 11/13] omap: Add new interface omap_get_die_id Tony Lindgren
2010-07-08 13:55 ` [PATCH 12/13] omap: Use omap_get_die_id() to get the DIE ids Tony Lindgren
2010-07-08 13:55 ` [PATCH 13/13] omap: Devkit8000: Use DIE id to initialize dm9000 MAC address Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100708135435.26276.28828.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).