Skip to contentSkip to conversation

regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places

PATCH Applied Axel Lin 2 participants 4 messages Apr 9, 2012 – Apr 10, 2012

Subsystems (2)
OMAP2+ support Voltage and current regulator framework

v2 of 3 Applied Latest is v3 →

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 regulator: twl-regulator: Use DIV_ROUND_UP at appropriate places

Signed-off-by Axel Lin <[email protected]>

---
v2: Remove braces {} for single statement blocks

 drivers/regulator/twl-regulator.c |   30 ++++++------------------------
 1 files changed, 6 insertions(+), 24 deletions(-)
drivers/regulator/twl-regulator.c +6 -24
index 964946f..7186e67 100644
@@ -806,11 +806,7 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
 			vsel = 0;
 		else if ((min_uV >= 600000) && (min_uV <= 1300000)) {
 			int calc_uV;
-			vsel = (min_uV - 600000) / 125;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
+			vsel = DIV_ROUND_UP(min_uV - 600000, 12500);
 			calc_uV = twl6030smps_list_voltage(rdev, vsel);
 			if (calc_uV > max_uV)
 				return -EINVAL;

@@ -836,11 +832,7 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
 			vsel = 0;
 		else if ((min_uV >= 700000) && (min_uV <= 1420000)) {
 			int calc_uV;
-			vsel = (min_uV - 700000) / 125;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
+			vsel = DIV_ROUND_UP(min_uV - 700000, 12500);
 			calc_uV = twl6030smps_list_voltage(rdev, vsel);
 			if (calc_uV > max_uV)
 				return -EINVAL;

@@ -864,24 +856,14 @@ twl6030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
 	case SMPS_EXTENDED_EN:
 		if (min_uV == 0)
 			vsel = 0;
-		else if ((min_uV >= 1852000) && (max_uV <= 4013600)) {
-			vsel = (min_uV - 1852000) / 386;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
-		}
+		else if ((min_uV >= 1852000) && (max_uV <= 4013600))
+			vsel = DIV_ROUND_UP(min_uV - 1852000, 38600);
 		break;
 	case SMPS_OFFSET_EN|SMPS_EXTENDED_EN:
 		if (min_uV == 0)
 			vsel = 0;
-		else if ((min_uV >= 2161000) && (max_uV <= 4321000)) {
-			vsel = (min_uV - 2161000) / 386;
-			if (vsel % 100)
-				vsel += 100;
-			vsel /= 100;
-			vsel++;
-		}
+		else if ((min_uV >= 2161000) && (max_uV <= 4321000))
+			vsel = DIV_ROUND_UP(min_uV - 2161000, 38600);
 		break;
 	}
Signature · 1 line
1.7.5.4
author
#2 lore raw

2012/4/10 Mark Brown <[email protected]>:

Quoted 4 lines · Axel Lin
Quoted 1 line
Signed-off-by Axel Lin <[email protected]>

Applied, thanks.

Hi Mark,
Seems you apply V2 of the patch.
The V3 is the correct one. https://lkml.org/lkml/2012/4/9/435

( the vsel++ after DIV_ROUND_UP is required because
current code does subtract index by 1 in the list_voltage callback.
e.g. current code uses this trick to differential setting voltage to
0 (vsel is 0) or 600000 uV (vsel is 1) )

Regards,
Axel