From: Mark Brown <broonie@kernel.org>
Date: Sun, 13 Mar 2016 08:19:35 +0000 (+0700)
Subject: Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555... 
X-Git-Tag: Ubuntu-4.8.0-22.24~1707^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d1f83021d5ca993242105f7b41f924614501fce5;p=mirror_ubuntu-zesty-kernel.git

Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next
---

d1f83021d5ca993242105f7b41f924614501fce5
diff --cc drivers/regulator/Makefile
index 348cfd727350,980b1943fa81,0f8174913c17,980b1943fa81,422786cc4b74,980b1943fa81..bba7b7093bac
--- a/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 055f8c1a83a8,7ebb7c899158,73b7683355cd,744c9889f88d,744c9889f88d,744c9889f88d..1cff11205642
--- a/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;
      }
      
      /**