From bdd61bc667401dc8054b69dddb0cf32ca2aab57b Mon Sep 17 00:00:00 2001 From: Benoit Cousson Date: Fri, 2 Mar 2012 16:15:22 +0100 Subject: mfd: Return twl6030_mmc_card_detect IRQ for board setup Card detect IRQ from the TWL6030 used to be provided to the MMC controller code using a statically allocated IRQ scheme: card_detect_irq = TWL6030_IRQ_BASE + MMCDETECT_INTR_OFFSET; This is no longer valid in a SPARSE_IRQ context since there is no more pre-defined TWL6030_IRQ_BASE. Return the proper card detect IRQ value in the twl6030_mmc_card_detect_config that will be called from the MMC controller. Signed-off-by: Benoit Cousson Cc: Felipe Balbi Cc: Tony Lindgren Cc: Rajendra Nayak Signed-off-by: Samuel Ortiz --- drivers/mfd/twl6030-irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c index 3c2cc0082f5..bb3d762280f 100644 --- a/drivers/mfd/twl6030-irq.c +++ b/drivers/mfd/twl6030-irq.c @@ -320,7 +320,8 @@ int twl6030_mmc_card_detect_config(void) ret); return ret; } - return 0; + + return twl6030_irq_base + MMCDETECT_INTR_OFFSET; } EXPORT_SYMBOL(twl6030_mmc_card_detect_config); -- cgit v1.2.3-18-g5258