From c4a6eb09f98d59bed375e653de4d91a85ebe8098 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Tue, 26 Mar 2024 09:09:22 +0000 Subject: ec/starlabs/merlin: Move the chip id check As the merlin EC supports both the IT8987 and IT5570, move the check into the code so the same variant directory can be used for both chips. Change-Id: I8c43a367e42f7e56ddd26b1c8fe7bf4b275d4ac3 Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/83632 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/ec/starlabs/merlin/ite.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/ec/starlabs/merlin/ite.c') diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c index 031447a716..2f8bced324 100644 --- a/src/ec/starlabs/merlin/ite.c +++ b/src/ec/starlabs/merlin/ite.c @@ -9,6 +9,9 @@ #include "ec.h" #include "ecdefs.h" +#define ITE_IT5570 0x5570 +#define ITE_IT8987 0x8987 + uint16_t ec_get_version(void) { return (ec_read(ECRAM_MAJOR_VERSION) << 8) | ec_read(ECRAM_MINOR_VERSION); @@ -50,9 +53,8 @@ static void merlin_init(struct device *dev) 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", - ITE_CHIPID_VAL, chip_id); + if (chip_id != ITE_IT5570 && chip_id != ITE_IT8987) { + printk(BIOS_ERR, "ITE: Unsupported chip ID 0x%04x.\n", chip_id); return; } -- cgit v1.2.3