summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2012-03-02 16:15:22 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-03-22 13:02:48 +0100
commitbdd61bc667401dc8054b69dddb0cf32ca2aab57b (patch)
tree9b3bcc8af0f5d022b19554d7fb5f10a6ad7467db /drivers/mfd
parentfd7cdddf9fe0fc63a10233223cf9fd774b33612c (diff)
downloadlinux-stable-bdd61bc667401dc8054b69dddb0cf32ca2aab57b.tar.gz
linux-stable-bdd61bc667401dc8054b69dddb0cf32ca2aab57b.tar.bz2
linux-stable-bdd61bc667401dc8054b69dddb0cf32ca2aab57b.zip
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 <b-cousson@ti.com> Cc: Felipe Balbi <balbi@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/twl6030-irq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 3c2cc0082f57..bb3d762280f9 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);