summaryrefslogtreecommitdiff
path: root/src/northbridge/intel
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-01-30 09:39:23 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-02-01 21:26:35 +0000
commitc01a505282526a7038463e937cbec83f704a6a89 (patch)
tree592075489e013af85b239b65e6b99cdb8dfbe328 /src/northbridge/intel
parent757571eec16295d66a8c06033a61b73bad9c06fa (diff)
downloadcoreboot-c01a505282526a7038463e937cbec83f704a6a89.tar.xz
sb/intel/common: Rename i2c_block_read() to i2c_eeprom_read()
Datasheets describe the used command as 'I2C Read' but adding the word 'eeprom' in between should avoid further confusion with other block commands. Followups will add a symmetrical pair of commands i2c_block_read() and i2c_block_write() that operate via I2C_EN bit and have a 32 byte size restriction on block transfers. For some hardware revision these block commands are available, while 'I2C Read' was not. Change-Id: I4494ab2985afc7f737ddacc8d706a5d5395e35cf Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/31151 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/northbridge/intel')
-rw-r--r--src/northbridge/intel/i945/raminit.c2
-rw-r--r--src/northbridge/intel/pineview/raminit.c2
-rw-r--r--src/northbridge/intel/x4x/raminit.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index f3c3df68ac..dece9bffae 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -381,7 +381,7 @@ static void gather_common_timing(struct sys_info *sysinfo,
* only the first 64 bytes contain data needed for raminit.
*/
- bytes_read = i2c_block_read(device, 0, 64, raw_spd);
+ bytes_read = i2c_eeprom_read(device, 0, 64, raw_spd);
printk(BIOS_DEBUG, "Reading SPD using i2c block operation.\n");
if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) && bytes_read > 0)
hexdump(raw_spd, bytes_read);
diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c
index ee19b61841..ed633fd745 100644
--- a/src/northbridge/intel/pineview/raminit.c
+++ b/src/northbridge/intel/pineview/raminit.c
@@ -273,7 +273,7 @@ static void sdram_read_spds(struct sysinfo *s)
u8 i, chan;
s->dt0mode = 0;
FOR_EACH_DIMM(i) {
- if (i2c_block_read(s->spd_map[i], 0, 64, s->dimms[i].spd_data) != 64)
+ if (i2c_eeprom_read(s->spd_map[i], 0, 64, s->dimms[i].spd_data) != 64)
s->dimms[i].card_type = 0;
s->dimms[i].card_type = s->dimms[i].spd_data[62] & 0x1f;
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index d9fa49d9da..1fd600484f 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -47,15 +47,15 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
static u16 ddr2_get_crc(u8 device, u8 len)
{
u8 raw_spd[128] = {};
- i2c_block_read(device, 64, 9, &raw_spd[64]);
- i2c_block_read(device, 93, 6, &raw_spd[93]);
+ i2c_eeprom_read(device, 64, 9, &raw_spd[64]);
+ i2c_eeprom_read(device, 93, 6, &raw_spd[93]);
return spd_ddr2_calc_unique_crc(raw_spd, len);
}
static u16 ddr3_get_crc(u8 device, u8 len)
{
u8 raw_spd[256] = {};
- i2c_block_read(device, 117, 11, &raw_spd[117]);
+ i2c_eeprom_read(device, 117, 11, &raw_spd[117]);
return spd_ddr3_calc_unique_crc(raw_spd, len);
}
@@ -531,7 +531,7 @@ static void decode_spd_select_timings(struct sysinfo *s)
die("Mixing up dimm types is not supported!\n");
printk(BIOS_DEBUG, "Decoding dimm %d\n", i);
- if (i2c_block_read(device, 0, 128, raw_spd) != 128) {
+ if (i2c_eeprom_read(device, 0, 128, raw_spd) != 128) {
printk(BIOS_DEBUG, "i2c block operation failed,"
" trying smbus byte operation.\n");
for (j = 0; j < 128; j++)