[1/4] regulator: add set_voltage_time[_sel] infrastructure

Message ID 1299840868-20613-1-git-send-email-linus.walleij@stericsson.com
State Accepted
Headers show

Commit Message

Linus Walleij March 11, 2011, 10:54 a.m.
From: Linus Walleij <linus.walleij@linaro.org>

This makes it possible to set the stabilization time for voltage
regulators in the same manner as enable_time().

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/regulator/core.c         |   43 ++++++++++++++++++++++++++++++++++++++
 include/linux/regulator/driver.h |   15 +++++++++++-
 2 files changed, 56 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9fa2095..0cf58d0 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1629,10 +1629,27 @@  static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 				     int min_uV, int max_uV)
 {
 	int ret;
+	int delay = 0;
 	unsigned int selector;
 
 	trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV);
 
+	/* Don't obtain this if it's not going to be used */
+	if (rdev->desc->ops->set_voltage_time) {
+		int old_voltage = -1;
+
+		ret = _regulator_get_voltage(rdev);
+		if (ret < 0)
+			return ret;
+		old_voltage = ret;
+		/* Here we can figure out desired delay immediately */
+		ret = rdev->desc->ops->set_voltage_time(rdev, old_voltage,
+							min_uV, max_uV);
+		if (ret < 0)
+			return ret;
+		delay = ret;
+	}
+
 	if (rdev->desc->ops->set_voltage) {
 		ret = rdev->desc->ops->set_voltage(rdev, min_uV, max_uV,
 						   &selector);
@@ -1662,6 +1679,24 @@  static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 			}
 		}
 
+		/*
+		 * If we can't obtain the old selector there is not enough
+		 * info to call set_voltage_time_sel(), so then we just use
+		 * the delay value possibly set with set_voltage_time() or
+		 * the default 0 value.
+		 */
+		if (rdev->desc->ops->set_voltage_time_sel &&
+		    rdev->desc->ops->get_voltage_sel) {
+			unsigned int old_selector = 0;
+
+			ret = rdev->desc->ops->get_voltage_sel(rdev);
+			if (ret < 0)
+				return ret;
+			old_selector = ret;
+			delay = rdev->desc->ops->set_voltage_time_sel(rdev,
+						old_selector, selector);
+		}
+
 		if (best_val != INT_MAX) {
 			ret = rdev->desc->ops->set_voltage_sel(rdev, selector);
 			selector = best_val;
@@ -1672,6 +1707,14 @@  static int _regulator_do_set_voltage(struct regulator_dev *rdev,
 		ret = -EINVAL;
 	}
 
+	/* Insert any necessary delays */
+	if (delay >= 1000) {
+		mdelay(delay / 1000);
+		udelay(delay % 1000);
+	} else if (delay) {
+		udelay(delay);
+	}
+
 	if (ret == 0)
 		_notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE,
 				     NULL);
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index b8ed16a..ffcc878 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -63,7 +63,13 @@  enum regulator_status {
  *                    when running with the specified parameters.
  *
  * @enable_time: Time taken for the regulator voltage output voltage to
- *               stabalise after being enabled, in microseconds.
+ *               stabilise after being enabled, in microseconds.
+ * @set_voltage_time: Time taken for the regulator voltage output voltage to
+ *               stabilise after being set to a new value, in microseconds.
+ *               The function provides a span as input, and the function
+ *               should return the worst case.
+ * @set_voltage_time_sel: Same function as the above, but only providing
+ *                        a simple selector as argument.
  *
  * @set_suspend_voltage: Set the voltage for the regulator when the system
  *                       is suspended.
@@ -103,8 +109,13 @@  struct regulator_ops {
 	int (*set_mode) (struct regulator_dev *, unsigned int mode);
 	unsigned int (*get_mode) (struct regulator_dev *);
 
-	/* Time taken to enable the regulator */
+	/* Time taken to enable or set voltage on the regulator */
 	int (*enable_time) (struct regulator_dev *);
+	int (*set_voltage_time) (struct regulator_dev *,
+				 int old_uV, int min_new_uV, int max_new_uV);
+	int (*set_voltage_time_sel) (struct regulator_dev *,
+				     unsigned int old_selector,
+				     unsigned int new_selector);
 
 	/* report regulator status ... most other accessors report
 	 * control inputs, this reports results of combining inputs