FM10K/IES
FM10K/IES
1
0
Fork 0
Code Issues Pull requests Releases Activity

Implement Silicom card features #1

Merged
DataHoarder merged 12 commits from implement-silicom-card into master 2021-10-28 05:16:53 +00:00
Conversation 0 Commits 12 Files changed 14 +4 -2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 811f413afe - Show all commits

2
src/platforms/libertyTrail/platform.c
View file

@ -2324,7 +2324,9 @@ fm_status fmPlatformSwitchInserted(fm_int sw)
libFunc = FM_PLAT_GET_LIB_FUNCS_PTR(sw); libFunc = FM_PLAT_GET_LIB_FUNCS_PTR(sw);
if ( libFunc->InitSwitch ) if ( libFunc->InitSwitch )
{ {
TAKE_PLAT_I2C_BUS_LOCK(sw);
status = libFunc->InitSwitch(swCfg->swNum); status = libFunc->InitSwitch(swCfg->swNum);
DROP_PLAT_I2C_BUS_LOCK(sw);
FM_LOG_EXIT_ON_ERR(FM_LOG_CAT_PLATFORM, status); FM_LOG_EXIT_ON_ERR(FM_LOG_CAT_PLATFORM, status);
} }

4
src/platforms/libertyTrail/shared-libs/standard/fm_platform_standard_lib.c
View file

@ -1320,7 +1320,7 @@ static fm_status SwitchI2cWriteRead(fm_uintptr handle,
i2c = &hwCfg.i2c[sw]; i2c = &hwCfg.i2c[sw];
/* Read chip version: FM10000_CHIP_VERSION => register: 0x452 */ /* Read chip version: FM10000_CHIP_VERSION => register: 0x452 */
status = fmReadUINT32(sw, 0x452, &rv); status = fmReadUINT32(sw, FM10000_CHIP_VERSION(), &rv);
if (status == FM_OK) if (status == FM_OK)
{ {
i2c->chipVersion = rv & 0x7F; i2c->chipVersion = rv & 0x7F;
@ -1361,7 +1361,7 @@ static fm_status SwitchI2cWriteRead(fm_uintptr handle,
} }
} }
else else if (device != 0x8) // specifically VRM_IR device from Silicom patch
{ {
FM_LOG_ERROR(FM_LOG_CAT_PLATFORM, FM_LOG_ERROR(FM_LOG_CAT_PLATFORM,
"I2C error accessing device 0x%x via switch %d: %s\n", "I2C error accessing device 0x%x via switch %d: %s\n",