From 94e2ccd9ecd122719fa1698870db315ba7691326 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 12 Jun 2012 16:34:55 +0800
Subject: [PATCH] --- yaml --- r: 312535 b: refs/heads/master c:
 38c20eb23fb7b5505ac80595f18f4209abc19cd3 h: refs/heads/master i:   312533:
 dc6ca131034620bdb86d6cf4abb9181878f59db9   312531:
 759425e4802d8522fb253067f7dd508d3e9c21e4   312527:
 42202f914863572b3a76491f19caad53a9bdeede v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/regulator/wm8400-regulator.c | 22 +++++++---------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index e19e0c577260..f28f26f01fca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fe3a182adfeca84f39751af03c8571831a0877f
+refs/heads/master: 38c20eb23fb7b5505ac80595f18f4209abc19cd3
diff --git a/trunk/drivers/regulator/wm8400-regulator.c b/trunk/drivers/regulator/wm8400-regulator.c
index f365795d51c2..9f9df8eef1a1 100644
--- a/trunk/drivers/regulator/wm8400-regulator.c
+++ b/trunk/drivers/regulator/wm8400-regulator.c
@@ -35,27 +35,19 @@ static int wm8400_ldo_map_voltage(struct regulator_dev *dev,
 				  int min_uV, int max_uV)
 {
 	u16 val;
+	int volt;
 
 	if (min_uV < 900000 || min_uV > 3300000)
 		return -EINVAL;
 
-	if (min_uV < 1700000) {
-		/* Steps of 50mV from 900mV;  */
+	if (min_uV < 1700000) /* Steps of 50mV from 900mV;  */
 		val = DIV_ROUND_UP(min_uV - 900000, 50000);
+	else /* Steps of 100mV from 1700mV */
+		val = DIV_ROUND_UP(min_uV - 1700000, 100000) + 15;
 
-		if ((val * 50000) + 900000 > max_uV)
-			return -EINVAL;
-		BUG_ON((val * 50000) + 900000 < min_uV);
-	} else {
-		/* Steps of 100mV from 1700mV */
-		val = DIV_ROUND_UP(min_uV - 1700000, 100000);
-
-		if ((val * 100000) + 1700000 > max_uV)
-			return -EINVAL;
-		BUG_ON((val * 100000) + 1700000 < min_uV);
-
-		val += 0xf;
-	}
+	volt = wm8400_ldo_list_voltage(dev, val);
+	if (volt < min_uV || volt > max_uV)
+		return -EINVAL;
 
 	return val;
 }