From bdcd65bd7fc78e0a5b1d9c77ec54731f0fba695d Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Wed, 5 Nov 2025 20:11:11 +0000 Subject: [PATCH] ec/starlabs/merlin: Add battery capacity offsets Add the battery design capacity and voltage offsets to the EC definitons; these will be used by coreboot to calculate the wattage which it'll use to set PL4. Change-Id: Id0600ddd8ffaecab6004549ab51b7c06305d3c09 Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/89925 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/ec/starlabs/merlin/variants/glk/ecdefs.h | 28 ++++++++++--------- src/ec/starlabs/merlin/variants/glkr/ecdefs.h | 28 ++++++++++--------- src/ec/starlabs/merlin/variants/kbl/ecdefs.h | 28 ++++++++++--------- .../starlabs/merlin/variants/merlin/ecdefs.h | 28 ++++++++++--------- 4 files changed, 60 insertions(+), 52 deletions(-) diff --git a/src/ec/starlabs/merlin/variants/glk/ecdefs.h b/src/ec/starlabs/merlin/variants/glk/ecdefs.h index ecdff4a5aa..ed518f400a 100644 --- a/src/ec/starlabs/merlin/variants/glk/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glk/ecdefs.h @@ -11,18 +11,20 @@ #define _EC_STARLABS_GLK_EC_DEFS_H /* EC RAM offsets. */ -#define ECRAM_MAJOR_VERSION 0x00 -#define ECRAM_MINOR_VERSION 0x01 -#define ECRAM_TRACKPAD_STATE 0x14 -#define ECRAM_KBL_STATE 0x19 -#define ECRAM_KBL_BRIGHTNESS 0x18 -#define ECRAM_KBL_TIMEOUT 0x1a -#define ECRAM_FN_LOCK_STATE 0x2c -#define ECRAM_FN_CTRL_REVERSE 0x2d -#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) -#define ECRAM_FAN_MODE dead_code_t(uint8_t) -#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t) -#define ECRAM_LID_SWITCH dead_code_t(uint8_t) -#define ECRAM_POWER_LED 0x1f +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 +#define ECRAM_TRACKPAD_STATE 0x14 +#define ECRAM_KBL_STATE 0x19 +#define ECRAM_KBL_BRIGHTNESS 0x18 +#define ECRAM_KBL_TIMEOUT 0x1a +#define ECRAM_FN_LOCK_STATE 0x2c +#define ECRAM_FN_CTRL_REVERSE 0x2d +#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) +#define ECRAM_FAN_MODE dead_code_t(uint8_t) +#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t) +#define ECRAM_LID_SWITCH dead_code_t(uint8_t) +#define ECRAM_POWER_LED 0x1f +#define ECRAM_BATTERY_DESIGN_CAPACITY 0x84 +#define ECRAM_BATTERY_DESIGN_VOLTAGE 0x86 #endif diff --git a/src/ec/starlabs/merlin/variants/glkr/ecdefs.h b/src/ec/starlabs/merlin/variants/glkr/ecdefs.h index e6dbc2f25e..6d469b2785 100644 --- a/src/ec/starlabs/merlin/variants/glkr/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/glkr/ecdefs.h @@ -14,18 +14,20 @@ #define NUVOTON_CHIPID_VAL 0x0004 /* EC RAM offsets. */ -#define ECRAM_MAJOR_VERSION 0x00 -#define ECRAM_MINOR_VERSION 0x01 -#define ECRAM_TRACKPAD_STATE 0x14 -#define ECRAM_KBL_STATE 0x16 -#define ECRAM_KBL_BRIGHTNESS 0x17 -#define ECRAM_KBL_TIMEOUT 0x12 -#define ECRAM_FN_LOCK_STATE 0x15 -#define ECRAM_FN_CTRL_REVERSE 0x13 -#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) -#define ECRAM_FAN_MODE dead_code_t(uint8_t) -#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t) -#define ECRAM_LID_SWITCH dead_code_t(uint8_t) -#define ECRAM_POWER_LED 0x1f +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 +#define ECRAM_TRACKPAD_STATE 0x14 +#define ECRAM_KBL_STATE 0x16 +#define ECRAM_KBL_BRIGHTNESS 0x17 +#define ECRAM_KBL_TIMEOUT 0x12 +#define ECRAM_FN_LOCK_STATE 0x15 +#define ECRAM_FN_CTRL_REVERSE 0x13 +#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) +#define ECRAM_FAN_MODE dead_code_t(uint8_t) +#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t) +#define ECRAM_LID_SWITCH dead_code_t(uint8_t) +#define ECRAM_POWER_LED 0x1f +#define ECRAM_BATTERY_DESIGN_CAPACITY 0x84 +#define ECRAM_BATTERY_DESIGN_VOLTAGE 0x86 #endif diff --git a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h index d5dd307eb3..b0f743f711 100644 --- a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h @@ -11,18 +11,20 @@ #define _EC_STARLABS_KBL_EC_DEFS_H /* EC RAM offsets */ -#define ECRAM_MAJOR_VERSION 0x00 -#define ECRAM_MINOR_VERSION 0x01 -#define ECRAM_TRACKPAD_STATE 0x14 -#define ECRAM_KBL_STATE 0x18 -#define ECRAM_KBL_BRIGHTNESS 0x19 -#define ECRAM_KBL_TIMEOUT 0x1a -#define ECRAM_FN_LOCK_STATE 0x2c -#define ECRAM_FAN_MODE 0x42 -#define ECRAM_FN_CTRL_REVERSE 0x43 -#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) -#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t) -#define ECRAM_LID_SWITCH dead_code_t(uint8_t) -#define ECRAM_POWER_LED 0x1f +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 +#define ECRAM_TRACKPAD_STATE 0x14 +#define ECRAM_KBL_STATE 0x18 +#define ECRAM_KBL_BRIGHTNESS 0x19 +#define ECRAM_KBL_TIMEOUT 0x1a +#define ECRAM_FN_LOCK_STATE 0x2c +#define ECRAM_FAN_MODE 0x42 +#define ECRAM_FN_CTRL_REVERSE 0x43 +#define ECRAM_MAX_CHARGE dead_code_t(uint8_t) +#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t) +#define ECRAM_LID_SWITCH dead_code_t(uint8_t) +#define ECRAM_POWER_LED 0x1f +#define ECRAM_BATTERY_DESIGN_CAPACITY 0x84 +#define ECRAM_BATTERY_DESIGN_VOLTAGE 0x86 #endif diff --git a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h index 75c2c62ce3..4fab635f3d 100644 --- a/src/ec/starlabs/merlin/variants/merlin/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/merlin/ecdefs.h @@ -11,18 +11,20 @@ #define _EC_STARLABS_MERLIN_EC_DEFS_H /* EC RAM offsets */ -#define ECRAM_MAJOR_VERSION 0x00 -#define ECRAM_MINOR_VERSION 0x01 -#define ECRAM_KBL_BRIGHTNESS 0x09 -#define ECRAM_KBL_TIMEOUT 0x10 -#define ECRAM_KBL_STATE 0x0a -#define ECRAM_TRACKPAD_STATE 0x0c -#define ECRAM_FN_LOCK_STATE 0x0f -#define ECRAM_FN_CTRL_REVERSE 0x17 -#define ECRAM_MAX_CHARGE 0x1a -#define ECRAM_FAN_MODE 0x1b -#define ECRAM_CHARGING_SPEED 0x1d -#define ECRAM_LID_SWITCH 0x1e -#define ECRAM_POWER_LED 0x1f +#define ECRAM_MAJOR_VERSION 0x00 +#define ECRAM_MINOR_VERSION 0x01 +#define ECRAM_KBL_BRIGHTNESS 0x09 +#define ECRAM_KBL_TIMEOUT 0x10 +#define ECRAM_KBL_STATE 0x0a +#define ECRAM_TRACKPAD_STATE 0x0c +#define ECRAM_FN_LOCK_STATE 0x0f +#define ECRAM_FN_CTRL_REVERSE 0x17 +#define ECRAM_MAX_CHARGE 0x1a +#define ECRAM_FAN_MODE 0x1b +#define ECRAM_CHARGING_SPEED 0x1d +#define ECRAM_LID_SWITCH 0x1e +#define ECRAM_POWER_LED 0x1f +#define ECRAM_BATTERY_DESIGN_CAPACITY 0x84 +#define ECRAM_BATTERY_DESIGN_VOLTAGE 0x86 #endif