From c2c9618607cf0ac2e6a0ec19f5f510c7a36aa1b3 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Sun, 2 Jan 2022 12:16:27 +0000 Subject: ec/starlabs/merlin: Unify EC and CMOS names End all CMOS variable with a C and EC variables with an E. Signed-off-by: Sean Rhodes Change-Id: Ie0fab6b9dcd805f7b8c9bf8f14b0a799d8f396c8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60709 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh --- src/ec/starlabs/merlin/variants/glk/emem.asl | 4 ++-- src/ec/starlabs/merlin/variants/glk/events.asl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ec/starlabs/merlin/variants/glk') diff --git a/src/ec/starlabs/merlin/variants/glk/emem.asl b/src/ec/starlabs/merlin/variants/glk/emem.asl index 8341bf2bf2..d30b58c5bf 100644 --- a/src/ec/starlabs/merlin/variants/glk/emem.asl +++ b/src/ec/starlabs/merlin/variants/glk/emem.asl @@ -16,7 +16,7 @@ Field (ECF2, ByteAcc, Lock, Preserve) CDEV, 8, // Control Device OSFG, 8, // OS Flag CWFU, 8, // CW2015 Full - TPLA, 8, // Trackpad State + TPLE, 8, // Trackpad State AFG3, 8, // After G3 CLTP, 8, // Close Trackpad WKOL, 8, // Wake on Lid @@ -39,7 +39,7 @@ Field (ECF2, ByteAcc, Lock, Preserve) ECT9, 8, // EC Build Time 9 Offset(0x2c), - FLKA, 8, // Function Lock State + FLKE, 8, // Function Lock State Offset(0x30), STEF, 8, // Sensor T Error F diff --git a/src/ec/starlabs/merlin/variants/glk/events.asl b/src/ec/starlabs/merlin/variants/glk/events.asl index d9e49130c6..e2c301bb43 100644 --- a/src/ec/starlabs/merlin/variants/glk/events.asl +++ b/src/ec/starlabs/merlin/variants/glk/events.asl @@ -36,7 +36,7 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up Method (_Q08, 0, NotSerialized) // Event: Function Lock { - FLKS = FLKA + FLKC = FLKE } // // TODO: @@ -44,7 +44,7 @@ Method (_Q08, 0, NotSerialized) // Event: Function Lock // // Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock // { -// TPLS = TPLA +// TPLC = TPLE // } // // Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness -- cgit v1.2.3