aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3beagle.c
diff options
context:
space:
mode:
authorRobert Nelson <robertcnelson@gmail.com>2010-09-23 21:22:48 -0400
committerTony Lindgren <tony@atomide.com>2010-09-23 21:22:48 -0400
commite4916e117a4fcd001a1be777e406ec1f98b75de4 (patch)
treefcc114930da122236100c656de2cad4f2e6571b4 /arch/arm/mach-omap2/board-omap3beagle.c
parent954bed046fe57724851879a9db813eecb1d15f55 (diff)
omap: Beagle: only Cx boards use pin 23 for write protect
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c3
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 1aebb3f4f20a..1908b338e8d2 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[];
272static int beagle_twl_gpio_setup(struct device *dev, 272static int beagle_twl_gpio_setup(struct device *dev,
273 unsigned gpio, unsigned ngpio) 273 unsigned gpio, unsigned ngpio)
274{ 274{
275 if (system_rev >= 0x20 && system_rev <= 0x34301000) { 275 if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) ||
276 (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) {
276 omap_mux_init_gpio(23, OMAP_PIN_INPUT); 277 omap_mux_init_gpio(23, OMAP_PIN_INPUT);
277 mmc[0].gpio_wp = 23; 278 mmc[0].gpio_wp = 23;
278 } else { 279 } else {