mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-18 06:58:54 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-i2c
This commit is contained in:
commit
0f1b3a2424
1 changed files with 3 additions and 3 deletions
|
@ -1282,17 +1282,17 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
return do_i2c_crc(cmdtp, flag, argc, argv);
|
return do_i2c_crc(cmdtp, flag, argc, argv);
|
||||||
if (!strncmp(argv[0], "pr", 2))
|
if (!strncmp(argv[0], "pr", 2))
|
||||||
return do_i2c_probe(cmdtp, flag, argc, argv);
|
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);
|
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
if (!strncmp(argv[0], "lo", 2))
|
if (!strncmp(argv[0], "lo", 2))
|
||||||
return do_i2c_loop(cmdtp, flag, argc, argv);
|
return do_i2c_loop(cmdtp, flag, argc, argv);
|
||||||
#if defined(CONFIG_CMD_SDRAM)
|
#if defined(CONFIG_CMD_SDRAM)
|
||||||
if (!strncmp(argv[0], "sd", 2))
|
if (!strncmp(argv[0], "sd", 2))
|
||||||
return do_sdram(cmdtp, flag, argc, argv);
|
return do_sdram(cmdtp, flag, argc, argv);
|
||||||
#endif
|
#endif
|
||||||
else
|
cmd_usage(cmdtp);
|
||||||
cmd_usage(cmdtp);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue