diff options
| author | Sean Rhodes <sean@starlabs.systems> | 2024-03-26 09:09:22 +0000 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2024-09-10 13:41:16 +0000 |
| commit | c4a6eb09f98d59bed375e653de4d91a85ebe8098 (patch) | |
| tree | fc28337ad45d1b89fb1aa9c24dfcae2d461d1760 /src | |
| parent | d380ca64d04c39055988c0dac2ea00e2b67a794a (diff) | |
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 <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83632
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ec/starlabs/merlin/ite.c | 8 | ||||
| -rw-r--r-- | src/ec/starlabs/merlin/variants/apl/ecdefs.h | 3 | ||||
| -rw-r--r-- | src/ec/starlabs/merlin/variants/glk/ecdefs.h | 3 | ||||
| -rw-r--r-- | src/ec/starlabs/merlin/variants/kbl/ecdefs.h | 3 | ||||
| -rw-r--r-- | src/ec/starlabs/merlin/variants/merlin/ecdefs.h | 3 |
5 files changed, 5 insertions, 15 deletions
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; } diff --git a/src/ec/starlabs/merlin/variants/apl/ecdefs.h b/src/ec/starlabs/merlin/variants/apl/ecdefs.h index 5cbe14e36d..e4857aa027 100644 --- a/src/ec/starlabs/merlin/variants/apl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/apl/ecdefs.h @@ -10,9 +10,6 @@ #ifndef _EC_STARLABS_APL_EC_DEFS_H #define _EC_STARLABS_APL_EC_DEFS_H -/* IT8987 chip ID byte values. */ -#define ITE_CHIPID_VAL 0x8987 - /* EC RAM offsets. */ #define ECRAM_TRACKPAD_STATE 0x14 #define ECRAM_KBL_STATE 0x18 diff --git a/src/ec/starlabs/merlin/variants/glk/ecdefs.h b/src/ec/starlabs/merlin/variants/glk/ecdefs.h index b2e2f2f8ab..c97e252bf4 100644 --- a/src/ec/starlabs/merlin/variants/glk/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glk/ecdefs.h @@ -10,9 +10,6 @@ #ifndef _EC_STARLABS_GLK_EC_DEFS_H #define _EC_STARLABS_GLK_EC_DEFS_H -/* IT8987 chip ID byte values. */ -#define ITE_CHIPID_VAL 0x8987 - /* EC RAM offsets. */ #define ECRAM_TRACKPAD_STATE 0x14 #define ECRAM_KBL_STATE 0x19 diff --git a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h index 8f3355dd0a..deda3ae362 100644 --- a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h @@ -10,9 +10,6 @@ #ifndef _EC_STARLABS_KBL_EC_DEFS_H #define _EC_STARLABS_KBL_EC_DEFS_H -/* IT8987 chip ID byte values */ -#define ITE_CHIPID_VAL 0x8987 - /* EC RAM offsets */ #define ECRAM_TRACKPAD_STATE 0x14 #define ECRAM_KBL_STATE 0x18 diff --git a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h index 832f9c7836..d5caf8a9ae 100644 --- a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h @@ -10,9 +10,6 @@ #ifndef _EC_STARLABS_MERLIN_EC_DEFS_H #define _EC_STARLABS_MERLIN_EC_DEFS_H -/* IT5570 chip ID byte values */ -#define ITE_CHIPID_VAL 0x5570 - /* EC RAM offsets */ #define ECRAM_KBL_BRIGHTNESS 0x09 #define ECRAM_KBL_TIMEOUT 0x10 |