Skip to content
Snippets Groups Projects
Commit 72898ac7 authored by Nikita Kiryanov's avatar Nikita Kiryanov Committed by Stefano Babic
Browse files

compulab: eeprom: select i2c bus when querying for board rev


Add support for selecting which eeprom is queried for board revision by
extending cl_eeprom_get_board_rev() to accept an i2c bus number.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarNikita Kiryanov <nikita@compulab.co.il>
parent d9cbb264
No related branches found
No related tags found
No related merge requests found
......@@ -689,7 +689,7 @@ int dram_init(void)
u32 get_board_rev(void)
{
return cl_eeprom_get_board_rev();
return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS);
}
static struct mxc_serial_platdata cm_fx6_mxc_serial_plat = {
......
......@@ -104,7 +104,7 @@ int board_init(void)
*/
u32 get_board_rev(void)
{
return cl_eeprom_get_board_rev();
return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS);
};
int misc_init_r(void)
......
......@@ -121,7 +121,7 @@ static u32 board_rev;
* Routine: cl_eeprom_get_board_rev
* Description: read system revision from eeprom
*/
u32 cl_eeprom_get_board_rev(void)
u32 cl_eeprom_get_board_rev(uint eeprom_bus)
{
char str[5]; /* Legacy representation can contain at most 4 digits */
uint offset = BOARD_REV_OFFSET_LEGACY;
......@@ -129,7 +129,7 @@ u32 cl_eeprom_get_board_rev(void)
if (board_rev)
return board_rev;
if (cl_eeprom_setup(CONFIG_SYS_I2C_EEPROM_BUS))
if (cl_eeprom_setup(eeprom_bus))
return 0;
if (cl_eeprom_layout != LAYOUT_LEGACY)
......
......@@ -12,13 +12,13 @@
#ifdef CONFIG_SYS_I2C
int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus);
u32 cl_eeprom_get_board_rev(void);
u32 cl_eeprom_get_board_rev(uint eeprom_bus);
#else
static inline int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus)
{
return 1;
}
static inline u32 cl_eeprom_get_board_rev(void)
static inline u32 cl_eeprom_get_board_rev(uint eeprom_bus)
{
return 0;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment