diff options
-rw-r--r-- | drivers/mfd/twl-core.c | 7 | ||||
-rw-r--r-- | include/linux/i2c/twl.h | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 7ccc39f3aa48..562cd4935e17 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c | |||
@@ -198,6 +198,7 @@ | |||
198 | /* subchip/slave 3 0x4B - AUDIO */ | 198 | /* subchip/slave 3 0x4B - AUDIO */ |
199 | #define TWL6030_BASEADD_AUDIO 0x0000 | 199 | #define TWL6030_BASEADD_AUDIO 0x0000 |
200 | #define TWL6030_BASEADD_RSV 0x0000 | 200 | #define TWL6030_BASEADD_RSV 0x0000 |
201 | #define TWL6030_BASEADD_ZERO 0x0000 | ||
201 | 202 | ||
202 | /* Few power values */ | 203 | /* Few power values */ |
203 | #define R_CFG_BOOT 0x05 | 204 | #define R_CFG_BOOT 0x05 |
@@ -313,9 +314,11 @@ static struct twl_mapping twl6030_map[] = { | |||
313 | { SUB_CHIP_ID1, TWL6030_BASEADD_CHARGER }, | 314 | { SUB_CHIP_ID1, TWL6030_BASEADD_CHARGER }, |
314 | { SUB_CHIP_ID1, TWL6030_BASEADD_GASGAUGE }, | 315 | { SUB_CHIP_ID1, TWL6030_BASEADD_GASGAUGE }, |
315 | { SUB_CHIP_ID1, TWL6030_BASEADD_PWM }, | 316 | { SUB_CHIP_ID1, TWL6030_BASEADD_PWM }, |
316 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, | 317 | { SUB_CHIP_ID0, TWL6030_BASEADD_ZERO }, |
317 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, | 318 | { SUB_CHIP_ID1, TWL6030_BASEADD_ZERO }, |
318 | 319 | ||
320 | { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO }, | ||
321 | { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO }, | ||
319 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, | 322 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, |
320 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, | 323 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, |
321 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, | 324 | { SUB_CHIP_ID2, TWL6030_BASEADD_RSV }, |
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index e28d4c0e45bd..70d4caf48571 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
@@ -80,6 +80,11 @@ | |||
80 | #define TWL_MODULE_PM_MASTER TWL4030_MODULE_PM_MASTER | 80 | #define TWL_MODULE_PM_MASTER TWL4030_MODULE_PM_MASTER |
81 | #define TWL_MODULE_PM_RECEIVER TWL4030_MODULE_PM_RECEIVER | 81 | #define TWL_MODULE_PM_RECEIVER TWL4030_MODULE_PM_RECEIVER |
82 | #define TWL_MODULE_RTC TWL4030_MODULE_RTC | 82 | #define TWL_MODULE_RTC TWL4030_MODULE_RTC |
83 | #define TWL_MODULE_PWM TWL4030_MODULE_PWM0 | ||
84 | |||
85 | #define TWL6030_MODULE_ID0 0x0D | ||
86 | #define TWL6030_MODULE_ID1 0x0E | ||
87 | #define TWL6030_MODULE_ID2 0x0F | ||
83 | 88 | ||
84 | #define GPIO_INTR_OFFSET 0 | 89 | #define GPIO_INTR_OFFSET 0 |
85 | #define KEYPAD_INTR_OFFSET 1 | 90 | #define KEYPAD_INTR_OFFSET 1 |