Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6523b148 authored by Graeme Gregory's avatar Graeme Gregory Committed by Samuel Ortiz
Browse files

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: default avatarGraeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 521d8ec3

drivers/mfd/twl6030-irq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -76,8 +76,8 @@ static int twl6030_interrupt_mapping[24] = { 
	USBOTG_INTR_OFFSET,	/* Bit 18	ID			*/

	USBOTG_INTR_OFFSET,	/* Bit 18	ID			*/

	USB_PRES_INTR_OFFSET,	/* Bit 19	VBUS			*/

	USB_PRES_INTR_OFFSET,	/* Bit 19	VBUS			*/

	CHARGER_INTR_OFFSET,	/* Bit 20	CHRG_CTRL		*/

	CHARGER_INTR_OFFSET,	/* Bit 20	CHRG_CTRL		*/

	CHARGER_INTR_OFFSET,	/* Bit 21	EXT_CHRG		*/

	CHARGERFAULT_INTR_OFFSET,	/* Bit 21	EXT_CHRG	*/

	CHARGER_INTR_OFFSET,	/* Bit 22	INT_CHRG		*/

	CHARGERFAULT_INTR_OFFSET,	/* Bit 22	INT_CHRG	*/

	RSV_INTR_OFFSET,	/* Bit 23	Reserved		*/

	RSV_INTR_OFFSET,	/* Bit 23	Reserved		*/

};

};

/*----------------------------------------------------------------------*/

/*----------------------------------------------------------------------*/

include/linux/i2c/twl.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define BCI_INTR_OFFSET		2

#define BCI_INTR_OFFSET		2

#define MADC_INTR_OFFSET	3

#define MADC_INTR_OFFSET	3

#define USB_INTR_OFFSET		4

#define USB_INTR_OFFSET		4

#define CHARGERFAULT_INTR_OFFSET 5

#define BCI_PRES_INTR_OFFSET	9

#define BCI_PRES_INTR_OFFSET	9

#define USB_PRES_INTR_OFFSET	10

#define USB_PRES_INTR_OFFSET	10

#define RTC_INTR_OFFSET		11

#define RTC_INTR_OFFSET		11