From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Mon, 21 Sep 2009 16:14:12 +0000 (-0400)
Subject: regulator: fix voltage range in da9034 ldo12
X-Git-Tag: firefly_0821_release~12444^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55c1d7c60d9b269551cd7cc31e6be8323e1d94ec;p=firefly-linux-kernel-4.4.55.git

regulator: fix voltage range in da9034 ldo12

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
---

diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index c9de73098470..aa224d936e0d 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -301,7 +301,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
 	}
 
 	val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
-	val = (val > 7 && val < 20) ? 8 : val - 12;
+	val = (val >= 20) ? val - 12 : ((val > 7) ? 8 : val);
 	val <<= info->vol_shift;
 	mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;