4 files changed, 126 insertions, 7 deletions

diff --git a/include/linux/i2c/atmel_mxt_ts.h b/include/linux/i2c/atmel_mxt_ts.h
index f027f7a6351..29550c11f6d 100644
--- a/include/linux/i2c/atmel_mxt_ts.h
+++ b/include/linux/i2c/atmel_mxt_ts.h
@@ -2,6 +2,8 @@
  * Atmel maXTouch Touchscreen driver
  *
  * Copyright (C) 2010 Samsung Electronics Co.Ltd
+ * Copyright (C) 2011 Atmel Corporation
+ * Copyright (C) 2011 NVIDIA Corporation
  * Author: Joonyoung Shim <jy0922.shim@samsung.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
@@ -15,6 +17,16 @@
 
 #include <linux/types.h>
 
+/*
+ * Atmel I2C addresses
+ */
+#define MXT224_I2C_ADDR1        0x4A
+#define MXT224_I2C_ADDR2        0x4B
+#define MXT1386_I2C_ADDR1       0x4C
+#define MXT1386_I2C_ADDR2       0x4D
+#define MXT1386_I2C_ADDR3       0x5A
+#define MXT1386_I2C_ADDR4       0x5B
+
 /* Orient */
 #define MXT_NORMAL              0x0
 #define MXT_DIAGONAL            0x1
@@ -39,6 +51,10 @@ struct mxt_platform_data {
         unsigned int voltage;
         unsigned char orient;
         unsigned long irqflags;
+        u8(*read_chg) (void);
+        unsigned long config_crc;
+        unsigned int actv_cycle_time;
+        unsigned int idle_cycle_time;
 };
 
 #endif /* __LINUX_ATMEL_MXT_TS_H */
diff --git a/include/linux/i2c/panjit_ts.h b/include/linux/i2c/panjit_ts.h
new file mode 100644
index 00000000000..1dd51e1ecae
--- /dev/null
+++ b/include/linux/i2c/panjit_ts.h
@@ -0,0 +1,30 @@
+/*
+ * include/linux/i2c/panjit_ts.h
+ *
+ * Copyright (c) 2010, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef _LINUX_I2C_PANJIT_TS_H
+#define _LINUX_I2C_PANJIT_TS_H
+
+struct device;
+
+struct panjit_i2c_ts_platform_data {
+        int gpio_reset;
+};
+
+#endif
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index ba4f88624fc..bb92f0b1328 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -82,6 +82,10 @@
 #define TWL_MODULE_RTC          TWL4030_MODULE_RTC
 #define TWL_MODULE_PWM          TWL4030_MODULE_PWM0
 
+#define TWL6030_MODULE_CHARGER  TWL4030_MODULE_MAIN_CHARGE
+#define TWL6025_MODULE_CHARGER  0x18
+
+#define TWL6030_MODULE_GASGAUGE 0x0B
 #define TWL6030_MODULE_ID0      0x0D
 #define TWL6030_MODULE_ID1      0x0E
 #define TWL6030_MODULE_ID2      0x0F
@@ -108,6 +112,7 @@
 #define GASGAUGE_INTR_OFFSET    17
 #define USBOTG_INTR_OFFSET      4
 #define CHARGER_INTR_OFFSET     2
+#define GPADCSW_INTR_OFFSET     1
 #define RSV_INTR_OFFSET         0
 
 /* INT register offsets */
@@ -172,6 +177,14 @@ TWL_CLASS_IS(4030, TWL4030_CLASS_ID)
 TWL_CLASS_IS(6030, TWL6030_CLASS_ID)
 
 #define TWL6025_SUBCLASS        BIT(4)  /* TWL6025 has changed registers */
+#define MPU80031_SUBCLASS       BIT(5)  /* MPU80031 has changed registers */
+
+/* So we can recover the features in other parts of twl stack */
+unsigned int twl_features(void);
+
+/* so we can get at the EPROM SMPS OFFSET/MULT stuff */
+u8 twl_get_smps_offset(void);
+u8 twl_get_smps_mult(void);
 
 /*
  * Read and write single 8-bit registers
@@ -179,6 +192,8 @@ TWL_CLASS_IS(6030, TWL6030_CLASS_ID)
 int twl_i2c_write_u8(u8 mod_no, u8 val, u8 reg);
 int twl_i2c_read_u8(u8 mod_no, u8 *val, u8 reg);
 
+void twl_reg_dump(int module, int start, int end);
+
 /*
  * Read and write several 8-bit registers at once.
  *
@@ -215,6 +230,10 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
         return -EIO;
 }
 #endif
+
+int twl6030_set_usb_charge_enable(int enable);
+int twl6030_set_usb_in_current(int currentmA);
+
 /*----------------------------------------------------------------------*/
 
 /*
@@ -552,11 +571,27 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
 
 struct twl4030_clock_init_data {
         bool ck32k_lowpwr_enable;
+        bool clk32_active_state_on;
 };
 
 struct twl4030_bci_platform_data {
         int *battery_tmp_tbl;
-        unsigned int tblsize;
+        unsigned int battery_tmp_tblsize;
+        int *battery_volt_tbl;
+        unsigned int battery_volt_tblsize;
+        unsigned int monitoring_interval;
+
+        unsigned int max_charger_currentmA;
+        unsigned int max_charger_voltagemV;
+        unsigned int termination_currentmA;
+
+        unsigned int max_bat_voltagemV;
+        unsigned int low_bat_voltagemV;
+
+        /* twl6025 */
+        unsigned int use_hw_charger;
+        unsigned int use_eeprom_config;
+        unsigned int power_path;
 };
 
 /* TWL4030_GPIO_MAX (18) GPIOs, with interrupts */
@@ -621,6 +656,7 @@ struct twl4030_usb_data {
         int             (*phy_set_clock)(struct device *dev, int on);
         /* suspend/resume of phy */
         int             (*phy_suspend)(struct device *dev, int suspend);
+        int             (*board_control_power)(struct device *dev, int on);
 };
 
 struct twl4030_ins {
@@ -657,32 +693,49 @@ struct twl4030_power_data {
 extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
 extern int twl4030_remove_script(u8 flags);
 
-struct twl4030_codec_audio_data {
+struct twl4030_codec_data {
         unsigned int digimic_delay; /* in ms */
         unsigned int ramp_delay_value;
         unsigned int offset_cncl_path;
         unsigned int check_defaults:1;
         unsigned int reset_registers:1;
         unsigned int hs_extmute:1;
+        u16 hs_left_step;
+        u16 hs_right_step;
+        u16 hf_left_step;
+        u16 hf_right_step;
         void (*set_hs_extmute)(int mute);
 };
 
-struct twl4030_codec_vibra_data {
+struct twl4030_vibra_data {
         unsigned int    coexist;
+
+        /* twl6040 */
+        unsigned int vibldrv_res;       /* left driver resistance */
+        unsigned int vibrdrv_res;       /* right driver resistance */
+        unsigned int viblmotor_res;     /* left motor resistance */
+        unsigned int vibrmotor_res;     /* right motor resistance */
+        int vddvibl_uV;                 /* VDDVIBL volt, set 0 for fixed reg */
+        int vddvibr_uV;                 /* VDDVIBR volt, set 0 for fixed reg */
 };
 
-struct twl4030_codec_data {
+struct twl4030_audio_data {
         unsigned int    audio_mclk;
-        struct twl4030_codec_audio_data         *audio;
-        struct twl4030_codec_vibra_data         *vibra;
+        struct twl4030_codec_data *codec;
+        struct twl4030_vibra_data *vibra;
 
         /* twl6040 */
         int audpwron_gpio;      /* audio power-on gpio */
         int naudint_irq;        /* audio interrupt */
+        unsigned int irq_base;
 };
 
 struct twl4030_platform_data {
         unsigned                                irq_base, irq_end;
+
+        /* Callback for boar regulator initialisation */
+        int (*init)(void);
+
         struct twl4030_clock_init_data          *clock;
         struct twl4030_bci_platform_data        *bci;
         struct twl4030_gpio_platform_data       *gpio;
@@ -690,7 +743,7 @@ struct twl4030_platform_data {
         struct twl4030_keypad_data              *keypad;
         struct twl4030_usb_data                 *usb;
         struct twl4030_power_data               *power;
-        struct twl4030_codec_data               *codec;
+        struct twl4030_audio_data               *audio;
 
         /* Common LDO regulators for TWL4030/TWL6030 */
         struct regulator_init_data              *vdac;
@@ -809,6 +862,22 @@ static inline int twl4030charger_usb_en(int enable) { return 0; }
 #define TWL6030_REG_VDAC        45
 #define TWL6030_REG_VUSB        46
 
+/* These are renamed in 6025 but same registers */
+#define TWL6025_REG_LDO2        48
+#define TWL6025_REG_LDO4        49
+#define TWL6025_REG_LDO3        50
+#define TWL6025_REG_LDO5        51
+#define TWL6025_REG_LDO1        52
+#define TWL6025_REG_LDO7        53
+#define TWL6025_REG_LDO6        54
+#define TWL6025_REG_LDOLN       55
+#define TWL6025_REG_LDOUSB      56
+
+/* 6025 DCDC supplies */
+#define TWL6025_REG_SMPS3       57
+#define TWL6025_REG_SMPS4       58
+#define TWL6025_REG_VIO         59
+
 /* INTERNAL LDOs */
 #define TWL6030_REG_VRTC        47
 #define TWL6030_REG_CLK32KG     48
diff --git a/include/linux/i2c/twl4030-madc.h b/include/linux/i2c/twl4030-madc.h
index 6427d298fbf..530e11ba073 100644
--- a/include/linux/i2c/twl4030-madc.h
+++ b/include/linux/i2c/twl4030-madc.h
@@ -129,6 +129,10 @@ enum sample_type {
 #define REG_BCICTL2             0x024
 #define TWL4030_BCI_ITHSENS     0x007
 
+/* Register and bits for GPBR1 register */
+#define TWL4030_REG_GPBR1               0x0c
+#define TWL4030_GPBR1_MADC_HFCLK_EN     (1 << 7)
+
 struct twl4030_madc_user_parms {
         int channel;
         int average;