3 files changed, 71 insertions, 40 deletions

diff --git a/include/linux/i2c/i2c-hid.h b/include/linux/i2c/i2c-hid.h
new file mode 100644
index 000000000000..60e411d764d4
--- /dev/null
+++ b/include/linux/i2c/i2c-hid.h
@@ -0,0 +1,35 @@
+/*
+ * HID over I2C protocol implementation
+ *
+ * Copyright (c) 2012 Benjamin Tissoires <benjamin.tissoires@gmail.com>
+ * Copyright (c) 2012 Ecole Nationale de l'Aviation Civile, France
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive for
+ * more details.
+ */
+
+#ifndef __LINUX_I2C_HID_H
+#define __LINUX_I2C_HID_H
+
+#include <linux/types.h>
+
+/**
+ * struct i2chid_platform_data - used by hid over i2c implementation.
+ * @hid_descriptor_address: i2c register where the HID descriptor is stored.
+ *
+ * Note that it is the responsibility of the platform driver (or the acpi 5.0
+ * driver) to setup the irq related to the gpio in the struct i2c_board_info.
+ * The platform driver should also setup the gpio according to the device:
+ *
+ * A typical example is the following:
+ *      irq = gpio_to_irq(intr_gpio);
+ *      hkdk4412_i2c_devs5[0].irq = irq; // store the irq in i2c_board_info
+ *      gpio_request(intr_gpio, "elan-irq");
+ *      s3c_gpio_setpull(intr_gpio, S3C_GPIO_PULL_UP);
+ */
+struct i2c_hid_platform_data {
+        u16 hid_descriptor_address;
+};
+
+#endif /* __LINUX_I2C_HID_H */
diff --git a/include/linux/i2c/pcf857x.h b/include/linux/i2c/pcf857x.h
index 781e6bd06c34..0767a2a6b2f1 100644
--- a/include/linux/i2c/pcf857x.h
+++ b/include/linux/i2c/pcf857x.h
@@ -10,7 +10,6 @@
  * @setup: optional callback issued once the GPIOs are valid
  * @teardown: optional callback issued before the GPIOs are invalidated
  * @context: optional parameter passed to setup() and teardown()
- * @irq: optional interrupt number
  *
  * In addition to the I2C_BOARD_INFO() state appropriate to each chip,
  * the i2c_board_info used with the pcf875x driver must provide its
@@ -40,8 +39,6 @@ struct pcf857x_platform_data {
                                         int gpio, unsigned ngpio,
                                         void *context);
         void            *context;
-
-        int             irq;
 };
 
 #endif /* __LINUX_PCF857X_H */
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