leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
This commit is contained in:
Nikita Kiryanov 2015-09-06 11:48:35 +03:00 committed by Stefano Babic
parent d9cbb264e8
commit 72898ac7b8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/compulab/cm_fx6/cm_fx6.c
View File

@ -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 = {

2
board/compulab/cm_t35/cm_t35.c
View File

@ -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)

4
board/compulab/common/eeprom.c
View File

@ -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)

4
board/compulab/common/eeprom.h
View File

@ -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;
}