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

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

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index bf7f6d352cea0120a646b60d66a2c847fd47bcd2..0a0cfceb45ca6d7e424655dec811a6540355df31 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -150,22 +150,39 @@ int __def_i2c_set_bus_speed(unsigned int speed)
 int i2c_set_bus_speed(unsigned int)
        __attribute__((weak, alias("__def_i2c_set_bus_speed")));
 
+/*
+ * get_alen: small parser helper function to get address length
+ * returns the address length
+ */
+static uint get_alen(char *arg)
+{
+       int     j;
+       int     alen;
+
+       alen = 1;
+       for (j = 0; j < 8; j++) {
+               if (arg[j] == '.') {
+                       alen = arg[j+1] - '0';
+                       break;
+               } else if (arg[j] == '\0')
+                       break;
+       }
+       return alen;
+}
+
 /*
  * Syntax:
  *     i2c read {i2c_chip} {devaddr}{.0, .1, .2} {len} {memaddr}
  */
 
-static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        u_char  chip;
        uint    devaddr, alen, length;
        u_char  *memaddr;
-       int     j;
 
-       if (argc != 5) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc != 5)
+               return cmd_usage(cmdtp);
 
        /*
         * I2C chip address
@@ -177,18 +194,9 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         * 2 bytes long.  Some day it might be 3 bytes long :-).
         */
        devaddr = simple_strtoul(argv[2], NULL, 16);
-       alen = 1;
-       for (j = 0; j < 8; j++) {
-               if (argv[2][j] == '.') {
-                       alen = argv[2][j+1] - '0';
-                       if (alen > 3) {
-                               cmd_usage(cmdtp);
-                               return 1;
-                       }
-                       break;
-               } else if (argv[2][j] == '\0')
-                       break;
-       }
+       alen = get_alen(argv[2]);
+       if (alen > 3)
+               return cmd_usage(cmdtp);
 
        /*
         * Length is the number of objects, not number of bytes.
@@ -211,7 +219,7 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * Syntax:
  *     i2c md {i2c_chip} {addr}{.0, .1, .2} {len}
  */
-static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        u_char  chip;
        uint    addr, alen, length;
@@ -225,16 +233,13 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        alen   = i2c_dp_last_alen;
        length = i2c_dp_last_length;
 
-       if (argc < 3) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 3)
+               return cmd_usage(cmdtp);
 
        if ((flag & CMD_FLAG_REPEAT) == 0) {
                /*
                 * New command specified.
                 */
-               alen = 1;
 
                /*
                 * I2C chip address
@@ -246,18 +251,9 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                 * 2 bytes long.  Some day it might be 3 bytes long :-).
                 */
                addr = simple_strtoul(argv[2], NULL, 16);
-               alen = 1;
-               for (j = 0; j < 8; j++) {
-                       if (argv[2][j] == '.') {
-                               alen = argv[2][j+1] - '0';
-                               if (alen > 3) {
-                                       cmd_usage(cmdtp);
-                                       return 1;
-                               }
-                               break;
-                       } else if (argv[2][j] == '\0')
-                               break;
-               }
+               alen = get_alen(argv[2]);
+               if (alen > 3)
+                       return cmd_usage(cmdtp);
 
                /*
                 * If another parameter, it is the length to display.
@@ -317,19 +313,16 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * Syntax:
  *     i2c mw {i2c_chip} {addr}{.0, .1, .2} {data} [{count}]
  */
-static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        uchar   chip;
        ulong   addr;
        uint    alen;
        uchar   byte;
        int     count;
-       int     j;
 
-       if ((argc < 4) || (argc > 5)) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if ((argc < 4) || (argc > 5))
+               return cmd_usage(cmdtp);
 
        /*
         * Chip is always specified.
@@ -340,18 +333,9 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         * Address is always specified.
         */
        addr = simple_strtoul(argv[2], NULL, 16);
-       alen = 1;
-       for (j = 0; j < 8; j++) {
-               if (argv[2][j] == '.') {
-                       alen = argv[2][j+1] - '0';
-                       if (alen > 3) {
-                               cmd_usage(cmdtp);
-                               return 1;
-                       }
-                       break;
-               } else if (argv[2][j] == '\0')
-                       break;
-       }
+       alen = get_alen(argv[2]);
+       if (alen > 3)
+               return cmd_usage(cmdtp);
 
        /*
         * Value to write is always specified.
@@ -389,7 +373,7 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * Syntax:
  *     i2c crc32 {i2c_chip} {addr}{.0, .1, .2} {count}
  */
-static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        uchar   chip;
        ulong   addr;
@@ -398,12 +382,9 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        uchar   byte;
        ulong   crc;
        ulong   err;
-       int     j;
 
-       if (argc < 4) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 4)
+               return cmd_usage(cmdtp);
 
        /*
         * Chip is always specified.
@@ -414,18 +395,9 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         * Address is always specified.
         */
        addr = simple_strtoul(argv[2], NULL, 16);
-       alen = 1;
-       for (j = 0; j < 8; j++) {
-               if (argv[2][j] == '.') {
-                       alen = argv[2][j+1] - '0';
-                       if (alen > 3) {
-                               cmd_usage(cmdtp);
-                               return 1;
-                       }
-                       break;
-               } else if (argv[2][j] == '\0')
-                       break;
-       }
+       alen = get_alen(argv[2]);
+       if (alen > 3)
+               return cmd_usage(cmdtp);
 
        /*
         * Count is always specified
@@ -461,7 +433,7 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  */
 
 static int
-mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
+mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
 {
        uchar   chip;
        ulong   addr;
@@ -469,13 +441,10 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
        ulong   data;
        int     size = 1;
        int     nbytes;
-       int     j;
        extern char console_buffer[];
 
-       if (argc != 3) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc != 3)
+               return cmd_usage(cmdtp);
 
 #ifdef CONFIG_BOOT_RETRY_TIME
        reset_cmd_timeout();    /* got a good command to get here */
@@ -504,18 +473,9 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
                 * Address is always specified.
                 */
                addr = simple_strtoul(argv[2], NULL, 16);
-               alen = 1;
-               for (j = 0; j < 8; j++) {
-                       if (argv[2][j] == '.') {
-                               alen = argv[2][j+1] - '0';
-                               if (alen > 3) {
-                                       cmd_usage(cmdtp);
-                                       return 1;
-                               }
-                               break;
-                       } else if (argv[2][j] == '\0')
-                               break;
-               }
+               alen = get_alen(argv[2]);
+               if (alen > 3)
+                       return cmd_usage(cmdtp);
        }
 
        /*
@@ -592,7 +552,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
  * Syntax:
  *     i2c probe {addr}{.0, .1, .2}
  */
-static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int j;
 #if defined(CONFIG_SYS_I2C_NOPROBES)
@@ -636,7 +596,7 @@ static int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  *     {length} - Number of bytes to read
  *     {delay}  - A DECIMAL number and defaults to 1000 uSec
  */
-static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        u_char  chip;
        ulong   alen;
@@ -644,12 +604,9 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        uint    length;
        u_char  bytes[16];
        int     delay;
-       int     j;
 
-       if (argc < 3) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 3)
+               return cmd_usage(cmdtp);
 
        /*
         * Chip is always specified.
@@ -660,18 +617,9 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         * Address is always specified.
         */
        addr = simple_strtoul(argv[2], NULL, 16);
-       alen = 1;
-       for (j = 0; j < 8; j++) {
-               if (argv[2][j] == '.') {
-                       alen = argv[2][j+1] - '0';
-                       if (alen > 3) {
-                               cmd_usage(cmdtp);
-                               return 1;
-                       }
-                       break;
-               } else if (argv[2][j] == '\0')
-                       break;
-       }
+       alen = get_alen(argv[2]);
+       if (alen > 3)
+               return cmd_usage(cmdtp);
 
        /*
         * Length is the number of objects, not number of bytes.
@@ -756,7 +704,7 @@ static void decode_bits (u_char const b, char const *str[], int const do_once)
  * Syntax:
  *     i2c sdram {i2c_chip}
  */
-static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        enum { unknown, EDO, SDRAM, DDR2 } type;
 
@@ -809,10 +757,9 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                "32 MiB", "16 MiB", "8 MiB", "4 MiB"
        };
 
-       if (argc < 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 2)
+               return cmd_usage(cmdtp);
+
        /*
         * Chip is always specified.
         */
@@ -1233,7 +1180,7 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 #endif
 
 #if defined(CONFIG_I2C_MUX)
-static int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        int ret=0;
 
@@ -1264,7 +1211,7 @@ static int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 #endif  /* CONFIG_I2C_MUX */
 
 #if defined(CONFIG_I2C_MULTI_BUS)
-static int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        int bus_idx, ret=0;
 
@@ -1282,7 +1229,7 @@ static int do_i2c_bus_num(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 #endif  /* CONFIG_I2C_MULTI_BUS */
 
-static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        int speed, ret=0;
 
@@ -1299,17 +1246,17 @@ static int do_i2c_bus_speed(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return ret;
 }
 
-static int do_i2c_mm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_mm(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
 }
 
-static int do_i2c_nm(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_nm(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
 }
 
-static int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
        return 0;
@@ -1337,22 +1284,29 @@ static cmd_tbl_t cmd_i2c_sub[] = {
        U_BOOT_CMD_MKENT(speed, 1, 1, do_i2c_bus_speed, "", ""),
 };
 
-static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+#ifndef CONFIG_RELOC_FIXUP_WORKS
+void i2c_reloc(void) {
+       fixup_cmdtable(cmd_i2c_sub, ARRAY_SIZE(cmd_i2c_sub));
+}
+#endif
+
+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);
+
        /* Strip off leading 'i2c' command argument */
        argc--;
        argv++;
 
        c = find_cmd_tbl(argv[0], &cmd_i2c_sub[0], ARRAY_SIZE(cmd_i2c_sub));
 
-       if (c) {
+       if (c)
                return  c->cmd(cmdtp, flag, argc, argv);
-       } else {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       else
+               return cmd_usage(cmdtp);
 }
 
 /***************************************************/
@@ -1382,7 +1336,7 @@ U_BOOT_CMD(
 );
 
 #if defined(CONFIG_I2C_MUX)
-int i2c_mux_add_device(I2C_MUX_DEVICE *dev)
+static int i2c_mux_add_device(I2C_MUX_DEVICE *dev)
 {
        I2C_MUX_DEVICE  *devtmp = i2c_mux_devices;