Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[karo-tx-linux.git] / include / linux / mfd / twl6040.h

diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index ba43d4806b833e48fe7d67df559e6849c1253817..a8eff4ad9be5f63197435653c05690cfe3e38186 100644 (file)
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -143,7 +143,7 @@
 
 #define TWL6040_GPO1                   0x01
 #define TWL6040_GPO2                   0x02
-#define TWL6040_GPO3                   0x03
+#define TWL6040_GPO3                   0x04
 
 /* ACCCTL (0x2D) fields */
 
@@ -158,7 +158,7 @@
 #define TWL6040_VIBROCDET              0x20
 #define TWL6040_TSHUTDET                0x40
 
-#define TWL6040_CELLS                  2
+#define TWL6040_CELLS                  3
 
 #define TWL6040_REV_ES1_0              0x00
 #define TWL6040_REV_ES1_1              0x01 /* Rev ES1.1 and ES1.2 */
@@ -176,6 +176,8 @@
 #define TWL6040_SYSCLK_SEL_LPPLL       0
 #define TWL6040_SYSCLK_SEL_HPPLL       1
 
+#define TWL6040_GPO_MAX        3
+
 struct twl6040_codec_data {
        u16 hs_left_step;
        u16 hs_right_step;
@@ -192,11 +194,16 @@ struct twl6040_vibra_data {
        int vddvibr_uV;                 /* VDDVIBR volt, set 0 for fixed reg */
 };
 
+struct twl6040_gpo_data {
+       int gpio_base;
+};
+
 struct twl6040_platform_data {
        int audpwron_gpio;      /* audio power-on gpio */
 
        struct twl6040_codec_data *codec;
        struct twl6040_vibra_data *vibra;
+       struct twl6040_gpo_data *gpo;
 };
 
 struct regmap;