diff options
author | Adrian Hunter <adrian.hunter@nokia.com> | 2009-03-23 21:23:48 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:51:23 -0400 |
commit | 8d75e98b5880f8f02be68ddc3cc4e3d433630d7b (patch) | |
tree | a48b55f47c87767866661cc7026b57e07705f48f /arch/arm/mach-omap2/mmc-twl4030.c | |
parent | 034ae7b41720a26cadd4b2f02bf0b23e79240344 (diff) |
ARM: OMAP3: mmc-twl4030 add cover switch
Allow a cover switch to be used to cause a rescan of the
MMC slot.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/mmc-twl4030.c')
-rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index d43421400e9d..e2b2aeb713d8 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c | |||
@@ -100,6 +100,14 @@ static int twl_mmc_get_ro(struct device *dev, int slot) | |||
100 | return gpio_get_value_cansleep(mmc->slots[0].gpio_wp); | 100 | return gpio_get_value_cansleep(mmc->slots[0].gpio_wp); |
101 | } | 101 | } |
102 | 102 | ||
103 | static int twl_mmc_get_cover_state(struct device *dev, int slot) | ||
104 | { | ||
105 | struct omap_mmc_platform_data *mmc = dev->platform_data; | ||
106 | |||
107 | /* NOTE: assumes card detect signal is active-low */ | ||
108 | return !gpio_get_value_cansleep(mmc->slots[0].switch_pin); | ||
109 | } | ||
110 | |||
103 | /* | 111 | /* |
104 | * MMC Slot Initialization. | 112 | * MMC Slot Initialization. |
105 | */ | 113 | */ |
@@ -411,7 +419,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) | |||
411 | 419 | ||
412 | mmc->slots[0].switch_pin = c->gpio_cd; | 420 | mmc->slots[0].switch_pin = c->gpio_cd; |
413 | mmc->slots[0].card_detect_irq = gpio_to_irq(c->gpio_cd); | 421 | mmc->slots[0].card_detect_irq = gpio_to_irq(c->gpio_cd); |
414 | mmc->slots[0].card_detect = twl_mmc_card_detect; | 422 | if (c->cover_only) |
423 | mmc->slots[0].get_cover_state = twl_mmc_get_cover_state; | ||
424 | else | ||
425 | mmc->slots[0].card_detect = twl_mmc_card_detect; | ||
415 | } else | 426 | } else |
416 | mmc->slots[0].switch_pin = -EINVAL; | 427 | mmc->slots[0].switch_pin = -EINVAL; |
417 | 428 | ||