4 files changed, 277 insertions, 25 deletions

diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
index fc5db826b48e..02c9af374741 100644
--- a/include/linux/i2c/adp5588.h
+++ b/include/linux/i2c/adp5588.h
@@ -89,4 +89,16 @@ struct adp5588_kpad_platform_data {
         unsigned short unlock_key2;     /* Unlock Key 2 */
 };
 
+struct adp5588_gpio_platform_data {
+        unsigned gpio_start;            /* GPIO Chip base # */
+        unsigned pullup_dis_mask;       /* Pull-Up Disable Mask */
+        int     (*setup)(struct i2c_client *client,
+                                int gpio, unsigned ngpio,
+                                void *context);
+        int     (*teardown)(struct i2c_client *client,
+                                int gpio, unsigned ngpio,
+                                void *context);
+        void    *context;
+};
+
 #endif
diff --git a/include/linux/i2c/pca953x.h b/include/linux/i2c/pca953x.h
index 81736d6a8db7..d5c5a60c8a0b 100644
--- a/include/linux/i2c/pca953x.h
+++ b/include/linux/i2c/pca953x.h
@@ -1,3 +1,9 @@
+#ifndef _LINUX_PCA953X_H
+#define _LINUX_PCA953X_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
 /* platform data for the PCA9539 16-bit I/O expander driver */
 
 struct pca953x_platform_data {
@@ -7,6 +13,9 @@ struct pca953x_platform_data {
         /* initial polarity inversion setting */
         uint16_t        invert;
 
+        /* interrupt base */
+        int             irq_base;
+
         void            *context;       /* param to setup/teardown */
 
         int             (*setup)(struct i2c_client *client,
@@ -17,3 +26,5 @@ struct pca953x_platform_data {
                                 void *context);
         char            **names;
 };
+
+#endif /* _LINUX_PCA953X_H */
diff --git a/include/linux/i2c/tps65010.h b/include/linux/i2c/tps65010.h
index 918c5354d9b8..08aa92278d71 100644
--- a/include/linux/i2c/tps65010.h
+++ b/include/linux/i2c/tps65010.h
@@ -72,6 +72,21 @@
 #define TPS_VDCDC1              0x0c
 #       define  TPS_ENABLE_LP           (1 << 3)
 #define TPS_VDCDC2              0x0d
+#       define  TPS_LP_COREOFF  (1 << 7)
+#       define  TPS_VCORE_1_8V  (7<<4)
+#       define  TPS_VCORE_1_5V  (6 << 4)
+#       define  TPS_VCORE_1_4V  (5 << 4)
+#       define  TPS_VCORE_1_3V  (4 << 4)
+#       define  TPS_VCORE_1_2V  (3 << 4)
+#       define  TPS_VCORE_1_1V  (2 << 4)
+#       define  TPS_VCORE_1_0V  (1 << 4)
+#       define  TPS_VCORE_0_85V (0 << 4)
+#       define  TPS_VCORE_LP_1_2V (3 << 2)
+#       define  TPS_VCORE_LP_1_1V (2 << 2)
+#       define  TPS_VCORE_LP_1_0V (1 << 2)
+#       define  TPS_VCORE_LP_0_85V (0 << 2)
+#       define  TPS_VIB         (1 << 1)
+#       define  TPS_VCORE_DISCH (1 << 0)
 #define TPS_VREGS1              0x0e
 #       define  TPS_LDO2_ENABLE (1 << 7)
 #       define  TPS_LDO2_OFF    (1 << 6)
@@ -152,6 +167,10 @@ extern int tps65010_config_vregs1(unsigned value);
  */
 extern int tps65013_set_low_pwr(unsigned mode);
 
+/* tps65010_set_vdcdc2
+ *  value to be written to VDCDC2
+ */
+extern int tps65010_config_vdcdc2(unsigned value);
 
 struct i2c_client;
 
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl.h
index 508824ee35e6..fb6784e86d5f 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __TWL4030_H_
-#define __TWL4030_H_
+#ifndef __TWL_H_
+#define __TWL_H_
 
 #include <linux/types.h>
 #include <linux/input/matrix_keypad.h>
@@ -61,28 +61,117 @@
 #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           0x10
-#define TWL4030_MODULE_INT              0x11
-#define TWL4030_MODULE_PM_MASTER        0x12
-#define TWL4030_MODULE_PM_RECEIVER      0x13
-#define TWL4030_MODULE_RTC              0x14
-#define TWL4030_MODULE_SECURED_REG      0x15
+#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
+
+#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 TWL6030_MODULE_ID0      0x0D
+#define TWL6030_MODULE_ID1      0x0E
+#define TWL6030_MODULE_ID2      0x0F
+
+#define GPIO_INTR_OFFSET        0
+#define KEYPAD_INTR_OFFSET      1
+#define BCI_INTR_OFFSET         2
+#define MADC_INTR_OFFSET        3
+#define USB_INTR_OFFSET         4
+#define BCI_PRES_INTR_OFFSET    9
+#define USB_PRES_INTR_OFFSET    10
+#define RTC_INTR_OFFSET         11
+
+/*
+ * Offset from TWL6030_IRQ_BASE / pdata->irq_base
+ */
+#define PWR_INTR_OFFSET         0
+#define HOTDIE_INTR_OFFSET      12
+#define SMPSLDO_INTR_OFFSET     13
+#define BATDETECT_INTR_OFFSET   14
+#define SIMDETECT_INTR_OFFSET   15
+#define MMCDETECT_INTR_OFFSET   16
+#define GASGAUGE_INTR_OFFSET    17
+#define USBOTG_INTR_OFFSET      4
+#define CHARGER_INTR_OFFSET     2
+#define RSV_INTR_OFFSET         0
+
+/* INT register offsets */
+#define REG_INT_STS_A                   0x00
+#define REG_INT_STS_B                   0x01
+#define REG_INT_STS_C                   0x02
+
+#define REG_INT_MSK_LINE_A              0x03
+#define REG_INT_MSK_LINE_B              0x04
+#define REG_INT_MSK_LINE_C              0x05
+
+#define REG_INT_MSK_STS_A               0x06
+#define REG_INT_MSK_STS_B               0x07
+#define REG_INT_MSK_STS_C               0x08
+
+/* MASK INT REG GROUP A */
+#define TWL6030_PWR_INT_MASK            0x07
+#define TWL6030_RTC_INT_MASK            0x18
+#define TWL6030_HOTDIE_INT_MASK         0x20
+#define TWL6030_SMPSLDOA_INT_MASK       0xC0
+
+/* MASK INT REG GROUP B */
+#define TWL6030_SMPSLDOB_INT_MASK       0x01
+#define TWL6030_BATDETECT_INT_MASK      0x02
+#define TWL6030_SIMDETECT_INT_MASK      0x04
+#define TWL6030_MMCDETECT_INT_MASK      0x08
+#define TWL6030_GPADC_INT_MASK          0x60
+#define TWL6030_GASGAUGE_INT_MASK       0x80
+
+/* MASK INT REG GROUP C */
+#define TWL6030_USBOTG_INT_MASK         0x0F
+#define TWL6030_CHARGER_CTRL_INT_MASK   0x10
+#define TWL6030_CHARGER_FAULT_INT_MASK  0x60
+
+
+#define TWL4030_CLASS_ID                0x4030
+#define TWL6030_CLASS_ID                0x6030
+unsigned int twl_rev(void);
+#define GET_TWL_REV (twl_rev())
+#define TWL_CLASS_IS(class, id)                 \
+static inline int twl_class_is_ ##class(void)   \
+{                                               \
+        return ((id) == (GET_TWL_REV)) ? 1 : 0; \
+}
+
+TWL_CLASS_IS(4030, TWL4030_CLASS_ID)
+TWL_CLASS_IS(6030, TWL6030_CLASS_ID)
 
 /*
  * Read and write single 8-bit registers
  */
-int twl4030_i2c_write_u8(u8 mod_no, u8 val, u8 reg);
-int twl4030_i2c_read_u8(u8 mod_no, u8 *val, u8 reg);
+int twl_i2c_write_u8(u8 mod_no, u8 val, u8 reg);
+int twl_i2c_read_u8(u8 mod_no, u8 *val, u8 reg);
 
 /*
  * Read and write several 8-bit registers at once.
  *
- * IMPORTANT:  For twl4030_i2c_write(), allocate num_bytes + 1
+ * IMPORTANT:  For twl_i2c_write(), allocate num_bytes + 1
  * for the value, and populate your data starting at offset 1.
  */
-int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
-int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
+int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
+int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
+
+int twl6030_interrupt_unmask(u8 bit_mask, u8 offset);
+int twl6030_interrupt_mask(u8 bit_mask, u8 offset);
 
 /*----------------------------------------------------------------------*/
 
@@ -155,6 +244,21 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 
 /*----------------------------------------------------------------------*/
 
+/*Interface Bit Register (INTBR) offsets
+ *(Use TWL_4030_MODULE_INTBR)
+ */
+
+#define REG_GPPUPDCTR1                  0x0F
+
+/*I2C1 and I2C4(SR) SDA/SCL pull-up control bits */
+
+#define I2C_SCL_CTRL_PU                 BIT(0)
+#define I2C_SDA_CTRL_PU                 BIT(2)
+#define SR_I2C_SCL_CTRL_PU              BIT(4)
+#define SR_I2C_SDA_CTRL_PU              BIT(6)
+
+/*----------------------------------------------------------------------*/
+
 /*
  * Keypad register offsets (use TWL4030_MODULE_KEYPAD)
  * ... SIH/interrupt only
@@ -221,6 +325,38 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 
 /*----------------------------------------------------------------------*/
 
+/*
+ * Accessory Interrupts
+ */
+#define TWL5031_ACIIMR_LSB              0x05
+#define TWL5031_ACIIMR_MSB              0x06
+#define TWL5031_ACIIDR_LSB              0x07
+#define TWL5031_ACIIDR_MSB              0x08
+#define TWL5031_ACCISR1                 0x0F
+#define TWL5031_ACCIMR1                 0x10
+#define TWL5031_ACCISR2                 0x11
+#define TWL5031_ACCIMR2                 0x12
+#define TWL5031_ACCSIR                  0x13
+#define TWL5031_ACCEDR1                 0x14
+#define TWL5031_ACCSIHCTRL              0x15
+
+/*----------------------------------------------------------------------*/
+
+/*
+ * Battery Charger Controller
+ */
+
+#define TWL5031_INTERRUPTS_BCIISR1      0x0
+#define TWL5031_INTERRUPTS_BCIIMR1      0x1
+#define TWL5031_INTERRUPTS_BCIISR2      0x2
+#define TWL5031_INTERRUPTS_BCIIMR2      0x3
+#define TWL5031_INTERRUPTS_BCISIR       0x4
+#define TWL5031_INTERRUPTS_BCIEDR1      0x5
+#define TWL5031_INTERRUPTS_BCIEDR2      0x6
+#define TWL5031_INTERRUPTS_BCISIHCTRL   0x7
+
+/*----------------------------------------------------------------------*/
+
 /* Power bus message definitions */
 
 /* The TWL4030/5030 splits its power-management resources (the various
@@ -250,6 +386,7 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 
 #define RES_TYPE_ALL            0x7
 
+/* Resource states */
 #define RES_STATE_WRST          0xF
 #define RES_STATE_ACTIVE        0xE
 #define RES_STATE_SLEEP         0x8
@@ -310,8 +447,18 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 #define MSG_SINGULAR(devgrp, id, state) \
         ((devgrp) << 13 | 0 << 12 | (id) << 4 | (state))
 
+#define MSG_BROADCAST_ALL(devgrp, state) \
+        ((devgrp) << 5 | (state))
+
+#define MSG_BROADCAST_REF MSG_BROADCAST_ALL
+#define MSG_BROADCAST_PROV MSG_BROADCAST_ALL
+#define MSG_BROADCAST__CLK_RST MSG_BROADCAST_ALL
 /*----------------------------------------------------------------------*/
 
+struct twl4030_clock_init_data {
+        bool ck32k_lowpwr_enable;
+};
+
 struct twl4030_bci_platform_data {
         int *battery_tmp_tbl;
         unsigned int tblsize;
@@ -391,38 +538,78 @@ struct twl4030_resconfig {
         u8 devgroup;    /* Processor group that Power resource belongs to */
         u8 type;        /* Power resource addressed, 6 / broadcast message */
         u8 type2;       /* Power resource addressed, 3 / broadcast message */
+        u8 remap_off;   /* off state remapping */
+        u8 remap_sleep; /* sleep state remapping */
 };
 
 struct twl4030_power_data {
         struct twl4030_script **scripts;
         unsigned num;
         struct twl4030_resconfig *resource_config;
+#define TWL4030_RESCONFIG_UNDEF ((u8)-1)
 };
 
 extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
+extern int twl4030_remove_script(u8 flags);
+
+struct twl4030_codec_audio_data {
+        unsigned int    audio_mclk;
+        unsigned int ramp_delay_value;
+        unsigned int hs_extmute:1;
+        void (*set_hs_extmute)(int mute);
+};
+
+struct twl4030_codec_vibra_data {
+        unsigned int    audio_mclk;
+        unsigned int    coexist;
+};
+
+struct twl4030_codec_data {
+        unsigned int    audio_mclk;
+        struct twl4030_codec_audio_data         *audio;
+        struct twl4030_codec_vibra_data         *vibra;
+
+        /* twl6030 */
+        int audpwron_gpio;      /* audio power-on gpio */
+        int naudint_irq;        /* audio interrupt */
+};
 
 struct twl4030_platform_data {
         unsigned                                irq_base, irq_end;
+        struct twl4030_clock_init_data          *clock;
         struct twl4030_bci_platform_data        *bci;
         struct twl4030_gpio_platform_data       *gpio;
         struct twl4030_madc_platform_data       *madc;
         struct twl4030_keypad_data              *keypad;
         struct twl4030_usb_data                 *usb;
         struct twl4030_power_data               *power;
+        struct twl4030_codec_data               *codec;
 
-        /* LDO regulators */
+        /* Common LDO regulators for TWL4030/TWL6030 */
         struct regulator_init_data              *vdac;
+        struct regulator_init_data              *vaux1;
+        struct regulator_init_data              *vaux2;
+        struct regulator_init_data              *vaux3;
+        /* TWL4030 LDO regulators */
         struct regulator_init_data              *vpll1;
         struct regulator_init_data              *vpll2;
         struct regulator_init_data              *vmmc1;
         struct regulator_init_data              *vmmc2;
         struct regulator_init_data              *vsim;
-        struct regulator_init_data              *vaux1;
-        struct regulator_init_data              *vaux2;
-        struct regulator_init_data              *vaux3;
         struct regulator_init_data              *vaux4;
-
-        /* REVISIT more to come ... _nothing_ should be hard-wired */
+        struct regulator_init_data              *vio;
+        struct regulator_init_data              *vdd1;
+        struct regulator_init_data              *vdd2;
+        struct regulator_init_data              *vintana1;
+        struct regulator_init_data              *vintana2;
+        struct regulator_init_data              *vintdig;
+        /* TWL6030 LDO regulators */
+        struct regulator_init_data              *vmmc;
+        struct regulator_init_data              *vpp;
+        struct regulator_init_data              *vusim;
+        struct regulator_init_data              *vana;
+        struct regulator_init_data              *vcxio;
+        struct regulator_init_data              *vusb;
 };
 
 /*----------------------------------------------------------------------*/
@@ -439,12 +626,7 @@ int twl4030_sih_setup(int module);
 #define TWL4030_VAUX3_DEV_GRP           0x1F
 #define TWL4030_VAUX3_DEDICATED         0x22
 
-#if defined(CONFIG_TWL4030_BCI_BATTERY) || \
-        defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)
-        extern int twl4030charger_usb_en(int enable);
-#else
-        static inline int twl4030charger_usb_en(int enable) { return 0; }
-#endif
+static inline int twl4030charger_usb_en(int enable) { return 0; }
 
 /*----------------------------------------------------------------------*/
 
@@ -454,6 +636,7 @@ int twl4030_sih_setup(int module);
  * VIO is generally fixed.
  */
 
+/* TWL4030 SMPS/LDO's */
 /* EXTERNAL dc-to-dc buck converters */
 #define TWL4030_REG_VDD1        0
 #define TWL4030_REG_VDD2        1
@@ -480,4 +663,31 @@ int twl4030_sih_setup(int module);
 #define TWL4030_REG_VUSB1V8     18
 #define TWL4030_REG_VUSB3V1     19
 
+/* TWL6030 SMPS/LDO's */
+/* EXTERNAL dc-to-dc buck convertor contollable via SR */
+#define TWL6030_REG_VDD1        30
+#define TWL6030_REG_VDD2        31
+#define TWL6030_REG_VDD3        32
+
+/* Non SR compliant dc-to-dc buck convertors */
+#define TWL6030_REG_VMEM        33
+#define TWL6030_REG_V2V1        34
+#define TWL6030_REG_V1V29       35
+#define TWL6030_REG_V1V8        36
+
+/* EXTERNAL LDOs */
+#define TWL6030_REG_VAUX1_6030  37
+#define TWL6030_REG_VAUX2_6030  38
+#define TWL6030_REG_VAUX3_6030  39
+#define TWL6030_REG_VMMC        40
+#define TWL6030_REG_VPP         41
+#define TWL6030_REG_VUSIM       42
+#define TWL6030_REG_VANA        43
+#define TWL6030_REG_VCXIO       44
+#define TWL6030_REG_VDAC        45
+#define TWL6030_REG_VUSB        46
+
+/* INTERNAL LDOs */
+#define TWL6030_REG_VRTC        47
+
 #endif /* End of __TWL4030_H */