Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
index 348cfd727350d7262c0ad2525c315d34c06addec,980b1943fa8153dd0c7cb1d286c5f5a23aacdbf4,0f8174913c17bd0b23fb434af7e0a48206680e85,980b1943fa8153dd0c7cb1d286c5f5a23aacdbf4,422786cc4b7414fa8d632183d03bd0d0d2903a57,980b1943fa8153dd0c7cb1d286c5f5a23aacdbf4..bba7b7093bac255b15335a87e064bdd201f8305c
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
--- 3/drivers/regulator/Makefile
--- 4/drivers/regulator/Makefile
--- 5/drivers/regulator/Makefile
--- 6/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@ -35,9 -34,9 -34,8 -34,9 -34,10 -34,9 +35,10 @@@@@@@ obj-$(CONFIG_REGULATOR_DB8500_PRCMU) +
      obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o
      obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
      obj-$(CONFIG_REGULATOR_HI6421) += hi6421-regulator.o
++++ +obj-$(CONFIG_REGULATOR_HI655X) += hi655x-regulator.o
      obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
      obj-$(CONFIG_REGULATOR_ISL9305) += isl9305.o
  +   obj-$(CONFIG_REGULATOR_LM363X) += lm363x-regulator.o
      obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
      obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
      obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o

diff --cc drivers/regulator/core.c
index 055f8c1a83a827c6a4457264744da4b78fe886dd,7ebb7c89915810c2ee5ad4d919d76948b37ffc55,73b7683355cd015791114249defc26fdf2b644cf,744c9889f88d4f83e27c05687ac14427c833c0c5,744c9889f88d4f83e27c05687ac14427c833c0c5,744c9889f88d4f83e27c05687ac14427c833c0c5..1cff112056429820fbe1801ffdfbbd60178133c0
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
--- 4/drivers/regulator/core.c
--- 5/drivers/regulator/core.c
--- 6/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@ -1135,12 -1136,27 -1136,16 -1136,16 -1136,16 -1136,16 +1135,23 @@@@@@@ static int set_machine_constraints(stru
                ret = ops->set_over_current_protection(rdev);
                if (ret < 0) {
                        rdev_err(rdev, "failed to set over current protection\n");
 -----                  goto out;
 +++++                  return ret;
  ++++          }
  ++++  }
  ++++
+ ++++  if (rdev->constraints->active_discharge && ops->set_active_discharge) {
+ ++++          bool ad_state = (rdev->constraints->active_discharge ==
+ ++++                        REGULATOR_ACTIVE_DISCHARGE_ENABLE) ? true : false;
+ ++++
+ ++++          ret = ops->set_active_discharge(rdev, ad_state);
+ ++++          if (ret < 0) {
+ ++++                  rdev_err(rdev, "failed to set active discharge\n");
+ ++++                  return ret;
+               }
+       }
+     
        print_constraints(rdev);
        return 0;
 -----out:
 -----  kfree(rdev->constraints);
 -----  rdev->constraints = NULL;
 -----  return ret;
      }
      
      /**