commit 6082ee5281bdf0c3f3d6981873efcd93a94b9330
author Sean Rhodes <sean@starlabs.systems> Wed Mar 09 08:07:30 2022 +0000
committer Felix Held <felix-coreboot@felixheld.de> Wed Mar 30 13:49:22 2022 +0000
tree 18c23f417cce7c809f808c2d96ee0fc9518ce19f
parent 36e2b4b2b40c935a5cf8662014d1ad44c3587ace

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>

src/ec/starlabs/merlin/ite.c

diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c
index e8eaa22..357c67c 100644
--- a/src/ec/starlabs/merlin/ite.c
+++ b/src/ec/starlabs/merlin/ite.c
@@ -10,7 +10,7 @@
 #include "ec.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);
 }
@@ -26,7 +26,7 @@
 	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) |
 		pnp_read_index(port, ITE_CHIPID2);
@@ -49,7 +49,7 @@
 		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) {
 		printk(BIOS_ERR, "ITE: Expected chip ID 0x%04x, but got 0x%04x instead.\n",