X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=board%2Fkaro%2Ftx6%2Fltc3676.c;h=d78a935d9909f8cdc96294150e92c00e1a9b9ecc;hp=3f692d3fd6234e39990028864b4a0fcd67e4e08e;hb=b613e722f29c16b73805731b93c405b391f34708;hpb=c9edec61d68577b2217e23c93b0352878ce7f3ba

diff --git a/board/karo/tx6/ltc3676.c b/board/karo/tx6/ltc3676.c
index 3f692d3fd6..d78a935d99 100644
--- a/board/karo/tx6/ltc3676.c
+++ b/board/karo/tx6/ltc3676.c
@@ -103,11 +103,7 @@
 #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;
-	u8 val;
-	u8 mask;
-} ltc3676_regs[] = {
+static struct pmic_regs ltc3676_regs[] = {
 	{ LTC3676_MSKPG, ~LTC3676_MSKPG_BUCK1, },
 	{ LTC3676_DVB2B, VDD_SOC_VAL_LP | LTC3676_PGOOD_MASK, ~0x3f, },
 	{ LTC3676_DVB3B, VDD_DDR_VAL_LP, ~0x3f, },
@@ -122,12 +118,12 @@ static struct ltc3676_regs {
 	{ LTC3676_CLIRQ, 0, }, /* clear interrupt status */
 };
 
-static struct ltc3676_regs ltc3676_regs_1[] = {
+static struct pmic_regs ltc3676_regs_1[] = {
 	{ LTC3676_DVB1B, VDD_IO_VAL_LP | LTC3676_PGOOD_MASK, ~0x3f, },
 	{ LTC3676_DVB1A, VDD_IO_VAL, ~0x3f, },
 };
 
-static struct ltc3676_regs ltc3676_regs_2[] = {
+static struct pmic_regs ltc3676_regs_2[] = {
 	{ LTC3676_DVB1B, VDD_IO_VAL_2_LP | LTC3676_PGOOD_MASK, ~0x3f, },
 	{ LTC3676_DVB1A, VDD_IO_VAL_2, ~0x3f, },
 };
@@ -143,7 +139,7 @@ static int tx6_rev_2(void)
 	return pad_settings & 1;
 }
 
-static int ltc3676_setup_regs(uchar slave_addr, struct ltc3676_regs *r,
+static int ltc3676_setup_regs(uchar slave_addr, struct pmic_regs *r,
 			size_t count)
 {
 	int ret;
@@ -154,15 +150,15 @@ static int ltc3676_setup_regs(uchar slave_addr, struct ltc3676_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) {
@@ -170,11 +166,24 @@ static int ltc3676_setup_regs(uchar slave_addr, struct ltc3676_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 ltc3676_pmic_setup(uchar slave_addr)
+int ltc3676_pmic_setup(uchar slave_addr, struct pmic_regs *regs,
+			size_t count)
 {
 	int ret;
 	unsigned char value;