colibri imx6: pf0100: reorder and cleanup message printing

Keep debug code at the end of the function.
Use a one line informational message for the PMIC only.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c
index 5e411f1743bd6af5206fa60387ac223d2960d8f2..09c3cc950aebe5886f55edcd3195303652d3f391 100644 (file)
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -35,7 +35,7 @@ unsigned pmic_init(void)
        uchar bus = 1;
        uchar devid, revid, val;
 
-       puts("PMIC: ");
+       puts("PMIC:  ");
        rc = i2c_get_chip_for_busnum(bus, PFUZE100_I2C_ADDR, 1, &dev);
        if (rc) {
                printf("failed to get device for PMIC at address 0x%x\n",
@@ -51,7 +51,46 @@ unsigned pmic_init(void)
                puts("i2c pmic revid read failed\n");
                return 0;
        }
-       printf("device id: 0x%.2x, revision id: 0x%.2x\n", devid, revid);
+       printf("device id: 0x%.2x, revision id: 0x%.2x, ", devid, revid);
+
+       /* get device programmed state */
+       val = PFUZE100_PAGE_REGISTER_PAGE1;
+       if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) {
+               puts("i2c write failed\n");
+               return 0;
+       }
+       if (dm_i2c_read(dev, PFUZE100_FUSE_POR1, &val, 1) < 0) {
+               puts("i2c fuse_por read failed\n");
+               return 0;
+       }
+       if (val & PFUZE100_FUSE_POR_M)
+               programmed++;
+
+       if (dm_i2c_read(dev, PFUZE100_FUSE_POR2, &val, 1) < 0) {
+               puts("i2c fuse_por read failed\n");
+               return programmed;
+       }
+       if (val & PFUZE100_FUSE_POR_M)
+               programmed++;
+
+       if (dm_i2c_read(dev, PFUZE100_FUSE_POR3, &val, 1) < 0) {
+               puts("i2c fuse_por read failed\n");
+               return programmed;
+       }
+       if (val & PFUZE100_FUSE_POR_M)
+               programmed++;
+
+       switch (programmed) {
+       case 0:
+               puts("not programmed\n");
+               break;
+       case 3:
+               puts("programmed\n");
+               break;
+       default:
+               puts("undefined programming state\n");
+               break;
+       }
 
 #ifdef DEBUG
        {
@@ -103,45 +142,6 @@ unsigned pmic_init(void)
        }
 #endif /* DEBUG */
 
-       /* get device programmed state */
-       val = PFUZE100_PAGE_REGISTER_PAGE1;
-       if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) {
-               puts("i2c write failed\n");
-               return 0;
-       }
-       if (dm_i2c_read(dev, PFUZE100_FUSE_POR1, &val, 1) < 0) {
-               puts("i2c fuse_por read failed\n");
-               return 0;
-       }
-       if (val & PFUZE100_FUSE_POR_M)
-               programmed++;
-
-       if (dm_i2c_read(dev, PFUZE100_FUSE_POR2, &val, 1) < 0) {
-               puts("i2c fuse_por read failed\n");
-               return programmed;
-       }
-       if (val & PFUZE100_FUSE_POR_M)
-               programmed++;
-
-       if (dm_i2c_read(dev, PFUZE100_FUSE_POR3, &val, 1) < 0) {
-               puts("i2c fuse_por read failed\n");
-               return programmed;
-       }
-       if (val & PFUZE100_FUSE_POR_M)
-               programmed++;
-
-       switch (programmed) {
-       case 0:
-               printf("PMIC: not programmed\n");
-               break;
-       case 3:
-               printf("PMIC: programmed\n");
-               break;
-       default:
-               printf("PMIC: undefined programming state\n");
-               break;
-       }
-
        return programmed;
 }