summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-05-16 11:43:43 -0700
committerTao Huang <huangtao@rock-chips.com>2018-03-22 11:14:38 +0800
commit411da4b351605664227efb0ad4d85a3905c324a7 (patch)
treeef09c783e9a4a6e9e570d39a9314baa4c9a13bee /include
parent7f0ade1f1e61570097a1dbbe6bf45b780661d931 (diff)
UPSTREAM: regulator: Allow for asymmetric settling times
Some regulators have different settling times for voltage increases and decreases. To avoid a time penalty on the faster transition allow for different settings for up- and downward transitions. Change-Id: Iab14df27c8275945a31a55630ce3c926acf5828d Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Acked-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tao Huang <huangtao@rock-chips.com> (cherry picked from commit 3ffad468cf1d9825b425733941bdad0d8d20e795)
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/machine.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index e264209eacee..8ab67b6f0250 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -109,6 +109,10 @@ struct regulator_state {
* @ramp_delay: Time to settle down after voltage change (unit: uV/us)
* @settling_time: Time to settle down after voltage change when voltage
* change is non-linear (unit: microseconds).
+ * @settling_time_up: Time to settle down after voltage increase when voltage
+ * change is non-linear (unit: microseconds).
+ * @settling_time_down : Time to settle down after voltage decrease when
+ * voltage change is non-linear (unit: microseconds).
* @active_discharge: Enable/disable active discharge. The enum
* regulator_active_discharge values are used for
* initialisation.
@@ -151,6 +155,8 @@ struct regulation_constraints {
unsigned int ramp_delay;
unsigned int settling_time;
+ unsigned int settling_time_up;
+ unsigned int settling_time_down;
unsigned int enable_time;
unsigned int active_discharge;