summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nelson <robertcnelson@gmail.com>2010-09-24 01:22:48 (GMT)
committerTony Lindgren <tony@atomide.com>2010-09-24 01:22:48 (GMT)
commitcf74d41ea07fe6066daea7df74d9550bc2c64284 (patch)
tree58ff1b9163eace0c3458c8f8c0f7594ae6badb7d
parente4916e117a4fcd001a1be777e406ec1f98b75de4 (diff)
downloadlinux-cf74d41ea07fe6066daea7df74d9550bc2c64284.tar.xz
omap: Beagle: no gpio_wp pin connection on xM
The omap3630 based BeagleBoard xM uses a MicroSD card slot with no write protection. Signed-off-by: Robert Nelson <robertcnelson@gmail.com> Acked-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 1908b33..5534841 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -272,7 +272,9 @@ static struct gpio_led gpio_leds[];
static int beagle_twl_gpio_setup(struct device *dev,
unsigned gpio, unsigned ngpio)
{
- if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) ||
+ if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
+ mmc[0].gpio_wp = -EINVAL;
+ } else 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;