diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-26 13:49:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-26 13:49:58 -0400 |
| commit | 1c64692df20c1f491ea79de3a732428611bb0ba0 (patch) | |
| tree | 4942ec36730d3ef59c3dbca39adb1228c9b98602 /board | |
| parent | 7d994067424776b6184872b82fcaf4c0b95528f9 (diff) | |
| parent | bf068c7643f23c3f0936e3d1d292cc537acaf3bb (diff) | |
| download | u-boot-1c64692df20c1f491ea79de3a732428611bb0ba0.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'board')
| -rw-r--r-- | board/ebv/socrates/qts/iocsr_config.h | 2 | ||||
| -rw-r--r-- | board/samtec/vining_fpga/socfpga.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/board/ebv/socrates/qts/iocsr_config.h b/board/ebv/socrates/qts/iocsr_config.h index 011fa2bac3..18b9c6ce4d 100644 --- a/board/ebv/socrates/qts/iocsr_config.h +++ b/board/ebv/socrates/qts/iocsr_config.h @@ -108,7 +108,7 @@ const unsigned long iocsr_scan_chain2_table[] = { 0x00018004, 0x06001209, 0x00004000, - 0x20002412, + 0x20042412, 0x00904800, 0x00000030, 0x80000000, diff --git a/board/samtec/vining_fpga/socfpga.c b/board/samtec/vining_fpga/socfpga.c index d99aac6828..efc8ddf162 100644 --- a/board/samtec/vining_fpga/socfpga.c +++ b/board/samtec/vining_fpga/socfpga.c @@ -52,14 +52,7 @@ int misc_init_r(void) u32 serial; int ret; - /* EEPROM is at bus 0. */ - ret = i2c_set_bus_num(0); - if (ret) { - puts("Cannot select EEPROM I2C bus.\n"); - return 0; - } - - /* EEPROM is at address 0x50. */ + /* EEPROM is at address 0x50 (at bus CONFIG_SYS_EEPROM_BUS_NUM). */ ret = eeprom_read(0x50, 0, data, sizeof(data)); if (ret) { puts("Cannot read I2C EEPROM.\n"); |