diff --git a/[refs] b/[refs]
index b65020c291cb..f2618957d93c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baae019efe84b6d2c6d5e7e7e1c9cfa130ad6b2a
+refs/heads/master: f11d08c3d611d6f2845677caabe13b2c58f95658
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 26b71048709b..e3597ab09be3 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2296,8 +2296,7 @@ EXPORT_SYMBOL_GPL(regulator_set_voltage_time);
  * Provided with the starting and target voltage selectors, this function
  * returns time in microseconds required to rise or fall to this new voltage
  *
- * Drivers providing uV_step or volt_table in their regulator_desc and
- * ramp_delay in regulation_constraints can use this as their
+ * Drivers providing ramp_delay in regulation_constraints can use this as their
  * set_voltage_time_sel() operation.
  */
 int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
@@ -2305,6 +2304,7 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
 				   unsigned int new_selector)
 {
 	unsigned int ramp_delay = 0;
+	int old_volt, new_volt;
 
 	if (rdev->constraints->ramp_delay)
 		ramp_delay = rdev->constraints->ramp_delay;
@@ -2316,19 +2316,14 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
 		return 0;
 	}
 
-	if (rdev->desc->uV_step) {
-		return DIV_ROUND_UP(rdev->desc->uV_step *
-				    abs(new_selector - old_selector),
-				    ramp_delay);
-	} else if (rdev->desc->volt_table) {
-		return DIV_ROUND_UP(abs(rdev->desc->volt_table[new_selector] -
-					rdev->desc->volt_table[old_selector]),
-				    ramp_delay);
-	} else {
-		rdev_warn(rdev, "Unsupported voltage mapping settings\n");
-	}
+	/* sanity check */
+	if (!rdev->desc->ops->list_voltage)
+		return -EINVAL;
 
-	return 0;
+	old_volt = rdev->desc->ops->list_voltage(rdev, old_selector);
+	new_volt = rdev->desc->ops->list_voltage(rdev, new_selector);
+
+	return DIV_ROUND_UP(abs(new_volt - old_volt), ramp_delay);
 }
 EXPORT_SYMBOL_GPL(regulator_set_voltage_time_sel);