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: Balaji T K <balajitk@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 7ccc39f3aa48e61ccf7fb98d1618a9170ebe6c6f..562cd4935e17bb5d25e13f7488b9afd508fcdf74 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -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 },

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index e28d4c0e45bd2fd27b38833616f90d5543f4576c..70d4caf485719e64799fee270bd937cc387f4dc5 100644 (file)
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -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