From: Mark Brown <broonie@kernel.org>
Date: Mon, 22 Jun 2015 10:19:56 +0000 (+0100)
Subject: Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulato... 
X-Git-Tag: v4.2-rc1~141^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=733ada000f2c9618ccbac7b9ba146113f0a6675b;p=platform%2Fkernel%2Flinux-exynos.git

Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next
---

733ada000f2c9618ccbac7b9ba146113f0a6675b
diff --cc include/linux/regulator/machine.h
index 85a3b45,b07562e,b07562e,b07562e,1258275..b11be12
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@@@@@ -75,8 -75,6 -75,6 -75,6 -75,7 +75,8 @@@@@@ struct regulator_state 
      *
      * @min_uA: Smallest current consumers may set.
      * @max_uA: Largest current consumers may set.
 ++++ * @ilim_uA: Maximum input current.
 +++  * @system_load: Load that isn't captured by any consumer requests.
      *
      * @valid_modes_mask: Mask of modes which may be configured by consumers.
      * @valid_ops_mask: Operations which may be performed by consumers.
@@@@@@ -88,7 -86,6 -86,6 -86,6 -87,8 +88,8 @@@@@@
      *           applied.
      * @apply_uV: Apply the voltage constraint when initialising.
      * @ramp_disable: Disable ramp delay when initialising or when setting voltage.
++++  * @soft_start: Enable soft start so that voltage ramps slowly.
 +++  * @pull_down: Enable pull down when regulator is disabled.
      *
      * @input_uV: Input voltage for regulator when supplied by another regulator.
      *
@@@@@@ -114,9 -111,6 -111,6 -111,6 -114,8 +115,9 @@@@@@ struct regulation_constraints 
     	/* current output range (inclusive) - for current control */
     	int min_uA;
     	int max_uA;
 ++++	int ilim_uA;
 +++ 
 +++ 	int system_load;
     
     	/* valid regulator operating modes for this machine */
     	unsigned int valid_modes_mask;