From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/7] omap: Beagle: only Cx boards use pin 23 for write protect
Date: Fri, 24 Sep 2010 17:27:10 -0700 [thread overview]
Message-ID: <20100925002710.24551.64851.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100925002608.24551.67183.stgit@baageli.muru.com>
From: Robert Nelson <robertcnelson@gmail.com>
system_rev comes from u-boot and is a constant 0x20, so
Bx boards also fall in this 'if' and will get setup with the
wrong gpio_wp pin. Switch to using the Beagle revision routine
to correcly set pin 23 only for C1/2/3 and C4 Boards. Bx boards
will then use the correct default pin setting.
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-omap3beagle.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 1aebb3f..1908b33 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -272,7 +272,8 @@ static struct gpio_led gpio_leds[];
static int beagle_twl_gpio_setup(struct device *dev,
unsigned gpio, unsigned ngpio)
{
- if (system_rev >= 0x20 && system_rev <= 0x34301000) {
+ if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) ||
+ (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) {
omap_mux_init_gpio(23, OMAP_PIN_INPUT);
mmc[0].gpio_wp = 23;
} else {
next prev parent reply other threads:[~2010-09-25 0:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-25 0:26 [PATCH 0/7] omap board changes for v2.6.37 merge window Tony Lindgren
2010-09-25 0:27 ` [PATCH 1/7] hmc5843: Digital compass board file Tony Lindgren
2010-09-25 0:27 ` [PATCH 2/7] omap: Beagle: revision detection Tony Lindgren
2010-09-25 0:27 ` Tony Lindgren [this message]
2010-09-25 0:27 ` [PATCH 4/7] omap: Beagle: no gpio_wp pin connection on xM Tony Lindgren
2010-09-25 0:27 ` [PATCH 5/7] Adding i2c eeprom driver to read EDID Tony Lindgren
2010-09-25 0:27 ` [PATCH 6/7] omap: 4430sdp board support for proximity sensor Tony Lindgren
2010-09-25 0:27 ` [PATCH 7/7] omap4: board-omap4panda: adding leds status1 and status2 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=20100925002710.24551.64851.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).