Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 07:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

eeprom: use eeprom_execute_command for all eeprom functions

Browse source 
Update eeprom_execute_command() and related code to accommodate both layout
aware and layout unaware functions.

No functional changes.

Cc: Heiko Schocher <hs@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
[trini: Make eeprom_execute_command have ulong for i2c_addr]
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Nikita Kiryanov 2016-04-16 17:55:12 +03:00 committed by Tom Rini
parent c40f03723f
commit e7c2729bb3
1 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
cmd/eeprom.c
View file

@ -24,6 +24,7 @@
#include <config.h> #include <config.h>
#include <command.h> #include <command.h>
#include <i2c.h> #include <i2c.h>
#include <eeprom_layout.h>
#ifndef CONFIG_SYS_I2C_SPEED #ifndef CONFIG_SYS_I2C_SPEED
#define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SPEED 50000
@ -258,7 +259,6 @@ static int parse_i2c_bus_addr(int *i2c_bus, ulong *i2c_addr, int argc,
} }
#ifdef CONFIG_CMD_EEPROM_LAYOUT #ifdef CONFIG_CMD_EEPROM_LAYOUT
#include <eeprom_layout.h>
__weak int eeprom_parse_layout_version(char *str) __weak int eeprom_parse_layout_version(char *str)
{ {
@ -271,12 +271,17 @@ static unsigned char eeprom_buf[CONFIG_SYS_EEPROM_SIZE];
#define CONFIG_EEPROM_LAYOUT_HELP_STRING "<not defined>" #define CONFIG_EEPROM_LAYOUT_HELP_STRING "<not defined>"
#endif #endif
#endif
enum eeprom_action { enum eeprom_action {
EEPROM_READ,
EEPROM_WRITE,
EEPROM_PRINT, EEPROM_PRINT,
EEPROM_UPDATE, EEPROM_UPDATE,
EEPROM_ACTION_INVALID, EEPROM_ACTION_INVALID,
}; };
#ifdef CONFIG_CMD_EEPROM_LAYOUT
static enum eeprom_action parse_action(char *cmd) static enum eeprom_action parse_action(char *cmd)
{ {
if (!strncmp(cmd, "print", 5)) if (!strncmp(cmd, "print", 5))
@ -286,18 +291,40 @@ static enum eeprom_action parse_action(char *cmd)
return EEPROM_ACTION_INVALID; return EEPROM_ACTION_INVALID;
} }
#endif
static int eeprom_execute_command(enum eeprom_action action, int i2c_bus, static int eeprom_execute_command(enum eeprom_action action, int i2c_bus,
int i2c_addr, int layout_ver, char *key, ulong i2c_addr, int layout_ver, char *key,
char *value) char *value, ulong addr, ulong off, ulong cnt)
{ {
int rcode; int rcode = 0;
const char *const fmt =
"\nEEPROM @0x%lX %s: addr %08lx off %04lx count %ld ... ";
#ifdef CONFIG_CMD_EEPROM_LAYOUT
struct eeprom_layout layout; struct eeprom_layout layout;
#endif
if (action == EEPROM_ACTION_INVALID) if (action == EEPROM_ACTION_INVALID)
return CMD_RET_USAGE; return CMD_RET_USAGE;
eeprom_init(i2c_bus); eeprom_init(i2c_bus);
if (action == EEPROM_READ) {
printf(fmt, i2c_addr, "read", addr, off, cnt);
rcode = eeprom_read(i2c_addr, off, (uchar *)addr, cnt);
puts("done\n");
return rcode;
} else if (action == EEPROM_WRITE) {
printf(fmt, i2c_addr, "write", addr, off, cnt);
rcode = eeprom_write(i2c_addr, off, (uchar *)addr, cnt);
puts("done\n");
return rcode;
}
#ifdef CONFIG_CMD_EEPROM_LAYOUT
rcode = eeprom_read(i2c_addr, 0, eeprom_buf, CONFIG_SYS_EEPROM_SIZE); rcode = eeprom_read(i2c_addr, 0, eeprom_buf, CONFIG_SYS_EEPROM_SIZE);
if (rcode < 0) if (rcode < 0)
return rcode; return rcode;
@ -313,10 +340,12 @@ static int eeprom_execute_command(enum eeprom_action action, int i2c_bus,
layout.update(&layout, key, value); layout.update(&layout, key, value);
rcode = eeprom_write(i2c_addr, 0, layout.data, CONFIG_SYS_EEPROM_SIZE); rcode = eeprom_write(i2c_addr, 0, layout.data, CONFIG_SYS_EEPROM_SIZE);
#endif
return rcode; return rcode;
} }
#ifdef CONFIG_CMD_EEPROM_LAYOUT
#define NEXT_PARAM(argc, index) { (argc)--; (index)++; } #define NEXT_PARAM(argc, index) { (argc)--; (index)++; }
static int do_eeprom_layout(cmd_tbl_t *cmdtp, int flag, int argc, static int do_eeprom_layout(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
@ -369,15 +398,13 @@ static int do_eeprom_layout(cmd_tbl_t *cmdtp, int flag, int argc,
done: done:
return eeprom_execute_command(action, i2c_bus, i2c_addr, layout_ver, return eeprom_execute_command(action, i2c_bus, i2c_addr, layout_ver,
field_name, field_value); field_name, field_value, 0, 0, 0);
} }
#endif #endif
static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
const char *const fmt =
"\nEEPROM @0x%lX %s: addr %08lx off %04lx count %ld ... ";
char * const *args = &argv[2]; char * const *args = &argv[2];
int rcode; int rcode;
ulong dev_addr, addr, off, cnt; ulong dev_addr, addr, off, cnt;
@ -398,22 +425,14 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
off = simple_strtoul(*args++, NULL, 16); off = simple_strtoul(*args++, NULL, 16);
cnt = simple_strtoul(*args++, NULL, 16); cnt = simple_strtoul(*args++, NULL, 16);
eeprom_init(bus_addr);
if (strcmp(argv[1], "read") == 0) { if (strcmp(argv[1], "read") == 0) {
printf(fmt, dev_addr, argv[1], addr, off, cnt); return eeprom_execute_command(EEPROM_READ, bus_addr, dev_addr,
LAYOUT_VERSION_UNRECOGNIZED,
rcode = eeprom_read(dev_addr, off, (uchar *)addr, cnt); NULL, NULL, addr, off, cnt);
puts("done\n");
return rcode;
} else if (strcmp(argv[1], "write") == 0) { } else if (strcmp(argv[1], "write") == 0) {
printf(fmt, dev_addr, argv[1], addr, off, cnt); return eeprom_execute_command(EEPROM_WRITE, bus_addr, dev_addr,
LAYOUT_VERSION_UNRECOGNIZED,
rcode = eeprom_write(dev_addr, off, (uchar *)addr, cnt); NULL, NULL, addr, off, cnt);
puts("done\n");
return rcode;
} }
return CMD_RET_USAGE; return CMD_RET_USAGE;