1 files changed, 36 insertions, 37 deletions

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 9a5e28462324..1ff54b114efc 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -39,52 +39,51 @@
  * address each module uses within a given i2c slave.
  */
 
-/* Slave 0 (i2c address 0x48) */
-#define TWL4030_MODULE_USB              0x00
-
-/* Slave 1 (i2c address 0x49) */
-#define TWL4030_MODULE_AUDIO_VOICE      0x01
-#define TWL4030_MODULE_GPIO             0x02
-#define TWL4030_MODULE_INTBR            0x03
-#define TWL4030_MODULE_PIH              0x04
-#define TWL4030_MODULE_TEST             0x05
-
-/* Slave 2 (i2c address 0x4a) */
-#define TWL4030_MODULE_KEYPAD           0x06
-#define TWL4030_MODULE_MADC             0x07
-#define TWL4030_MODULE_INTERRUPTS       0x08
-#define TWL4030_MODULE_LED              0x09
-#define TWL4030_MODULE_MAIN_CHARGE      0x0A
-#define TWL4030_MODULE_PRECHARGE        0x0B
-#define TWL4030_MODULE_PWM0             0x0C
-#define TWL4030_MODULE_PWM1             0x0D
-#define TWL4030_MODULE_PWMA             0x0E
-#define TWL4030_MODULE_PWMB             0x0F
-
-#define TWL5031_MODULE_ACCESSORY        0x10
-#define TWL5031_MODULE_INTERRUPTS       0x11
-
-/* Slave 3 (i2c address 0x4b) */
-#define TWL4030_MODULE_BACKUP           0x12
-#define TWL4030_MODULE_INT              0x13
-#define TWL4030_MODULE_PM_MASTER        0x14
-#define TWL4030_MODULE_PM_RECEIVER      0x15
-#define TWL4030_MODULE_RTC              0x16
-#define TWL4030_MODULE_SECURED_REG      0x17
+enum twl4030_module_ids {
+        TWL4030_MODULE_USB = 0,         /* Slave 0 (i2c address 0x48) */
+        TWL4030_MODULE_AUDIO_VOICE,     /* Slave 1 (i2c address 0x49) */
+        TWL4030_MODULE_GPIO,
+        TWL4030_MODULE_INTBR,
+        TWL4030_MODULE_PIH,
+
+        TWL4030_MODULE_TEST,
+        TWL4030_MODULE_KEYPAD,          /* Slave 2 (i2c address 0x4a) */
+        TWL4030_MODULE_MADC,
+        TWL4030_MODULE_INTERRUPTS,
+        TWL4030_MODULE_LED,
+
+        TWL4030_MODULE_MAIN_CHARGE,
+        TWL4030_MODULE_PRECHARGE,
+        TWL4030_MODULE_PWM0,
+        TWL4030_MODULE_PWM1,
+        TWL4030_MODULE_PWMA,
+
+        TWL4030_MODULE_PWMB,
+        TWL5031_MODULE_ACCESSORY,
+        TWL5031_MODULE_INTERRUPTS,
+        TWL4030_MODULE_BACKUP,          /* Slave 3 (i2c address 0x4b) */
+        TWL4030_MODULE_INT,
+
+        TWL4030_MODULE_PM_MASTER,
+        TWL4030_MODULE_PM_RECEIVER,
+        TWL4030_MODULE_RTC,
+        TWL4030_MODULE_SECURED_REG,
+        TWL4030_MODULE_LAST,
+};
 
+/* Similar functionalities implemented in TWL4030/6030 */
 #define TWL_MODULE_USB          TWL4030_MODULE_USB
-#define TWL_MODULE_AUDIO_VOICE  TWL4030_MODULE_AUDIO_VOICE
 #define TWL_MODULE_PIH          TWL4030_MODULE_PIH
-#define TWL_MODULE_MADC         TWL4030_MODULE_MADC
 #define TWL_MODULE_MAIN_CHARGE  TWL4030_MODULE_MAIN_CHARGE
 #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 TWL_MODULE_LED          TWL4030_MODULE_LED
 
-#define TWL6030_MODULE_ID0      0x0D
-#define TWL6030_MODULE_ID1      0x0E
-#define TWL6030_MODULE_ID2      0x0F
+#define TWL6030_MODULE_ID0      13
+#define TWL6030_MODULE_ID1      14
+#define TWL6030_MODULE_ID2      15
 
 #define GPIO_INTR_OFFSET        0
 #define KEYPAD_INTR_OFFSET      1