Merge remote-tracking branches 'regulator/topic/helpers', 'regulator/topic/hi655x...

[karo-tx-linux.git] / include / linux / regulator / driver.h

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index dac8e7b16bc679e8550ee7781cbda5194791c535..94417b4226bd88a42d5d53c845266ee97ec30879 100644 (file)
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -292,6 +292,14 @@ enum regulator_type {
  *                        set_active_discharge
  * @active_discharge_reg: Register for control when using regmap
  *                       set_active_discharge
+ * @soft_start_reg: Register for control when using regmap set_soft_start
+ * @soft_start_mask: Mask for control when using regmap set_soft_start
+ * @soft_start_val_on: Enabling value for control when using regmap
+ *                     set_soft_start
+ * @pull_down_reg: Register for control when using regmap set_pull_down
+ * @pull_down_mask: Mask for control when using regmap set_pull_down
+ * @pull_down_val_on: Enabling value for control when using regmap
+ *                     set_pull_down
  *
  * @enable_time: Time taken for initial enable of regulator (in uS).
  * @off_on_delay: guard time (in uS), before re-enabling a regulator
@@ -345,6 +353,12 @@ struct regulator_desc {
        unsigned int active_discharge_off;
        unsigned int active_discharge_mask;
        unsigned int active_discharge_reg;
+       unsigned int soft_start_reg;
+       unsigned int soft_start_mask;
+       unsigned int soft_start_val_on;
+       unsigned int pull_down_reg;
+       unsigned int pull_down_mask;
+       unsigned int pull_down_val_on;
 
        unsigned int enable_time;
 
@@ -429,6 +443,8 @@ struct regulator_dev {
        struct regulator_enable_gpio *ena_pin;
        unsigned int ena_gpio_state:1;
 
+       unsigned int is_switch:1;
+
        /* time when this regulator was disabled last time */
        unsigned long last_off_jiffy;
 };
@@ -476,6 +492,8 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
                                   unsigned int new_selector);
 int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable);
 int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable);
+int regulator_set_soft_start_regmap(struct regulator_dev *rdev);
+int regulator_set_pull_down_regmap(struct regulator_dev *rdev);
 
 int regulator_set_active_discharge_regmap(struct regulator_dev *rdev,
                                          bool enable);