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

Commit fa0d9762 authored by Balaji T K's avatar Balaji T K Committed by Samuel Ortiz
Browse files

mfd: Add twl6030 base addr for ID0, ID1, ID2 



Add base address for generic slave ID0, ID1, ID2
and introduced one more entry to align RTC module number between
twl4030 and twl6030

Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent a29aaf55

drivers/mfd/twl-core.c

+5 −2
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
/* subchip/slave 3 0x4B - AUDIO */

#define TWL6030_BASEADD_AUDIO		0x0000

#define TWL6030_BASEADD_RSV		0x0000

#define TWL6030_BASEADD_ZERO		0x0000



/* Few power values */

#define R_CFG_BOOT			0x05
@@ -313,9 +314,11 @@ static struct twl_mapping twl6030_map[] = { 
	{ SUB_CHIP_ID1, TWL6030_BASEADD_CHARGER },

	{ SUB_CHIP_ID1, TWL6030_BASEADD_GASGAUGE },

	{ SUB_CHIP_ID1, TWL6030_BASEADD_PWM },

	{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },

	{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },

	{ SUB_CHIP_ID0, TWL6030_BASEADD_ZERO },

	{ SUB_CHIP_ID1, TWL6030_BASEADD_ZERO },



	{ SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },

	{ SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },

	{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },

	{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },

	{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },

include/linux/i2c/twl.h

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ 
#define TWL_MODULE_PM_MASTER	TWL4030_MODULE_PM_MASTER

#define TWL_MODULE_PM_RECEIVER	TWL4030_MODULE_PM_RECEIVER

#define TWL_MODULE_RTC		TWL4030_MODULE_RTC

#define TWL_MODULE_PWM		TWL4030_MODULE_PWM0



#define TWL6030_MODULE_ID0	0x0D

#define TWL6030_MODULE_ID1	0x0E

#define TWL6030_MODULE_ID2	0x0F



#define GPIO_INTR_OFFSET	0

#define KEYPAD_INTR_OFFSET	1