ppc/85xx: Add PIB/ATM support for MPC8569mds

[u-boot] / common / cmd_i2c.c

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index ae26845161e38b3eeee0f4a7b9aeaa696130a854..62cbd335e5a458e31b1ff8a9950b62ed6875e4af 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -315,10 +315,6 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                /*
                 * Wait for the write to complete.  The write can take
                 * up to 10mSec (we allow a little more time).
-                *
-                * On some chips, while the write is in progress, the
-                * chip doesn't respond.  This apparently isn't a
-                * universal feature so we don't take advantage of it.
                 */
 /*
  * No write delay with FRAM devices.
@@ -326,14 +322,6 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #if !defined(CONFIG_SYS_I2C_FRAM)
                udelay(11000);
 #endif
-
-#if 0
-               for (timeout = 0; timeout < 10; timeout++) {
-                       udelay(2000);
-                       if (i2c_probe(chip) == 0)
-                               break;
-               }
-#endif
        }
 
        return (0);
@@ -1282,17 +1270,17 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                return do_i2c_crc(cmdtp, flag, argc, argv);
        if (!strncmp(argv[0], "pr", 2))
                return do_i2c_probe(cmdtp, flag, argc, argv);
-       if (!strncmp(argv[0], "re", 2))
+       if (!strncmp(argv[0], "re", 2)) {
                i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
                return 0;
+       }
        if (!strncmp(argv[0], "lo", 2))
                return do_i2c_loop(cmdtp, flag, argc, argv);
 #if defined(CONFIG_CMD_SDRAM)
        if (!strncmp(argv[0], "sd", 2))
                return do_sdram(cmdtp, flag, argc, argv);
 #endif
-       else
-               cmd_usage(cmdtp);
+       cmd_usage(cmdtp);
        return 0;
 }