Merge branch 'master' of git://git.denx.de/u-boot-ubi

[karo-tx-uboot.git] / common / cmd_i2c.c

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index 3d3127c6e825ffa041535ceb1e8b4c00d95408bd..8f0fc9e1d73a11bea1aa3ae80425dc1c2f51fcf9 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -130,9 +130,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #endif
 
-static int
-mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]);
-
 /* TODO: Implement architecture-specific get/set functions */
 unsigned int __def_i2c_get_bus_speed(void)
 {
@@ -257,15 +254,6 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-int do_i2c_mm ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-{
-       return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
-}
-
-int do_i2c_nm ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-{
-       return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
-}
 
 /* Write (fill) memory
  *
@@ -1199,12 +1187,6 @@ int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 #endif
 
-int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
-{
-       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-       return 0;
-}
-
 #if defined(CONFIG_I2C_MUX)
 int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
@@ -1291,25 +1273,26 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        if (!strncmp(argv[0], "md", 2))
                return do_i2c_md(cmdtp, flag, argc, argv);
        if (!strncmp(argv[0], "mm", 2))
-               return do_i2c_mm(cmdtp, flag, argc, argv);
+               return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
        if (!strncmp(argv[0], "mw", 2))
                return do_i2c_mw(cmdtp, flag, argc, argv);
        if (!strncmp(argv[0], "nm", 2))
-               return do_i2c_nm(cmdtp, flag, argc, argv);
+               return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
        if (!strncmp(argv[0], "cr", 2))
                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))
-               return do_i2c_reset(cmdtp, flag, argc, argv);
+       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;
 }
 
@@ -1318,10 +1301,10 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        i2c, 6, 1, do_i2c,
        "I2C sub-system",
+       "speed [speed] - show or set I2C bus speed\n"
 #if defined(CONFIG_I2C_MUX)
-       "bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes.\n"
+       "i2c bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes\n"
 #endif  /* CONFIG_I2C_MUX */
-       "speed [speed] - show or set I2C bus speed\n"
 #if defined(CONFIG_I2C_MULTI_BUS)
        "i2c dev [dev] - show or set current I2C bus\n"
 #endif  /* CONFIG_I2C_MULTI_BUS */
@@ -1332,9 +1315,10 @@ U_BOOT_CMD(
        "i2c crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
        "i2c probe - show devices on the I2C bus\n"
        "i2c reset - re-init the I2C Controller\n"
-       "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
+       "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device"
 #if defined(CONFIG_CMD_SDRAM)
-       "i2c sdram chip - print SDRAM configuration information\n"
+       "\n"
+       "i2c sdram chip - print SDRAM configuration information"
 #endif
 );