karo: merge with Ka-Ro specific tree for secure boot support

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

diff --git a/board/karo/tx6/ltc3676.c b/board/karo/tx6/ltc3676.c
index 0df71445fc83dfcef8685a22d4b38638b9be615b..c43e91430464a2c1e680c3f9f905aa8619709892 100644 (file)
--- a/board/karo/tx6/ltc3676.c
+++ b/board/karo/tx6/ltc3676.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/io.h>
+#include <asm/arch/imx-regs.h>
 
 #include "pmic.h"
 
@@ -56,16 +57,16 @@
 #define LTC3676_MSKPG_LDO3     (1 << 6)
 #define LTC3676_MSKPG_LDO4     (1 << 7)
 
-#define VDD_IO_VAL             mV_to_regval(vout_to_vref(3300 * 10, 5))
-#define VDD_IO_VAL_LP          mV_to_regval(vout_to_vref(3100 * 10, 5))
-#define VDD_IO_VAL_2           mV_to_regval(vout_to_vref(3300 * 10, 5_2))
-#define VDD_IO_VAL_2_LP                mV_to_regval(vout_to_vref(3100 * 10, 5_2))
-#define VDD_SOC_VAL            mV_to_regval(vout_to_vref(1425 * 10, 6))
-#define VDD_SOC_VAL_LP         mV_to_regval(vout_to_vref(900 * 10, 6))
-#define VDD_DDR_VAL            mV_to_regval(vout_to_vref(1500 * 10, 7))
-#define VDD_DDR_VAL_LP         mV_to_regval(vout_to_vref(1500 * 10, 7))
-#define VDD_CORE_VAL           mV_to_regval(vout_to_vref(1425 * 10, 8))
-#define VDD_CORE_VAL_LP                mV_to_regval(vout_to_vref(900 * 10, 8))
+#define VDD_IO_VAL             mV_to_regval(vout_to_vref(3300, 5))
+#define VDD_IO_VAL_LP          mV_to_regval(vout_to_vref(3100, 5))
+#define VDD_IO_VAL_2           mV_to_regval(vout_to_vref(3300, 5_2))
+#define VDD_IO_VAL_2_LP                mV_to_regval(vout_to_vref(3100, 5_2))
+#define VDD_SOC_VAL            mV_to_regval(vout_to_vref(1425, 6))
+#define VDD_SOC_VAL_LP         mV_to_regval(vout_to_vref(900, 6))
+#define VDD_DDR_VAL            mV_to_regval(vout_to_vref(1500, 7))
+#define VDD_DDR_VAL_LP         mV_to_regval(vout_to_vref(1500, 7))
+#define VDD_CORE_VAL           mV_to_regval(vout_to_vref(1425, 8))
+#define VDD_CORE_VAL_LP                mV_to_regval(vout_to_vref(900, 8))
 
 /* LDO1 */
 #define R1_1                   470
@@ -92,11 +93,14 @@
 #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 r2v(r,n,m)             (((r) * (m) + (n)) / 10)
+
 #define vout_to_vref(vout, idx)        ((vout) * R2(idx) / (R1(idx) + R2(idx)))
 #define vref_to_vout(vref, idx)        DIV_ROUND_UP((vref) * (R1(idx) + R2(idx)), R2(idx))
 
-#define mV_to_regval(mV)       DIV_ROUND(((((mV) < 4125) ? 4125 : (mV)) - 4125), 125)
-#define regval_to_mV(v)                (((v) * 125 + 4125))
+#define mV_to_regval(mV)       v2r((mV) * 10, 4125, 125)
+#define regval_to_mV(r)                r2v(r, 4125, 125)
 
 static struct ltc3676_regs {
        u8 addr;
@@ -138,7 +142,8 @@ static int tx6_rev_2(void)
        return pad_settings & 1;
 }
 
-static int ltc3676_setup_regs(struct ltc3676_regs *r, size_t count)
+static int ltc3676_setup_regs(uchar slave_addr, struct ltc3676_regs *r,
+                       size_t count)
 {
        int ret;
        int i;
@@ -147,7 +152,7 @@ static int ltc3676_setup_regs(struct ltc3676_regs *r, size_t count)
 #ifdef DEBUG
                unsigned char value;
 
-               ret = i2c_read(CONFIG_SYS_I2C_SLAVE, r->addr, 1, &value, 1);
+               ret = i2c_read(slave_addr, r->addr, 1, &value, 1);
                if ((value & ~r->mask) != r->val) {
                        printf("Changing PMIC reg %02x from %02x to %02x\n",
                                r->addr, value, r->val);
@@ -158,8 +163,7 @@ static int ltc3676_setup_regs(struct ltc3676_regs *r, size_t count)
                        return ret;
                }
 #endif
-               ret = i2c_write(CONFIG_SYS_I2C_SLAVE,
-                               r->addr, 1, &r->val, 1);
+               ret = i2c_write(slave_addr, r->addr, 1, &r->val, 1);
                if (ret) {
                        printf("%s: failed to write PMIC register %02x: %d\n",
                                __func__, r->addr, ret);
@@ -169,40 +173,51 @@ static int ltc3676_setup_regs(struct ltc3676_regs *r, size_t count)
        return 0;
 }
 
-int setup_pmic_voltages(void)
+int ltc3676_pmic_setup(uchar slave_addr)
 {
        int ret;
        unsigned char value;
 
-       ret = i2c_probe(CONFIG_SYS_I2C_SLAVE);
-       if (ret != 0) {
-               printf("Failed to initialize I2C\n");
-               return ret;
-       }
-
-       ret = i2c_read(CONFIG_SYS_I2C_SLAVE, 0x11, 1, &value, 1);
+       ret = i2c_read(slave_addr, 0x11, 1, &value, 1);
        if (ret) {
                printf("%s: i2c_read error: %d\n", __func__, ret);
                return ret;
        }
 
-       ret = ltc3676_setup_regs(ltc3676_regs, ARRAY_SIZE(ltc3676_regs));
+       ret = ltc3676_setup_regs(slave_addr, ltc3676_regs,
+                               ARRAY_SIZE(ltc3676_regs));
        if (ret)
                return ret;
 
-       printf("VDDCORE set to %umV\n",
-               DIV_ROUND(vref_to_vout(regval_to_mV(VDD_CORE_VAL), 8), 10));
-       printf("VDDSOC  set to %umV\n",
-               DIV_ROUND(vref_to_vout(regval_to_mV(VDD_SOC_VAL), 6), 10));
+       ret = i2c_read(slave_addr, LTC3676_DVB4A, 1, &value, 1);
+       if (ret == 0) {
+               printf("VDDCORE set to %umV\n",
+                       vref_to_vout(regval_to_mV(value), 8));
+       } else {
+               printf("Failed to read VDDCORE register setting\n");
+       }
+
+       ret = i2c_read(slave_addr, LTC3676_DVB2A, 1, &value, 1);
+       if (ret == 0) {
+               printf("VDDSOC  set to %umV\n",
+                       vref_to_vout(regval_to_mV(value), 6));
+       } else {
+               printf("Failed to read VDDSOC register setting\n");
+       }
 
        if (tx6_rev_2()) {
-               ret = ltc3676_setup_regs(ltc3676_regs_2,
+               ret = ltc3676_setup_regs(slave_addr, ltc3676_regs_2,
                                ARRAY_SIZE(ltc3676_regs_2));
-               printf("VDDIO   set to %umV\n",
-                       DIV_ROUND(vref_to_vout(
-                                       regval_to_mV(VDD_IO_VAL_2), 5_2), 10));
+
+               ret = i2c_read(slave_addr, LTC3676_DVB1A, 1, &value, 1);
+               if (ret == 0) {
+                       printf("VDDIO   set to %umV\n",
+                               vref_to_vout(regval_to_mV(value), 5_2));
+               } else {
+                       printf("Failed to read VDDIO register setting\n");
+               }
        } else {
-               ret = ltc3676_setup_regs(ltc3676_regs_1,
+               ret = ltc3676_setup_regs(slave_addr, ltc3676_regs_1,
                                ARRAY_SIZE(ltc3676_regs_1));
        }
        return ret;