1 files changed, 52 insertions, 2 deletions

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 0c0d1ae79981..ba4f88624fcd 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -91,6 +91,7 @@
 #define BCI_INTR_OFFSET         2
 #define MADC_INTR_OFFSET        3
 #define USB_INTR_OFFSET         4
+#define CHARGERFAULT_INTR_OFFSET 5
 #define BCI_PRES_INTR_OFFSET    9
 #define USB_PRES_INTR_OFFSET    10
 #define RTC_INTR_OFFSET         11
@@ -150,7 +151,12 @@
 #define MMC_PU                          (0x1 << 3)
 #define MMC_PD                          (0x1 << 2)
 
-
+#define TWL_SIL_TYPE(rev)               ((rev) & 0x00FFFFFF)
+#define TWL_SIL_REV(rev)                ((rev) >> 24)
+#define TWL_SIL_5030                    0x09002F
+#define TWL5030_REV_1_0                 0x00
+#define TWL5030_REV_1_1                 0x10
+#define TWL5030_REV_1_2                 0x30
 
 #define TWL4030_CLASS_ID                0x4030
 #define TWL6030_CLASS_ID                0x6030
@@ -165,6 +171,8 @@ static inline int twl_class_is_ ##class(void)	\
 TWL_CLASS_IS(4030, TWL4030_CLASS_ID)
 TWL_CLASS_IS(6030, TWL6030_CLASS_ID)
 
+#define TWL6025_SUBCLASS        BIT(4)  /* TWL6025 has changed registers */
+
 /*
  * Read and write single 8-bit registers
  */
@@ -180,6 +188,9 @@ int twl_i2c_read_u8(u8 mod_no, u8 *val, u8 reg);
 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 twl_get_type(void);
+int twl_get_version(void);
+
 int twl6030_interrupt_unmask(u8 bit_mask, u8 offset);
 int twl6030_interrupt_mask(u8 bit_mask, u8 offset);
 
@@ -279,7 +290,12 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
  *(Use TWL_4030_MODULE_INTBR)
  */
 
+#define REG_IDCODE_7_0                  0x00
+#define REG_IDCODE_15_8                 0x01
+#define REG_IDCODE_16_23                0x02
+#define REG_IDCODE_31_24                0x03
 #define REG_GPPUPDCTR1                  0x0F
+#define REG_UNLOCK_TEST_REG             0x12
 
 /*I2C1 and I2C4(SR) SDA/SCL pull-up control bits */
 
@@ -288,6 +304,8 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
 #define SR_I2C_SCL_CTRL_PU              BIT(4)
 #define SR_I2C_SDA_CTRL_PU              BIT(6)
 
+#define TWL_EEPROM_R_UNLOCK             0x49
+
 /*----------------------------------------------------------------------*/
 
 /*
@@ -501,7 +519,7 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
 #define RES_32KCLKOUT           26
 #define RES_RESET               27
 /* Power Reference */
-#define RES_Main_Ref            28
+#define RES_MAIN_REF            28
 
 #define TOTAL_RESOURCES         28
 /*
@@ -593,6 +611,7 @@ enum twl4030_usb_mode {
 
 struct twl4030_usb_data {
         enum twl4030_usb_mode   usb_mode;
+        unsigned long           features;
 
         int             (*phy_init)(struct device *dev);
         int             (*phy_exit)(struct device *dev);
@@ -699,6 +718,20 @@ struct twl4030_platform_data {
         struct regulator_init_data              *vcxio;
         struct regulator_init_data              *vusb;
         struct regulator_init_data              *clk32kg;
+        /* TWL6025 LDO regulators */
+        struct regulator_init_data              *ldo1;
+        struct regulator_init_data              *ldo2;
+        struct regulator_init_data              *ldo3;
+        struct regulator_init_data              *ldo4;
+        struct regulator_init_data              *ldo5;
+        struct regulator_init_data              *ldo6;
+        struct regulator_init_data              *ldo7;
+        struct regulator_init_data              *ldoln;
+        struct regulator_init_data              *ldousb;
+        /* TWL6025 DCDC regulators */
+        struct regulator_init_data              *smps3;
+        struct regulator_init_data              *smps4;
+        struct regulator_init_data              *vio6025;
 };
 
 /*----------------------------------------------------------------------*/
@@ -780,4 +813,21 @@ static inline int twl4030charger_usb_en(int enable) { return 0; }
 #define TWL6030_REG_VRTC        47
 #define TWL6030_REG_CLK32KG     48
 
+/* LDOs on 6025 have different names */
+#define TWL6025_REG_LDO2        49
+#define TWL6025_REG_LDO4        50
+#define TWL6025_REG_LDO3        51
+#define TWL6025_REG_LDO5        52
+#define TWL6025_REG_LDO1        53
+#define TWL6025_REG_LDO7        54
+#define TWL6025_REG_LDO6        55
+#define TWL6025_REG_LDOLN       56
+#define TWL6025_REG_LDOUSB      57
+
+/* 6025 DCDC supplies */
+#define TWL6025_REG_SMPS3       58
+#define TWL6025_REG_SMPS4       59
+#define TWL6025_REG_VIO         60
+
+
 #endif /* End of __TWL4030_H */