GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/starlabs/merlin: Make EC function names generic 

Rather than using `ite_`, use `ec_` so the same functions
can be called for different ECs.

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: Ie61af233f731eb47772af1c82c6abdc515bc89cc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62700
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Sean Rhodes 2022-03-09 08:07:30 +00:00 committed by Felix Held
parent 36e2b4b2b4
commit 6082ee5281
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ec/starlabs/merlin/ec.h
View File

@ -81,6 +81,6 @@
#define KBL_DISABLED 0x00 #define KBL_DISABLED 0x00
#define KBL_ENABLED 0xdd #define KBL_ENABLED 0xdd
uint16_t it_get_version(void); uint16_t ec_get_version(void);
#endif #endif

6
src/ec/starlabs/merlin/ite.c
View File

@ -10,7 +10,7 @@
#include "ec.h" #include "ec.h"
#include "ecdefs.h" #include "ecdefs.h"
uint16_t it_get_version(void) uint16_t ec_get_version(void)
{ {
return (ec_read(ECRAM_MAJOR_VERSION) << 8) | ec_read(ECRAM_MINOR_VERSION); return (ec_read(ECRAM_MAJOR_VERSION) << 8) | ec_read(ECRAM_MINOR_VERSION);
} }
@ -26,7 +26,7 @@ static uint8_t get_ec_value_from_option(const char *name,
return lut[index]; return lut[index];
} }
static uint16_t ite_get_chip_id(unsigned int port) static uint16_t ec_get_chip_id(unsigned int port)
{ {
return (pnp_read_index(port, ITE_CHIPID1) << 8) | return (pnp_read_index(port, ITE_CHIPID1) << 8) |
pnp_read_index(port, ITE_CHIPID2); pnp_read_index(port, ITE_CHIPID2);
@ -49,7 +49,7 @@ static void merlin_init(struct device *dev)
return; return;
} }
const uint16_t chip_id = ite_get_chip_id(dev->path.pnp.port); const uint16_t chip_id = ec_get_chip_id(dev->path.pnp.port);
if (chip_id != ITE_CHIPID_VAL) { if (chip_id != ITE_CHIPID_VAL) {
printk(BIOS_ERR, "ITE: Expected chip ID 0x%04x, but got 0x%04x instead.\n", printk(BIOS_ERR, "ITE: Expected chip ID 0x%04x, but got 0x%04x instead.\n",

2
src/mainboard/starlabs/labtop/smbios.c
View File

@ -17,7 +17,7 @@ const char *smbios_mainboard_bios_version(void)
/* Get the Embedded Controller firmware version */ /* Get the Embedded Controller firmware version */
void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision)
{ {
u16 ec_version = it_get_version(); u16 ec_version = ec_get_version();
*ec_major_revision = ec_version >> 8; *ec_major_revision = ec_version >> 8;
*ec_minor_revision = ec_version & 0xff; *ec_minor_revision = ec_version & 0xff;

2
src/mainboard/starlabs/lite/smbios.c
View File

@ -17,7 +17,7 @@ const char *smbios_mainboard_bios_version(void)
/* Get the Embedded Controller firmware version */ /* Get the Embedded Controller firmware version */
void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision)
{ {
u16 ec_version = it_get_version(); u16 ec_version = ec_get_version();
*ec_major_revision = ec_version >> 8; *ec_major_revision = ec_version >> 8;
*ec_minor_revision = ec_version & 0xff; *ec_minor_revision = ec_version & 0xff;