[U-Boot] [PATCH 23/25] eeprom: Add bus argument to eeprom_init()
Marek Vasut
marex at denx.de
Mon Oct 20 03:48:24 CEST 2014
Add bus argument to eeprom_init(), so that it can select
the I2C bus number on which the eeprom resides. Any negative
value of the $bus argument will preserve the old behavior.
This is in place so that old code does not randomly break.
Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Simon Glass <sjg at chromium.org>
Cc: Tom Rini <trini at ti.com>
Cc: Heiko Schocher <hs at denx.de>
---
common/cmd_eeprom.c | 7 ++++---
common/env_eeprom.c | 4 ++--
include/common.h | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 5bc836f..0133b50 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -60,7 +60,7 @@ __weak int eeprom_write_enable(unsigned dev_addr, int state)
return 0;
}
-void eeprom_init(void)
+void eeprom_init(int bus)
{
/* SPI EEPROM */
#if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
@@ -72,7 +72,8 @@ void eeprom_init(void)
#else
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
-
+ if (bus >= 0)
+ i2c_set_bus_num(bus);
#endif
}
@@ -221,7 +222,7 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
off = simple_strtoul(*args++, NULL, 16);
cnt = simple_strtoul(*args++, NULL, 16);
- eeprom_init();
+ eeprom_init(-1);
if (strcmp (argv[1], "read") == 0) {
printf(fmt, dev_addr, argv[1], addr, off, cnt);
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 905d39a..d82e8da 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -153,7 +153,7 @@ int env_init(void)
uchar buf[64], flags[2];
int i, crc_ok[2] = {0, 0};
- eeprom_init(); /* prepare for EEPROM read/write */
+ eeprom_init(-1); /* prepare for EEPROM read/write */
off_env[0] = CONFIG_ENV_OFFSET;
off_env[1] = CONFIG_ENV_OFFSET_REDUND;
@@ -227,7 +227,7 @@ int env_init(void)
unsigned off;
uchar buf[64];
- eeprom_init(); /* prepare for EEPROM read/write */
+ eeprom_init(-1); /* prepare for EEPROM read/write */
/* read old CRC */
eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR,
diff --git a/include/common.h b/include/common.h
index 68596fc..ab70526 100644
--- a/include/common.h
+++ b/include/common.h
@@ -455,7 +455,7 @@ void reset_phy (void);
void fdc_hw_init (void);
/* $(BOARD)/eeprom.c */
-void eeprom_init (void);
+void eeprom_init (int bus);
int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt);
int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt);
#ifdef CONFIG_LWMON
--
2.1.1
More information about the U-Boot
mailing list