summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorGraeme Gregory <gg@slimlogic.co.uk>2011-05-12 14:27:56 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-26 19:45:40 +0200
commit6523b148b44be38d89c2ee9865d34da30d9f5f1c (patch)
treeaa4408d8655093167289092b62c057122dd8a51d /drivers/mfd
parent521d8ec3f0d8069bea3b3afa70f487cdb5118018 (diff)
downloadlinux-3.10-6523b148b44be38d89c2ee9865d34da30d9f5f1c.tar.gz
linux-3.10-6523b148b44be38d89c2ee9865d34da30d9f5f1c.tar.bz2
linux-3.10-6523b148b44be38d89c2ee9865d34da30d9f5f1c.zip
mfd: Fix twl6030 irq definitions
The charger fault IRQs from the twl will in future patches be handled by a seperate IRQ handler in the charger driver than the general charger IRQ. Give them different IRQ numbers now to allow the charger driver to be merged in the future. Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/twl6030-irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index dfbae34e180..eb3b5f88e56 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -76,8 +76,8 @@ static int twl6030_interrupt_mapping[24] = {
USBOTG_INTR_OFFSET, /* Bit 18 ID */
USB_PRES_INTR_OFFSET, /* Bit 19 VBUS */
CHARGER_INTR_OFFSET, /* Bit 20 CHRG_CTRL */
- CHARGER_INTR_OFFSET, /* Bit 21 EXT_CHRG */
- CHARGER_INTR_OFFSET, /* Bit 22 INT_CHRG */
+ CHARGERFAULT_INTR_OFFSET, /* Bit 21 EXT_CHRG */
+ CHARGERFAULT_INTR_OFFSET, /* Bit 22 INT_CHRG */
RSV_INTR_OFFSET, /* Bit 23 Reserved */
};
/*----------------------------------------------------------------------*/