mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
4e18d70247
This patchset is managed in https://github.com/beagleboard/kernel/tree/beagleboard-3.2 by Robert Nelson and myself. Tested on beagleboard-xM/Angstrom Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 2b3c730256f7c9ab32beaccf33f44713d25f4a85 Mon Sep 17 00:00:00 2001
|
|
From: Robert Nelson <robertcnelson@gmail.com>
|
|
Date: Fri, 25 Feb 2011 10:41:07 -0600
|
|
Subject: [PATCH 1/2] omap3: touchbook: remove mmc gpio_wp
|
|
|
|
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
|
---
|
|
arch/arm/mach-omap2/board-omap3touchbook.c | 8 +-------
|
|
1 files changed, 1 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
|
|
index a2d0d19..6b4cd92 100644
|
|
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
|
|
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
|
|
@@ -99,7 +99,7 @@ static struct omap2_hsmmc_info mmc[] = {
|
|
{
|
|
.mmc = 1,
|
|
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
|
|
- .gpio_wp = 29,
|
|
+ .gpio_wp = -EINVAL,
|
|
},
|
|
{} /* Terminator */
|
|
};
|
|
@@ -117,12 +117,6 @@ static struct gpio_led gpio_leds[];
|
|
static int touchbook_twl_gpio_setup(struct device *dev,
|
|
unsigned gpio, unsigned ngpio)
|
|
{
|
|
- if (system_rev >= 0x20 && system_rev <= 0x34301000) {
|
|
- omap_mux_init_gpio(23, OMAP_PIN_INPUT);
|
|
- mmc[0].gpio_wp = 23;
|
|
- } else {
|
|
- omap_mux_init_gpio(29, OMAP_PIN_INPUT);
|
|
- }
|
|
/* gpio + 0 is "mmc0_cd" (input/IRQ) */
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap2_hsmmc_init(mmc);
|
|
--
|
|
1.7.7.4
|
|
|