From 629f8c5da11c99673307020d49bf815fe66dc07b Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Thu, 10 Mar 2022 21:11:15 +0000 Subject: [PATCH] ec/starlabs/merlin: Don't store EC values on change Since CB:62741, the EC values are backed up to the CMOS when entering S3, S4 and S5. Consequently, they don't need to be stored when they're changed. Signed-off-by: Sean Rhodes Change-Id: If0ea392afae4a4d3c605cdea3c5896fbff606215 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62742 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- .../starlabs/merlin/variants/apl/events.asl | 16 +--------------- .../starlabs/merlin/variants/cml/events.asl | 13 +++++-------- .../starlabs/merlin/variants/glk/events.asl | 17 +---------------- .../starlabs/merlin/variants/kbl/events.asl | 19 ++----------------- .../merlin/variants/merlin/events.asl | 7 +++---- .../starlabs/merlin/variants/tgl/events.asl | 9 ++++----- 6 files changed, 16 insertions(+), 65 deletions(-) diff --git a/src/ec/starlabs/merlin/variants/apl/events.asl b/src/ec/starlabs/merlin/variants/apl/events.asl index e2c301bb43..57da4052ac 100644 --- a/src/ec/starlabs/merlin/variants/apl/events.asl +++ b/src/ec/starlabs/merlin/variants/apl/events.asl @@ -36,22 +36,8 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up Method (_Q08, 0, NotSerialized) // Event: Function Lock { - FLKC = FLKE + Printf ("EC: Function Lock") } -// -// TODO: -// Below Q Events need to be added -// -// Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock -// { -// TPLC = TPLE -// } -// -// Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness -// { -// KLBC = KLBE -// } -// Method (_Q99, 0, NotSerialized) // Event: Airplane Mode { diff --git a/src/ec/starlabs/merlin/variants/cml/events.asl b/src/ec/starlabs/merlin/variants/cml/events.asl index 2eedb8e6cc..00a2ca6c16 100644 --- a/src/ec/starlabs/merlin/variants/cml/events.asl +++ b/src/ec/starlabs/merlin/variants/cml/events.asl @@ -36,20 +36,17 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up Method (_Q08, 0, NotSerialized) // Event: Function Lock { - FLKC = FLKE + Printf ("EC: Function Lock") } Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock { - TPLC = TPLE + Printf ("EC: Trackpad Lock") } -// -// TODO: -// Below Q Events need to be added -// -Method (_Q11) // Event: Keyboard Backlight Brightness + +Method (_Q11, 0, NotSerialized) // Event: Keyboard Backlight Brightness { - KLBC = KLBE + Printf ("EC: Keyboard Brightness") } Method (_Q99, 0, NotSerialized) // Event: Airplane Mode diff --git a/src/ec/starlabs/merlin/variants/glk/events.asl b/src/ec/starlabs/merlin/variants/glk/events.asl index e2c301bb43..2929421170 100644 --- a/src/ec/starlabs/merlin/variants/glk/events.asl +++ b/src/ec/starlabs/merlin/variants/glk/events.asl @@ -36,23 +36,8 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up Method (_Q08, 0, NotSerialized) // Event: Function Lock { - FLKC = FLKE + Printf ("EC: Function Lock") } -// -// TODO: -// Below Q Events need to be added -// -// Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock -// { -// TPLC = TPLE -// } -// -// Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness -// { -// KLBC = KLBE -// } -// - Method (_Q99, 0, NotSerialized) // Event: Airplane Mode { ^^^^HIDD.HPEM (8) diff --git a/src/ec/starlabs/merlin/variants/kbl/events.asl b/src/ec/starlabs/merlin/variants/kbl/events.asl index 966365cbc6..df7399d548 100644 --- a/src/ec/starlabs/merlin/variants/kbl/events.asl +++ b/src/ec/starlabs/merlin/variants/kbl/events.asl @@ -34,25 +34,10 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up ^^^^HIDD.HPEM (19) } -Method (_Q08, 0, NotSerialized) // Event: Function Lock +Method (_Q08, 0, NotSerialized) // Event: Function Lock { - FLKC = FLKE + Printf ("EC: Function Lock") } -// -// TODO: -// Below Q Events need to be added -// -// Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock -// { -// TPLC = TPLE -// } -// -// Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness -// { -// KLBC = KLBE -// KLSC = KLSE -// } -// Method (_Q99, 0, NotSerialized) // Event: Airplane Mode { diff --git a/src/ec/starlabs/merlin/variants/merlin/events.asl b/src/ec/starlabs/merlin/variants/merlin/events.asl index a7328561e3..9835ef13ba 100644 --- a/src/ec/starlabs/merlin/variants/merlin/events.asl +++ b/src/ec/starlabs/merlin/variants/merlin/events.asl @@ -36,17 +36,16 @@ Method (_Q06) // Event: Backlight Brightness Up Method (_Q87) // Event: Function Lock { - FLKC = FLKE + Printf ("EC: Function Lock") } Method (_Q88) // Event: Trackpad Lock { - TPLC = TPLE + Printf ("EC: Trackpad Lock") } Method (_Q11) // Event: Keyboard Backlight Brightness { - KLBC = KLBE - KLSC = KLSE + Printf ("EC: Keyboard Brightness") } Method (_Q99) // Event: Airplane Mode diff --git a/src/ec/starlabs/merlin/variants/tgl/events.asl b/src/ec/starlabs/merlin/variants/tgl/events.asl index 6963500d18..90cde395a2 100644 --- a/src/ec/starlabs/merlin/variants/tgl/events.asl +++ b/src/ec/starlabs/merlin/variants/tgl/events.asl @@ -36,17 +36,16 @@ Method (_Q06, 0, NotSerialized) // Event: Backlight Brightness Up Method (_Q87, 0, NotSerialized) // Event: Function Lock { - FLKC = FLKE + Printf ("EC: Function Lock") } Method (_Q88, 0, NotSerialized) // Event: Trackpad Lock { - TPLC = TPLE + Printf ("EC: Trackpad Lock") } -Method (_Q4A) // Event: Keyboard Backlight Brightness +Method (_Q4A, 0, NotSerialized) // Event: Keyboard Backlight Brightness { - KLSC = KLSE - KLBC = KLBE + Printf ("EC: Keyboard Brightness") } Method (_Q99, 0, NotSerialized) // Event: Airplane Mode