From 0d1cdc531289587b8b547de3aff0ca6029efab27 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 28 Jan 2010 10:21:05 +0000
Subject: [PATCH] --- yaml --- r: 185664 b: refs/heads/master c:
 17133dc82422cb118c843c3e9bbd565c37506ec8 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/regulator/fixed.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e3e9d00f86a9..d56d703b2592 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69dc16c325bef32b0a1a1abf15ae4047174cafc1
+refs/heads/master: 17133dc82422cb118c843c3e9bbd565c37506ec8
diff --git a/trunk/drivers/regulator/fixed.c b/trunk/drivers/regulator/fixed.c
index ee3e7eb97b1c..a3d3bfc24b1f 100644
--- a/trunk/drivers/regulator/fixed.c
+++ b/trunk/drivers/regulator/fixed.c
@@ -50,8 +50,6 @@ static int fixed_voltage_enable(struct regulator_dev *dev)
 	if (gpio_is_valid(data->gpio)) {
 		gpio_set_value_cansleep(data->gpio, data->enable_high);
 		data->is_enabled = 1;
-		if (data->startup_delay)
-			udelay(data->startup_delay);
 	}
 
 	return 0;
@@ -69,6 +67,13 @@ static int fixed_voltage_disable(struct regulator_dev *dev)
 	return 0;
 }
 
+static int fixed_voltage_enable_time(struct regulator_dev *dev)
+{
+	struct fixed_voltage_data *data = rdev_get_drvdata(dev);
+
+	return data->startup_delay;
+}
+
 static int fixed_voltage_get_voltage(struct regulator_dev *dev)
 {
 	struct fixed_voltage_data *data = rdev_get_drvdata(dev);
@@ -91,6 +96,7 @@ static struct regulator_ops fixed_voltage_ops = {
 	.is_enabled = fixed_voltage_is_enabled,
 	.enable = fixed_voltage_enable,
 	.disable = fixed_voltage_disable,
+	.enable_time = fixed_voltage_enable_time,
 	.get_voltage = fixed_voltage_get_voltage,
 	.list_voltage = fixed_voltage_list_voltage,
 };