karo: tx6: Cleanup PMIC code

[karo-tx-uboot.git] / board / karo / tx6 / rn5t618.c

diff --git a/board/karo/tx6/rn5t618.c b/board/karo/tx6/rn5t618.c
index 5ee1fa80fba13a26189648ab9c8d419a35fcf61e..19aba871afd6113c3cf4c9a947567d1872a03cf2 100644 (file)
--- a/board/karo/tx6/rn5t618.c
+++ b/board/karo/tx6/rn5t618.c
@@ -40,32 +40,35 @@
 #define RN5T618_LDO3DAC                0x4e /* IO */
 #define RN5T618_LDORTCDAC      0x56 /* VBACKUP */
 
-#define VDD_RTC_VAL            mV_to_regval_rtc(3000 * 10)
-#define VDD_HIGH_VAL           mV_to_regval3(3000 * 10)
-#define VDD_HIGH_VAL_LP                mV_to_regval3(3000 * 10)
-#define VDD_CORE_VAL           mV_to_regval(1425 * 10)
-#define VDD_CORE_VAL_LP                mV_to_regval(900 * 10)
-#define VDD_SOC_VAL            mV_to_regval(1425 * 10)
-#define VDD_SOC_VAL_LP         mV_to_regval(900 * 10)
-#define VDD_DDR_VAL            mV_to_regval(1500 * 10)
-#define VDD_DDR_VAL_LP         mV_to_regval(1500 * 10)
+#define VDD_RTC_VAL            mV_to_regval_rtc(3000)
+#define VDD_HIGH_VAL           mV_to_regval3(3000)
+#define VDD_HIGH_VAL_LP                mV_to_regval3(3000)
+#define VDD_CORE_VAL           mV_to_regval(1425)              /* DCDC1 */
+#define VDD_CORE_VAL_LP                mV_to_regval(900)
+#define VDD_SOC_VAL            mV_to_regval(1425)              /* DCDC2 */
+#define VDD_SOC_VAL_LP         mV_to_regval(900)
+#define VDD_DDR_VAL            mV_to_regval(1500)              /* DCDC3 */
+#define VDD_DDR_VAL_LP         mV_to_regval(1500)
 
 /* calculate voltages in 10mV */
+#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 mV_to_regval(mV)       DIV_ROUND(((((mV) < 6000) ? 6000 : (mV)) - 6000), 125)
-#define regval_to_mV(v)                (((v) * 125 + 6000))
+#define mV_to_regval(mV)       v2r((mV) * 10, 6000, 125)
+#define regval_to_mV(r)                r2v(r, 6000, 125)
 
 /* LDO1-2 */
-#define mV_to_regval2(mV)      DIV_ROUND(((((mV) < 9000) ? 9000 : (mV)) - 9000), 250)
-#define regval2_to_mV(v)       (((v) * 250 + 9000))
+#define mV_to_regval2(mV)      v2r((mV) * 10, 9000, 250)
+#define regval2_to_mV(r)       r2v(r, 9000, 250)
 
 /* LDO3 */
-#define mV_to_regval3(mV)      DIV_ROUND(((((mV) < 6000) ? 6000 : (mV)) - 6000), 250)
-#define regval3_to_mV(v)       (((v) * 250 + 6000))
+#define mV_to_regval3(mV)      v2r((mV) * 10, 6000, 250)
+#define regval3_to_mV(r)       r2v(r, 6000, 250)
 
 /* LDORTC */
-#define mV_to_regval_rtc(mV)   DIV_ROUND(((((mV) < 17000) ? 17000 : (mV)) - 17000), 250)
-#define regval_rtc_to_mV(v)    (((v) * 250 + 17000))
+#define mV_to_regval_rtc(mV)   v2r((mV) * 10, 17000, 250)
+#define regval_rtc_to_mV(r)    r2v(r, 17000, 250)
 
 static struct rn5t618_regs {
        u8 addr;
@@ -93,12 +96,6 @@ static int rn5t618_setup_regs(uchar slave_addr, struct rn5t618_regs *r,
        int ret;
        int i;
 
-       for (i = 0; i < count; i++, r++) {
-               unsigned char value;
-
-               ret = i2c_read(slave_addr, r->addr, 1, &value, 1);
-               debug("PMIC reg %02x = %02x\n", r->addr, value);
-       }
        for (i = 0; i < count; i++, r++) {
 #ifdef DEBUG
                unsigned char value;
@@ -120,10 +117,6 @@ static int rn5t618_setup_regs(uchar slave_addr, struct rn5t618_regs *r,
                                __func__, r->addr, ret);
                        return ret;
                }
-#ifdef DEBUG
-               ret = i2c_read(slave_addr, r->addr, 1, &value, 1);
-               printf("PMIC reg %02x is %02x\n", r->addr, value);
-#endif
        }
        return 0;
 }
@@ -144,10 +137,19 @@ int rn5t618_pmic_setup(uchar slave_addr)
        if (ret)
                return ret;
 
-       printf("VDDCORE set to %umV\n",
-               DIV_ROUND(regval_to_mV(VDD_CORE_VAL), 10));
-       printf("VDDSOC  set to %umV\n",
-               DIV_ROUND(regval_to_mV(VDD_SOC_VAL), 10));
+       ret = i2c_read(slave_addr, RN5T618_DC1DAC, 1, &value, 1);
+       if (ret == 0) {
+               printf("VDDCORE set to %umV\n", regval_to_mV(value));
+       } else {
+               printf("Failed to read VDDCORE register setting\n");
+       }
+
+       ret = i2c_read(slave_addr, RN5T618_DC2DAC, 1, &value, 1);
+       if (ret == 0) {
+               printf("VDDSOC  set to %umV\n", regval_to_mV(value));
+       } else {
+               printf("Failed to read VDDSOC register setting\n");
+       }
 
        return ret;
 }