karo: tx6: Cleanup PMIC code

Conflicts:
	board/karo/tx6/ltc3676.c
	board/karo/tx6/rn5t567.c
	board/karo/tx6/rn5t618.c

diff --git a/board/karo/tx6/ltc3676.c b/board/karo/tx6/ltc3676.c
index c43e91430464a2c1e680c3f9f905aa8619709892..53cf5e2382e423a699a7fe3efce318913655483a 100644 (file)
--- a/board/karo/tx6/ltc3676.c
+++ b/board/karo/tx6/ltc3676.c
@@ -93,7 +93,7 @@
 #define R1(idx)                        R1_##idx
 #define R2(idx)                        R2_##idx
 
 #define R1(idx)                        R1_##idx
 #define R2(idx)                        R2_##idx
 

-#define v2r(v,n,m)             DIV_ROUND_UP(((((v) < (n)) ? (n) : (v)) - (n)), (m))
+#define v2r(v,n,m)             DIV_ROUND(((((v) < (n)) ? (n) : (v)) - (n)), (m))

 #define r2v(r,n,m)             (((r) * (m) + (n)) / 10)
 
 #define vout_to_vref(vout, idx)        ((vout) * R2(idx) / (R1(idx) + R2(idx)))
 #define r2v(r,n,m)             (((r) * (m) + (n)) / 10)
 
 #define vout_to_vref(vout, idx)        ((vout) * R2(idx) / (R1(idx) + R2(idx)))

diff --git a/board/karo/tx6/rn5t567.c b/board/karo/tx6/rn5t567.c
index a4a58844e40d1cbb3d48d69b24ed73397f5b0dbb..6f791374b4e1b6b56223120661877b06c7ccae1f 100644 (file)
--- a/board/karo/tx6/rn5t567.c
+++ b/board/karo/tx6/rn5t567.c
@@ -53,7 +53,7 @@
 #define VDD_DDR_VAL_LP         mV_to_regval(1350)
 
 /* calculate voltages in 10mV */
 #define VDD_DDR_VAL_LP         mV_to_regval(1350)
 
 /* calculate voltages in 10mV */

-#define v2r(v,n,m)             DIV_ROUND_UP(((((v) < (n)) ? (n) : (v)) - (n)), (m))
+#define v2r(v,n,m)             DIV_ROUND(((((v) < (n)) ? (n) : (v)) - (n)), (m))

 #define r2v(r,n,m)             (((r) * (m) + (n)) / 10)
 
 /* DCDC1-3 */
 #define r2v(r,n,m)             (((r) * (m) + (n)) / 10)
 
 /* DCDC1-3 */

diff --git a/board/karo/tx6/rn5t618.c b/board/karo/tx6/rn5t618.c
index 538dd5574ae54edd912d68b924c7b9f1289c1993..19aba871afd6113c3cf4c9a947567d1872a03cf2 100644 (file)
--- a/board/karo/tx6/rn5t618.c
+++ b/board/karo/tx6/rn5t618.c
@@ -51,7 +51,7 @@
 #define VDD_DDR_VAL_LP         mV_to_regval(1500)
 
 /* calculate voltages in 10mV */
 #define VDD_DDR_VAL_LP         mV_to_regval(1500)
 
 /* calculate voltages in 10mV */

-#define v2r(v,n,m)             DIV_ROUND_UP(((((v) < (n)) ? (n) : (v)) - (n)), (m))
+#define v2r(v,n,m)             DIV_ROUND(((((v) < (n)) ? (n) : (v)) - (n)), (m))

 #define r2v(r,n,m)             (((r) * (m) + (n)) / 10)
 
 /* DCDC1-3 */
 #define r2v(r,n,m)             (((r) * (m) + (n)) / 10)
 
 /* DCDC1-3 */