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

diff --combined drivers/regulator/hi655x-regulator.c
index 065c100e9a03592f53a4b981fe71899a1b236cba,aca18466f5220a68fc989e201e01ce42639a35db,11a6d27ec82f7b7b9b0625676ee4ba43ce19b67d,065c100e9a03592f53a4b981fe71899a1b236cba,065c100e9a03592f53a4b981fe71899a1b236cba,065c100e9a03592f53a4b981fe71899a1b236cba..36ae54b53814b36859b149993a198be1c269bf64
--- 1/drivers/regulator/hi655x-regulator.c
--- 2/drivers/regulator/hi655x-regulator.c
--- 3/drivers/regulator/hi655x-regulator.c
--- 4/drivers/regulator/hi655x-regulator.c
--- 5/drivers/regulator/hi655x-regulator.c
--- 6/drivers/regulator/hi655x-regulator.c
+++ b/drivers/regulator/hi655x-regulator.c
@@@@@@@ -96,7 -96,7 -96,7 -96,7 -96,7 -96,7 +96,7 @@@@@@@ static int hi655x_disable(struct regula
        return ret;
      }
      
 --   static struct regulator_ops hi655x_regulator_ops = {
 ++   static const struct regulator_ops hi655x_regulator_ops = {
        .enable = regulator_enable_regmap,
        .disable = hi655x_disable,
        .is_enabled = hi655x_is_enabled,
@@@@@@@ -105,7 -105,7 -105,7 -105,7 -105,7 -105,7 +105,7 @@@@@@@
        .set_voltage_sel = regulator_set_voltage_sel_regmap,
      };
      
 --   static struct regulator_ops hi655x_ldo_linear_ops = {
 ++   static const struct regulator_ops hi655x_ldo_linear_ops = {
        .enable = regulator_enable_regmap,
        .disable = hi655x_disable,
        .is_enabled = hi655x_is_enabled,
@@@@@@@ -214,7 -214,7 -214,14 -214,7 -214,7 -214,7 +214,14 @@@@@@@ static int hi655x_regulator_probe(struc
        return 0;
      }
      
++ +++static const struct platform_device_id hi655x_regulator_table[] = {
++ +++  { .name = "hi655x-regulator" },
++ +++  {},
++ +++};
++ +++MODULE_DEVICE_TABLE(platform, hi655x_regulator_table);
++ +++
      static struct platform_driver hi655x_regulator_driver = {
++ +++  .id_table = hi655x_regulator_table,
        .driver = {
                .name   = "hi655x-regulator",
        },

diff --combined include/linux/regulator/driver.h
index 4cb1c9be60732faef3633a1b6ea25a99a09f061c,8a9078dd2a5f16a82b7c96e03fc264370ea847d7,dac8e7b16bc679e8550ee7781cbda5194791c535,dac8e7b16bc679e8550ee7781cbda5194791c535,dac8e7b16bc679e8550ee7781cbda5194791c535,dac8e7b16bc679e8550ee7781cbda5194791c535..94417b4226bd88a42d5d53c845266ee97ec30879
--- 1/include/linux/regulator/driver.h
--- 2/include/linux/regulator/driver.h
--- 3/include/linux/regulator/driver.h
--- 4/include/linux/regulator/driver.h
--- 5/include/linux/regulator/driver.h
--- 6/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@@@@@@ -292,6 -292,14 -292,6 -292,6 -292,6 -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 -345,6 -345,6 -345,6 -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,8 -443,6 -429,6 -429,6 -429,6 -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;
      };
@@@@@@@ -478,6 -490,8 -476,6 -476,6 -476,6 -476,6 +492,8 @@@@@@@ int regulator_set_voltage_time_sel(stru
                                   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);