From f26d7ea2e90f8b505d1aca2c8ef1041a2b2f9d83 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Tue, 23 Aug 2022 11:23:12 +0100 Subject: ec/starlabs/merlin/cml: Correct the offset for Max Charge The offset for Max Charge is located at 0x1a, so correct this in the definitions and EC memory ACPI. Change-Id: I92cc452d1189e62db78aed787f2de65fd5096564 Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/66962 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/ec/starlabs/merlin/variants/cml/ecdefs.h | 2 +- src/ec/starlabs/merlin/variants/cml/emem.asl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ec/starlabs/merlin/variants/cml/ecdefs.h b/src/ec/starlabs/merlin/variants/cml/ecdefs.h index 42b4d44d52..78c032997a 100644 --- a/src/ec/starlabs/merlin/variants/cml/ecdefs.h +++ b/src/ec/starlabs/merlin/variants/cml/ecdefs.h @@ -14,7 +14,7 @@ #define ECRAM_KBL_TIMEOUT 0x07 #define ECRAM_FN_CTRL_REVERSE 0x08 #define ECRAM_FAN_MODE 0x09 -#define ECRAM_MAX_CHARGE 0x10 +#define ECRAM_MAX_CHARGE 0x1a #define ECRAM_TRACKPAD_STATE 0x14 #define ECRAM_KBL_STATE 0x18 #define ECRAM_KBL_BRIGHTNESS 0x19 diff --git a/src/ec/starlabs/merlin/variants/cml/emem.asl b/src/ec/starlabs/merlin/variants/cml/emem.asl index b6a3c7b975..995949a099 100644 --- a/src/ec/starlabs/merlin/variants/cml/emem.asl +++ b/src/ec/starlabs/merlin/variants/cml/emem.asl @@ -22,7 +22,7 @@ Field (ECF2, ByteAcc, Lock, Preserve) P1SV, 8, // PD Port 1 Minor Version Offset(0x10), - BFCP, 8, // Battery Full Charge Percentage + PWCT, 8, // Power Control CDEV, 8, // Control Device OSFG, 8, // OS Flag @@ -35,7 +35,7 @@ Field (ECF2, ByteAcc, Lock, Preserve) KLBE, 8, // Keyboard Backlight Brightness Offset(0x1a), - CWFU, 8, // CW2015 Full + BFCP, 8, // Battery Full Charge Percentage Offset(0x1c), WIFI, 8, // WiFi Enable -- cgit v1.2.3