karo: tx6: don't write u-boot image with WITH_DROP_FFS

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

diff --git a/board/karo/tx6/rn5t618.c b/board/karo/tx6/rn5t618.c
index 538dd5574ae54edd912d68b924c7b9f1289c1993..f5bcb4f2499d909ccc9cf6a8d74bea418932f36e 100644 (file)
--- a/board/karo/tx6/rn5t618.c
+++ b/board/karo/tx6/rn5t618.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <i2c.h>
 
+#include "../common/karo.h"
 #include "pmic.h"
 
 #define RN5T618_NOETIMSET      0x11
@@ -35,8 +36,8 @@
 #define RN5T618_DC2DAC_SLP     0x3c
 #define RN5T618_DC3DAC_SLP     0x3d
 #define RN5T618_LDOEN1         0x44
+#define RN5T618_LDOEN2         0x45
 #define RN5T618_LDODIS         0x46
-#define RN5T618_LDOEN2         0x48
 #define RN5T618_LDO3DAC                0x4e /* IO */
 #define RN5T618_LDORTCDAC      0x56 /* VBACKUP */
 
@@ -51,7 +52,7 @@
 #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 */
@@ -70,11 +71,7 @@
 #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;
-       u8 val;
-       u8 mask;
-} rn5t618_regs[] = {
+static struct pmic_regs rn5t618_regs[] = {
        { RN5T618_NOETIMSET, 0, },
        { RN5T618_DC1DAC, VDD_CORE_VAL, },
        { RN5T618_DC2DAC, VDD_SOC_VAL, },
@@ -90,7 +87,7 @@ static struct rn5t618_regs {
        { RN5T618_LDORTC1_SLOT, 0x0f, ~0x3f, },
 };
 
-static int rn5t618_setup_regs(uchar slave_addr, struct rn5t618_regs *r,
+static int rn5t618_setup_regs(uchar slave_addr, struct pmic_regs *r,
                        size_t count)
 {
        int ret;
@@ -101,15 +98,15 @@ static int rn5t618_setup_regs(uchar slave_addr, struct rn5t618_regs *r,
                unsigned char value;
 
                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);
-               }
                if (ret) {
                        printf("%s: failed to read PMIC register %02x: %d\n",
                                __func__, r->addr, ret);
                        return ret;
                }
+               if ((value & ~r->mask) != r->val) {
+                       printf("Changing PMIC reg %02x from %02x to %02x\n",
+                               r->addr, value, r->val);
+               }
 #endif
                ret = i2c_write(slave_addr, r->addr, 1, &r->val, 1);
                if (ret) {
@@ -117,11 +114,24 @@ 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);
+               if (ret) {
+                       printf("%s: failed to read PMIC register %02x: %d\n",
+                               __func__, r->addr, ret);
+                       return ret;
+               }
+               if (value != r->val) {
+                       printf("Failed to set PMIC reg %02x to %02x; actual value: %02x\n",
+                               r->addr, r->val, value);
+               }
+#endif
        }
        return 0;
 }
 
-int rn5t618_pmic_setup(uchar slave_addr)
+int rn5t618_pmic_setup(uchar slave_addr, struct pmic_regs *regs,
+               size_t count)
 {
        int ret;
        unsigned char value;