Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / mfd / palmas.h

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 44256aa..ecddc51 100644 (file)
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -109,19 +109,6 @@ struct palmas_reg_init {
         */
        int mode_sleep;
 
-       /* tstep is the timestep loaded to the TSTEP register
-        *
-        * For SMPS
-        *
-        * 0: Jump (no slope control)
-        * 1: 10mV/us
-        * 2: 5mV/us
-        * 3: 2.5mV/us
-        *
-        * For LDO unused
-        */
-       int tstep;
-
        /* voltage_sel is the bitfield loaded onto the SMPSX_VOLTAGE
         * register. Set this is the default voltage set in OTP needs
         * to be overridden.
@@ -177,6 +164,9 @@ struct palmas_pmic_platform_data {
 
        /* use LDO6 for vibrator control */
        int ldo6_vibrator;
+
+       /* Enable tracking mode of LDO8 */
+       bool enable_ldo8_tracking;
 };
 
 struct palmas_usb_platform_data {
@@ -227,6 +217,7 @@ struct palmas_clk_platform_data {
 };
 
 struct palmas_platform_data {
+       int irq_flags;
        int gpio_base;
 
        /* bit value to be loaded to the POWER_CTRL register */
@@ -336,6 +327,8 @@ struct palmas_pmic {
        int smps457;
 
        int range[PALMAS_REG_SMPS10];
+       unsigned int ramp_delay[PALMAS_REG_SMPS10];
+       unsigned int current_reg_mode[PALMAS_REG_SMPS10];
 };
 
 struct palmas_resource {