From f1f4126cf94b10ffb4bd0e1ee91fe3d7eef98c8f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 12 May 2011 14:27:56 +0100 Subject: [PATCH] --- yaml --- r: 251943 b: refs/heads/master c: 6523b148b44be38d89c2ee9865d34da30d9f5f1c h: refs/heads/master i: 251941: 1b605bef839dcc7f477a40d572f854b04ffcb8c8 251939: 40284f176033bee046dc61b515acb952dc89f8e5 251935: 8c593b6d7996919f723ffb3130b32e8b056a50a0 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl6030-irq.c | 4 ++-- trunk/include/linux/i2c/twl.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 81545b4d68c5..55612b3c6a92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 521d8ec3f0d8069bea3b3afa70f487cdb5118018 +refs/heads/master: 6523b148b44be38d89c2ee9865d34da30d9f5f1c diff --git a/trunk/drivers/mfd/twl6030-irq.c b/trunk/drivers/mfd/twl6030-irq.c index dfbae34e1804..eb3b5f88e566 100644 --- a/trunk/drivers/mfd/twl6030-irq.c +++ b/trunk/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 */ }; /*----------------------------------------------------------------------*/ diff --git a/trunk/include/linux/i2c/twl.h b/trunk/include/linux/i2c/twl.h index d70e704cbbb6..ba4f88624fcd 100644 --- a/trunk/include/linux/i2c/twl.h +++ b/trunk/include/linux/i2c/twl.h @@ -91,6 +91,7 @@ #define BCI_INTR_OFFSET 2 #define MADC_INTR_OFFSET 3 #define USB_INTR_OFFSET 4 +#define CHARGERFAULT_INTR_OFFSET 5 #define BCI_PRES_INTR_OFFSET 9 #define USB_PRES_INTR_OFFSET 10 #define RTC_INTR_OFFSET 11