Commit 17ee083b authored May 05, 2011 by Linus Walleij Committed by Russell King Jun 06, 2011

ARM: 6894/1: mmci: trigger card detect IRQs on falling and rising edges

Right now the card detect IRQ for MMCI is requested without any
flags which will give some default machine-specified IRQ
behaviour. However on the U300 rising+falling edges (such as can
be expected from a simple GPIO to generate when inserting/removing
a card) need to be requested explicitly.

Cc: Rabin Vincent <rabin.vincent@stericsson.com>
Cc: Ulf Hansson <ulf.hansson@stericsson.com>
Cc: Sebastian Rasmussen <sebastian.rasmussen@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 9fc2552a

drivers/mmc/host/mmci.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -1144,8 +1144,16 @@ static int __devinit mmci_probe(struct amba_device *dev,
		else if (ret != -ENOSYS)
		goto err_gpio_cd;

		/*
		* A gpio pin that will detect cards when inserted and removed
		* will most likely want to trigger on the edges if it is
		* 0 when ejected and 1 when inserted (or mutatis mutandis
		* for the inverted case) so we request triggers on both
		* edges.
		*/
		ret = request_any_context_irq(gpio_to_irq(plat->gpio_cd),
		mmci_cd_irq, 0,
		mmci_cd_irq,
		IRQF_TRIGGER_RISING \| IRQF_TRIGGER_FALLING,
		DRIVER_NAME " (cd)", host);
		if (ret >= 0)
		host->gpio_cd_irq = gpio_to_irq(plat->gpio_cd);