Commit c2fab124 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King

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: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cdf357f1
...@@ -74,16 +74,16 @@ static void _mmci_callback(struct work_struct *ws) ...@@ -74,16 +74,16 @@ static void _mmci_callback(struct work_struct *ws)
mdelay(20); mdelay(20);
mmci_card->mmc_inserted = !!gpio_get_value(U300_GPIO_PIN_MMC_CD); mmci_card->mmc_inserted = !gpio_get_value(U300_GPIO_PIN_MMC_CD);
input_report_switch(mmci_card->mmc_input, KEY_INSERT, input_report_switch(mmci_card->mmc_input, KEY_INSERT,
!mmci_card->mmc_inserted); mmci_card->mmc_inserted);
input_sync(mmci_card->mmc_input); input_sync(mmci_card->mmc_input);
pr_debug("MMC/SD card was %s\n", pr_debug("MMC/SD card was %s\n",
mmci_card->mmc_inserted ? "removed" : "inserted"); mmci_card->mmc_inserted ? "inserted" : "removed");
enable_irq_on_gpio_pin(U300_GPIO_PIN_MMC_CD, !mmci_card->mmc_inserted); enable_irq_on_gpio_pin(U300_GPIO_PIN_MMC_CD, mmci_card->mmc_inserted);
} }
int __devinit mmc_init(struct amba_device *adev) int __devinit mmc_init(struct amba_device *adev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment