Patched in Tegra support.

12 files changed, 140 insertions, 181 deletions

diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
index d8341cb47b6..cec17cf6cac 100644
--- a/include/linux/i2c/adp5588.h
+++ b/include/linux/i2c/adp5588.h
@@ -157,7 +157,6 @@ struct i2c_client; /* forward declaration */
 
 struct adp5588_gpio_platform_data {
         int gpio_start;         /* GPIO Chip base # */
-        const char *const *names;
         unsigned irq_base;      /* interrupt base # */
         unsigned pullup_dis_mask; /* Pull-Up Disable Mask */
         int     (*setup)(struct i2c_client *client,
diff --git a/include/linux/i2c/at24.h b/include/linux/i2c/at24.h
index 285025a9cdc..8ace93024d6 100644
--- a/include/linux/i2c/at24.h
+++ b/include/linux/i2c/at24.h
@@ -1,42 +1,19 @@
-/*
- * at24.h - platform_data for the at24 (generic eeprom) driver
- * (C) Copyright 2008 by Pengutronix
- * (C) Copyright 2012 by Wolfram Sang
- * same license as the driver
- */
-
 #ifndef _LINUX_AT24_H
 #define _LINUX_AT24_H
 
 #include <linux/types.h>
 #include <linux/memory.h>
 
-/**
- * struct at24_platform_data - data to set up at24 (generic eeprom) driver
- * @byte_len: size of eeprom in byte
- * @page_size: number of byte which can be written in one go
- * @flags: tunable options, check AT24_FLAG_* defines
- * @setup: an optional callback invoked after eeprom is probed; enables kernel
-        code to access eeprom via memory_accessor, see example
- * @context: optional parameter passed to setup()
+/*
+ * As seen through Linux I2C, differences between the most common types of I2C
+ * memory include:
+ * - How much memory is available (usually specified in bit)?
+ * - What write page size does it support?
+ * - Special flags (16 bit addresses, read_only, world readable...)?
  *
  * If you set up a custom eeprom type, please double-check the parameters.
  * Especially page_size needs extra care, as you risk data loss if your value
  * is bigger than what the chip actually supports!
- *
- * An example in pseudo code for a setup() callback:
- *
- * void get_mac_addr(struct memory_accessor *mem_acc, void *context)
- * {
- *      u8 *mac_addr = ethernet_pdata->mac_addr;
- *      off_t offset = context;
- *
- *      // Read MAC addr from EEPROM
- *      if (mem_acc->read(mem_acc, mac_addr, offset, ETH_ALEN) == ETH_ALEN)
- *              pr_info("Read MAC addr from EEPROM: %pM\n", mac_addr);
- * }
- *
- * This function pointer and context can now be set up in at24_platform_data.
  */
 
 struct at24_platform_data {
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/i2c-hid.h b/include/linux/i2c/i2c-hid.h
deleted file mode 100644
index 60e411d764d..00000000000
--- a/include/linux/i2c/i2c-hid.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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/i2c-rcar.h b/include/linux/i2c/i2c-rcar.h
deleted file mode 100644
index 496f5c2b23c..00000000000
--- a/include/linux/i2c/i2c-rcar.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __I2C_R_CAR_H__
-#define __I2C_R_CAR_H__
-
-#include <linux/platform_device.h>
-
-struct i2c_rcar_platform_data {
-        u32 bus_speed;
-};
-
-#endif /* __I2C_R_CAR_H__ */
diff --git a/include/linux/i2c/i2c-sh_mobile.h b/include/linux/i2c/i2c-sh_mobile.h
index 06e3089795f..beda7081aea 100644
--- a/include/linux/i2c/i2c-sh_mobile.h
+++ b/include/linux/i2c/i2c-sh_mobile.h
@@ -5,7 +5,6 @@
 
 struct i2c_sh_mobile_platform_data {
         unsigned long bus_speed;
-        unsigned int clks_per_count;
 };
 
 #endif /* __I2C_SH_MOBILE_H__ */
diff --git a/include/linux/i2c/mms114.h b/include/linux/i2c/mms114.h
deleted file mode 100644
index 5722ebfb273..00000000000
--- a/include/linux/i2c/mms114.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundationr
- */
-
-#ifndef __LINUX_MMS114_H
-#define __LINUX_MMS114_H
-
-struct mms114_platform_data {
-        unsigned int x_size;
-        unsigned int y_size;
-        unsigned int contact_threshold;
-        unsigned int moving_threshold;
-        bool x_invert;
-        bool y_invert;
-
-        void (*cfg_pin)(bool);
-};
-
-#endif  /* __LINUX_MMS114_H */
diff --git a/include/linux/i2c/pca953x.h b/include/linux/i2c/pca953x.h
index 3c98dd4f901..139ba52667c 100644
--- a/include/linux/i2c/pca953x.h
+++ b/include/linux/i2c/pca953x.h
@@ -11,7 +11,7 @@ struct pca953x_platform_data {
         unsigned        gpio_base;
 
         /* initial polarity inversion setting */
-        u32             invert;
+        uint16_t        invert;
 
         /* interrupt base */
         int             irq_base;
diff --git a/include/linux/i2c/pca954x.h b/include/linux/i2c/pca954x.h
index 1712677d590..28f1f8d5ab1 100644
--- a/include/linux/i2c/pca954x.h
+++ b/include/linux/i2c/pca954x.h
@@ -36,7 +36,6 @@
 struct pca954x_platform_mode {
         int             adap_id;
         unsigned int    deselect_on_exit:1;
-        unsigned int    class;
 };
 
 /* Per mux/switch data, used with i2c_register_board_info */
diff --git a/include/linux/i2c/tc35876x.h b/include/linux/i2c/tc35876x.h
deleted file mode 100644
index cd6a51c71e7..00000000000
--- a/include/linux/i2c/tc35876x.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#ifndef _TC35876X_H
-#define _TC35876X_H
-
-struct tc35876x_platform_data {
-        int gpio_bridge_reset;
-        int gpio_panel_bl_en;
-        int gpio_panel_vadd;
-};
-
-#endif /* _TC35876X_H */
diff --git a/include/linux/i2c/tsc2007.h b/include/linux/i2c/tsc2007.h
index 506a9f7af51..591427a63b0 100644
--- a/include/linux/i2c/tsc2007.h
+++ b/include/linux/i2c/tsc2007.h
@@ -5,7 +5,7 @@
 
 struct tsc2007_platform_data {
         u16     model;                          /* 2007. */
-        u16     x_plate_ohms;   /* must be non-zero value */
+        u16     x_plate_ohms;
         u16     max_rt; /* max. resistance above which samples are ignored */
         unsigned long poll_delay; /* delay (in ms) after pen-down event
                                      before polling starts */
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 1ff54b114ef..bb92f0b1328 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -39,51 +39,56 @@
  * address each module uses within a given i2c slave.
  */
 
-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,
-};
+/* 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
 
-/* 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      13
-#define TWL6030_MODULE_ID1      14
-#define TWL6030_MODULE_ID2      15
+#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
 
 #define GPIO_INTR_OFFSET        0
 #define KEYPAD_INTR_OFFSET      1
@@ -107,6 +112,7 @@ enum twl4030_module_ids {
 #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 */
@@ -170,12 +176,24 @@ 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 */
+#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
  */
 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.
  *
@@ -187,7 +205,6 @@ 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 twl_get_hfclk_rate(void);
 
 int twl6030_interrupt_unmask(u8 bit_mask, u8 offset);
 int twl6030_interrupt_mask(u8 bit_mask, u8 offset);
@@ -213,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);
+
 /*----------------------------------------------------------------------*/
 
 /*
@@ -550,17 +571,34 @@ 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;
-        int     bb_uvolt;       /* voltage to charge backup battery */
-        int     bb_uamp;        /* current for backup battery charging */
+        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 */
 struct twl4030_gpio_platform_data {
+        int             gpio_base;
+        unsigned        irq_base, irq_end;
+
         /* package the two LED signals as output-only GPIOs? */
         bool            use_leds;
 
@@ -618,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 {
@@ -649,12 +688,10 @@ struct twl4030_power_data {
         unsigned num;
         struct twl4030_resconfig *resource_config;
 #define TWL4030_RESCONFIG_UNDEF ((u8)-1)
-        bool use_poweroff;      /* Board is wired for TWL poweroff */
 };
 
 extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
 extern int twl4030_remove_script(u8 flags);
-extern void twl4030_power_off(void);
 
 struct twl4030_codec_data {
         unsigned int digimic_delay; /* in ms */
@@ -663,11 +700,23 @@ struct twl4030_codec_data {
         unsigned int check_defaults:1;
         unsigned int reset_registers:1;
         unsigned int hs_extmute:1;
-        int hs_extmute_gpio;
+        u16 hs_left_step;
+        u16 hs_right_step;
+        u16 hf_left_step;
+        u16 hf_right_step;
+        void (*set_hs_extmute)(int mute);
 };
 
 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_audio_data {
@@ -682,6 +731,11 @@ struct twl4030_audio_data {
 };
 
 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;
@@ -696,9 +750,6 @@ struct twl4030_platform_data {
         struct regulator_init_data              *vaux1;
         struct regulator_init_data              *vaux2;
         struct regulator_init_data              *vaux3;
-        struct regulator_init_data              *vdd1;
-        struct regulator_init_data              *vdd2;
-        struct regulator_init_data              *vdd3;
         /* TWL4030 LDO regulators */
         struct regulator_init_data              *vpll1;
         struct regulator_init_data              *vpll2;
@@ -707,6 +758,8 @@ struct twl4030_platform_data {
         struct regulator_init_data              *vsim;
         struct regulator_init_data              *vaux4;
         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;
@@ -718,8 +771,6 @@ struct twl4030_platform_data {
         struct regulator_init_data              *vcxio;
         struct regulator_init_data              *vusb;
         struct regulator_init_data              *clk32kg;
-        struct regulator_init_data              *v1v8;
-        struct regulator_init_data              *v2v1;
         /* TWL6025 LDO regulators */
         struct regulator_init_data              *ldo1;
         struct regulator_init_data              *ldo2;
@@ -736,27 +787,9 @@ struct twl4030_platform_data {
         struct regulator_init_data              *vio6025;
 };
 
-struct twl_regulator_driver_data {
-        int             (*set_voltage)(void *data, int target_uV);
-        int             (*get_voltage)(void *data);
-        void            *data;
-        unsigned long   features;
-};
-/* chip-specific feature flags, for twl_regulator_driver_data.features */
-#define TWL4030_VAUX2           BIT(0)  /* pre-5030 voltage ranges */
-#define TPS_SUBSET              BIT(1)  /* tps659[23]0 have fewer LDOs */
-#define TWL5031                 BIT(2)  /* twl5031 has different registers */
-#define TWL6030_CLASS           BIT(3)  /* TWL6030 class */
-#define TWL6025_SUBCLASS        BIT(4)  /* TWL6025 has changed registers */
-#define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible
-                                          * but not officially supported.
-                                          * This flag is necessary to
-                                          * enable them.
-                                          */
-
 /*----------------------------------------------------------------------*/
 
-int twl4030_sih_setup(struct device *dev, int module, int irq_base);
+int twl4030_sih_setup(int module);
 
 /* Offsets to Power Registers */
 #define TWL4030_VDAC_DEV_GRP            0x3B
@@ -829,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