diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2010-08-09 04:16:50 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 17:10:54 -0400 |
commit | c2fab1242a16f8e66b680d664322c3811e7b003d (patch) | |
tree | bc957a804f02775117d80ac552473bac054e5fd9 /arch/arm/mach-u300 | |
parent | cdf357f1e13a08a11261edacb3083746f65c1ed9 (diff) |
ARM: 6306/1: fix inverted MMC card detect in U300
This converts the U300 to uninverted logic for MMCI card detect,
fixing a regression in the current tree.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r-- | arch/arm/mach-u300/mmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c index 88506d03059..de1ac9ad221 100644 --- a/arch/arm/mach-u300/mmc.c +++ b/arch/arm/mach-u300/mmc.c | |||
@@ -74,16 +74,16 @@ static void _mmci_callback(struct work_struct *ws) | |||
74 | 74 | ||
75 | mdelay(20); | 75 | mdelay(20); |
76 | 76 | ||
77 | mmci_card->mmc_inserted = !!gpio_get_value(U300_GPIO_PIN_MMC_CD); | 77 | mmci_card->mmc_inserted = !gpio_get_value(U300_GPIO_PIN_MMC_CD); |
78 | 78 | ||
79 | input_report_switch(mmci_card->mmc_input, KEY_INSERT, | 79 | input_report_switch(mmci_card->mmc_input, KEY_INSERT, |
80 | !mmci_card->mmc_inserted); | 80 | mmci_card->mmc_inserted); |
81 | input_sync(mmci_card->mmc_input); | 81 | input_sync(mmci_card->mmc_input); |
82 | 82 | ||
83 | pr_debug("MMC/SD card was %s\n", | 83 | pr_debug("MMC/SD card was %s\n", |
84 | mmci_card->mmc_inserted ? "removed" : "inserted"); | 84 | mmci_card->mmc_inserted ? "inserted" : "removed"); |
85 | 85 | ||
86 | enable_irq_on_gpio_pin(U300_GPIO_PIN_MMC_CD, !mmci_card->mmc_inserted); | 86 | enable_irq_on_gpio_pin(U300_GPIO_PIN_MMC_CD, mmci_card->mmc_inserted); |
87 | } | 87 | } |
88 | 88 | ||
89 | int __devinit mmc_init(struct amba_device *adev) | 89 | int __devinit mmc_init(struct amba_device *adev) |