Convert cmd_usage() calls in common to use a return value

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

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index c272b0dd4f7dda1782c2abe8b24cff299e0f99ee..2cdc4eda8b511cc4f36fde83e8db1b41703ebe2b 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -132,6 +132,14 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define DISP_LINE_LEN  16
 
+/* implement possible board specific board init */
+void __def_i2c_init_board(void)
+{
+       return;
+}
+void i2c_init_board(void)
+       __attribute__((weak, alias("__def_i2c_init_board")));
+
 /* TODO: Implement architecture-specific get/set functions */
 unsigned int __def_i2c_get_bus_speed(void)
 {
@@ -182,7 +190,7 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
        u_char  *memaddr;
 
        if (argc != 5)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * I2C chip address
@@ -196,7 +204,7 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
        devaddr = simple_strtoul(argv[2], NULL, 16);
        alen = get_alen(argv[2]);
        if (alen > 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Length is the number of objects, not number of bytes.
@@ -234,7 +242,7 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        length = i2c_dp_last_length;
 
        if (argc < 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        if ((flag & CMD_FLAG_REPEAT) == 0) {
                /*
@@ -253,7 +261,7 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
                addr = simple_strtoul(argv[2], NULL, 16);
                alen = get_alen(argv[2]);
                if (alen > 3)
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
 
                /*
                 * If another parameter, it is the length to display.
@@ -322,7 +330,7 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        int     count;
 
        if ((argc < 4) || (argc > 5))
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Chip is always specified.
@@ -335,7 +343,7 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        addr = simple_strtoul(argv[2], NULL, 16);
        alen = get_alen(argv[2]);
        if (alen > 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Value to write is always specified.
@@ -384,7 +392,7 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        ulong   err;
 
        if (argc < 4)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Chip is always specified.
@@ -397,7 +405,7 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        addr = simple_strtoul(argv[2], NULL, 16);
        alen = get_alen(argv[2]);
        if (alen > 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Count is always specified
@@ -441,10 +449,9 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg
        ulong   data;
        int     size = 1;
        int     nbytes;
-       extern char console_buffer[];
 
        if (argc != 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
 #ifdef CONFIG_BOOT_RETRY_TIME
        reset_cmd_timeout();    /* got a good command to get here */
@@ -475,7 +482,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg
                addr = simple_strtoul(argv[2], NULL, 16);
                alen = get_alen(argv[2]);
                if (alen > 3)
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
        }
 
        /*
@@ -606,7 +613,7 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        int     delay;
 
        if (argc < 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Chip is always specified.
@@ -619,7 +626,7 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        addr = simple_strtoul(argv[2], NULL, 16);
        alen = get_alen(argv[2]);
        if (alen > 3)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Length is the number of objects, not number of bytes.
@@ -758,7 +765,7 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
        };
 
        if (argc < 2)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * Chip is always specified.
@@ -1201,9 +1208,7 @@ static int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
                        device = device->next;
                }
        } else {
-               I2C_MUX_DEVICE *dev;
-
-               dev = i2c_mux_ident_muxstring ((uchar *)argv[1]);
+               (void)i2c_mux_ident_muxstring ((uchar *)argv[1]);
                ret = 0;
        }
        return ret;
@@ -1295,7 +1300,7 @@ static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
        cmd_tbl_t *c;
 
        if (argc < 2)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /* Strip off leading 'i2c' command argument */
        argc--;
@@ -1304,9 +1309,9 @@ static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
        c = find_cmd_tbl(argv[0], &cmd_i2c_sub[0], ARRAY_SIZE(cmd_i2c_sub));
 
        if (c)
-               return  c->cmd(cmdtp, flag, argc, argv);
+               return c->cmd(cmdtp, flag, argc, argv);
        else
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 }
 
 /***************************************************/
@@ -1389,8 +1394,8 @@ static int i2c_mux_get_busid (void)
        return tmp;
 }
 
-/* Analyses a Muxstring and sends immediately the
-   Commands to the Muxes. Runs from Flash.
+/* Analyses a Muxstring and immediately sends the
+   commands to the muxes. Runs from flash.
  */
 int i2c_mux_ident_muxstring_f (uchar *buf)
 {
@@ -1541,6 +1546,8 @@ int i2x_mux_select_mux(int bus)
 
        mux = dev->mux;
        while (mux != NULL) {
+               /* do deblocking on each level of mux, before mux config */
+               i2c_init_board();
                if (i2c_write(mux->chip, 0, 0, &mux->channel, 1) != 0) {
                        printf ("Error setting Mux: chip:%x channel: \
                                %x\n", mux->chip, mux->channel);
@@ -1548,6 +1555,8 @@ int i2x_mux_select_mux(int bus)
                }
                mux = mux->next;
        }
+       /* do deblocking on each level of mux and after mux config */
+       i2c_init_board();
        return 0;
 }
 #endif /* CONFIG_I2C_MUX */