summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-01-05 20:00:18 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2020-01-09 18:47:28 +0000
commitbd65985a637ef75cf68c53b6c32e676b43b2aa2c (patch)
tree09b9112079889a9eed68dac5ac097d58707308ed
parent65f5de2bc44baaa88c7ce1c7525f0a0b9f6bc6e8 (diff)
downloadcoreboot-bd65985a637ef75cf68c53b6c32e676b43b2aa2c.tar.xz
nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte()
Change-Id: Ic9554ad2813ee70d0da16857d534aab5e17d808f Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38213 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/northbridge/intel/i945/raminit.c9
-rw-r--r--src/northbridge/intel/pineview/raminit.c5
-rw-r--r--src/northbridge/intel/x4x/raminit.c9
3 files changed, 4 insertions, 19 deletions
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index 709677469f..f0ea142c5d 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -62,11 +62,6 @@ static int get_dimm_spd_address(struct sys_info *sysinfo, int device)
}
-static inline int spd_read_byte(unsigned int device, unsigned int address)
-{
- return smbus_read_byte(device, address);
-}
-
static __attribute__((noinline)) void do_ram_command(u32 command)
{
u32 reg32;
@@ -365,7 +360,7 @@ static void gather_common_timing(struct sys_info *sysinfo,
if (!sdram_capabilities_dual_channel() && (i >> 1))
continue;
- if (spd_read_byte(device, SPD_MEMORY_TYPE) !=
+ if (smbus_read_byte(device, SPD_MEMORY_TYPE) !=
SPD_MEMORY_TYPE_SDRAM_DDR2) {
printk(BIOS_DEBUG, "DDR II Channel %d Socket %d: N/A\n",
(i >> 1), (i & 1));
@@ -386,7 +381,7 @@ static void gather_common_timing(struct sys_info *sysinfo,
printk(BIOS_DEBUG, "i2c block operation failed,"
" trying smbus byte operation.\n");
for (j = 0; j < 64; j++)
- raw_spd[j] = spd_read_byte(device, j);
+ raw_spd[j] = smbus_read_byte(device, j);
if (CONFIG(DEBUG_RAM_SETUP))
hexdump(raw_spd, 64);
}
diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c
index 720bd6436e..a9e2c3e17e 100644
--- a/src/northbridge/intel/pineview/raminit.c
+++ b/src/northbridge/intel/pineview/raminit.c
@@ -103,11 +103,6 @@ static inline void barrier(void)
__asm__ __volatile__("": : :"memory");
}
-static inline int spd_read_byte(unsigned int device, unsigned int address)
-{
- return smbus_read_byte(device, address);
-}
-
static int decode_spd(struct dimminfo *d, int i)
{
d->type = 0;
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index 8013af9d51..df2d31ede9 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -39,11 +39,6 @@
#define MRC_CACHE_VERSION 0
-static inline int spd_read_byte(unsigned int device, unsigned int address)
-{
- return smbus_read_byte(device, address);
-}
-
static u16 ddr2_get_crc(u8 device, u8 len)
{
u8 raw_spd[128] = {};
@@ -514,7 +509,7 @@ static void decode_spd_select_timings(struct sysinfo *s)
s->dimms[i].card_type = RAW_CARD_UNPOPULATED;
continue;
}
- switch (spd_read_byte(s->spd_map[i], SPD_MEMORY_TYPE)) {
+ switch (smbus_read_byte(s->spd_map[i], SPD_MEMORY_TYPE)) {
case DDR2SPD:
dram_type_mask &= 1 << DDR2;
s->spd_type = DDR2;
@@ -535,7 +530,7 @@ static void decode_spd_select_timings(struct sysinfo *s)
printk(BIOS_DEBUG, "i2c block operation failed,"
" trying smbus byte operation.\n");
for (j = 0; j < 128; j++)
- raw_spd[j] = spd_read_byte(device, j);
+ raw_spd[j] = smbus_read_byte(device, j);
}
if (s->spd_type == DDR2){