Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0a45a6357b02e5ce5bf899a60db09def6a129fee

Authored by Peter Tyser
Committed by Wolfgang Denk
1 parent e96ad5d3ab

cmd_i2c: Clean up trivial helper functions 

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

Showing 1 changed file with 4 additions and 21 deletions Side-by-side Diff

... ... @@ -130,9 +130,6 @@
130 130  
131 131 #endif
132 132  
133   -static int
134   -mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]);
135   -
136 133 /* TODO: Implement architecture-specific get/set functions */
137 134 unsigned int __def_i2c_get_bus_speed(void)
138 135 {
139 136  
... ... @@ -257,16 +254,7 @@
257 254 return 0;
258 255 }
259 256  
260   -int do_i2c_mm ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
261   -{
262   - return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
263   -}
264 257  
265   -int do_i2c_nm ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
266   -{
267   - return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
268   -}
269   -
270 258 /* Write (fill) memory
271 259 *
272 260 * Syntax:
... ... @@ -1199,12 +1187,6 @@
1199 1187 }
1200 1188 #endif
1201 1189  
1202   -int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
1203   -{
1204   - i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
1205   - return 0;
1206   -}
1207   -
1208 1190 #if defined(CONFIG_I2C_MUX)
1209 1191 int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
1210 1192 {
1211 1193  
1212 1194  
... ... @@ -1291,17 +1273,18 @@
1291 1273 if (!strncmp(argv[0], "md", 2))
1292 1274 return do_i2c_md(cmdtp, flag, argc, argv);
1293 1275 if (!strncmp(argv[0], "mm", 2))
1294   - return do_i2c_mm(cmdtp, flag, argc, argv);
  1276 + return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
1295 1277 if (!strncmp(argv[0], "mw", 2))
1296 1278 return do_i2c_mw(cmdtp, flag, argc, argv);
1297 1279 if (!strncmp(argv[0], "nm", 2))
1298   - return do_i2c_nm(cmdtp, flag, argc, argv);
  1280 + return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
1299 1281 if (!strncmp(argv[0], "cr", 2))
1300 1282 return do_i2c_crc(cmdtp, flag, argc, argv);
1301 1283 if (!strncmp(argv[0], "pr", 2))
1302 1284 return do_i2c_probe(cmdtp, flag, argc, argv);
1303 1285 if (!strncmp(argv[0], "re", 2))
1304   - return do_i2c_reset(cmdtp, flag, argc, argv);
  1286 + i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
  1287 + return 0;
1305 1288 if (!strncmp(argv[0], "lo", 2))
1306 1289 return do_i2c_loop(cmdtp, flag, argc, argv);
1307 1290 #if defined(CONFIG_CMD_SDRAM)