diff options
author | Graeme Gregory <gg@slimlogic.co.uk> | 2011-05-12 09:27:56 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:40 -0400 |
commit | 6523b148b44be38d89c2ee9865d34da30d9f5f1c (patch) | |
tree | aa4408d8655093167289092b62c057122dd8a51d /drivers/mfd | |
parent | 521d8ec3f0d8069bea3b3afa70f487cdb5118018 (diff) |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c index dfbae34e1804..eb3b5f88e566 100644 --- a/drivers/mfd/twl6030-irq.c +++ b/drivers/mfd/twl6030-irq.c | |||
@@ -76,8 +76,8 @@ static int twl6030_interrupt_mapping[24] = { | |||
76 | USBOTG_INTR_OFFSET, /* Bit 18 ID */ | 76 | USBOTG_INTR_OFFSET, /* Bit 18 ID */ |
77 | USB_PRES_INTR_OFFSET, /* Bit 19 VBUS */ | 77 | USB_PRES_INTR_OFFSET, /* Bit 19 VBUS */ |
78 | CHARGER_INTR_OFFSET, /* Bit 20 CHRG_CTRL */ | 78 | CHARGER_INTR_OFFSET, /* Bit 20 CHRG_CTRL */ |
79 | CHARGER_INTR_OFFSET, /* Bit 21 EXT_CHRG */ | 79 | CHARGERFAULT_INTR_OFFSET, /* Bit 21 EXT_CHRG */ |
80 | CHARGER_INTR_OFFSET, /* Bit 22 INT_CHRG */ | 80 | CHARGERFAULT_INTR_OFFSET, /* Bit 22 INT_CHRG */ |
81 | RSV_INTR_OFFSET, /* Bit 23 Reserved */ | 81 | RSV_INTR_OFFSET, /* Bit 23 Reserved */ |
82 | }; | 82 | }; |
83 | /*----------------------------------------------------------------------*/ | 83 | /*----------------------------------------------------------------------*/ |