sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/starlabs/merlin: Unify EC and CMOS names

Browse Source 
End all CMOS variable with a C and EC variables with an E.

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: Ie0fab6b9dcd805f7b8c9bf8f14b0a799d8f396c8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60709
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
This commit is contained in:
Sean Rhodes
2022-01-02 12:16:27 +00:00
committed by Felix Held
parent 2b1afef1ea
commit c2c9618607
14 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ec/starlabs/merlin/acpi/cmos.asl
View File

@ -26,8 +26,8 @@ Field (CMS2, ByteAcc, NoLock, Preserve)
IndexField (IND2, DAT2, ByteAcc, NoLock, Preserve) IndexField (IND2, DAT2, ByteAcc, NoLock, Preserve)
{ {
Offset (0x80), Offset (0x80),
FLKS, 8, // Function Lock State FLKC, 8, // Function Lock State
TPLS, 8, // Trackpad State TPLC, 8, // Trackpad State
KLBC, 8, // Keyboard Backlight Brightness KLBC, 8, // Keyboard Backlight Brightness
KLSC, 8, // Keyboard Backlight State KLSC, 8, // Keyboard Backlight State
} }

4
src/ec/starlabs/merlin/acpi/suspend.asl
View File

@ -7,8 +7,8 @@ Method (RPTS, 1, NotSerialized)
If ((Arg0 == 0x04) || (Arg0 == 0x05)) If ((Arg0 == 0x04) || (Arg0 == 0x05))
{ {
/* Store current EC settings */ /* Store current EC settings */
\_SB.PCI0.LPCB.EC.TPLA = \_SB.PCI0.LPCB.TPLS \_SB.PCI0.LPCB.EC.TPLE = \_SB.PCI0.LPCB.TPLC
\_SB.PCI0.LPCB.EC.FLKA = \_SB.PCI0.LPCB.FLKS \_SB.PCI0.LPCB.EC.FLKE = \_SB.PCI0.LPCB.FLKC
\_SB.PCI0.LPCB.EC.KLBE = \_SB.PCI0.LPCB.KLBC \_SB.PCI0.LPCB.EC.KLBE = \_SB.PCI0.LPCB.KLBC
} }
} }

4
src/ec/starlabs/merlin/variants/apl/emem.asl
View File

@ -16,7 +16,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
CDEV, 8, // Control Device CDEV, 8, // Control Device
OSFG, 8, // OS Flag OSFG, 8, // OS Flag
CWFU, 8, // CW2015 Full CWFU, 8, // CW2015 Full
TPLA, 8, // Trackpad State TPLE, 8, // Trackpad State
AFG3, 8, // After G3 AFG3, 8, // After G3
CLTP, 8, // Close Trackpad CLTP, 8, // Close Trackpad
WKOL, 8, // Wake on Lid WKOL, 8, // Wake on Lid
@ -39,7 +39,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
ECT9, 8, // EC Build Time 9 ECT9, 8, // EC Build Time 9
Offset(0x2c), Offset(0x2c),
FLKA, 8, // Function Lock State FLKE, 8, // Function Lock State
Offset(0x30), Offset(0x30),
STEF, 8, // Sensor T Error F STEF, 8, // Sensor T Error F

4
src/ec/starlabs/merlin/variants/apl/events.asl
View File

@ -36,7 +36,7 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up
Method (_Q08, 0, NotSerialized) // Event: Function Lock Method (_Q08, 0, NotSerialized) // Event: Function Lock
{ {
FLKS = FLKA FLKC = FLKE
} }
// //
// TODO: // TODO:
@ -44,7 +44,7 @@ Method (_Q08, 0, NotSerialized) // Event: Function Lock
// //
// Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock // Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock
// { // {
// TPLS = TPLA // TPLC = TPLE
// } // }
// //
// Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness // Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness

4
src/ec/starlabs/merlin/variants/cml/emem.asl
View File

@ -27,7 +27,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
OSFG, 8, // OS Flag OSFG, 8, // OS Flag
Offset(0x14), Offset(0x14),
TPLA, 8, // Trackpad State TPLE, 8, // Trackpad State
AFG3, 8, // After G3 AFG3, 8, // After G3
CLTP, 8, // Close Trackpad CLTP, 8, // Close Trackpad
WKOL, 8, // Wake on Lid WKOL, 8, // Wake on Lid
@ -51,7 +51,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
ECT7, 8, // EC Build Time 7 ECT7, 8, // EC Build Time 7
ECT8, 8, // EC Build Time 8 ECT8, 8, // EC Build Time 8
ECT9, 8, // EC Build Time 9 ECT9, 8, // EC Build Time 9
FLKA, 8, // Function Lock State FLKE, 8, // Function Lock State
MICF, 8, // Mic Flag MICF, 8, // Mic Flag
MUTF, 8, // Mute Flag MUTF, 8, // Mute Flag
BC12, 8, // BC12 Flag BC12, 8, // BC12 Flag

4
src/ec/starlabs/merlin/variants/cml/events.asl
View File

@ -36,12 +36,12 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up
Method (_Q08, 0, NotSerialized) // Event: Function Lock Method (_Q08, 0, NotSerialized) // Event: Function Lock
{ {
FLKS = FLKA FLKC = FLKE
} }
Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock
{ {
TPLS = TPLA TPLC = TPLE
} }
// //
// TODO: // TODO:

4
src/ec/starlabs/merlin/variants/glk/emem.asl
View File

@ -16,7 +16,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
CDEV, 8, // Control Device CDEV, 8, // Control Device
OSFG, 8, // OS Flag OSFG, 8, // OS Flag
CWFU, 8, // CW2015 Full CWFU, 8, // CW2015 Full
TPLA, 8, // Trackpad State TPLE, 8, // Trackpad State
AFG3, 8, // After G3 AFG3, 8, // After G3
CLTP, 8, // Close Trackpad CLTP, 8, // Close Trackpad
WKOL, 8, // Wake on Lid WKOL, 8, // Wake on Lid
@ -39,7 +39,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
ECT9, 8, // EC Build Time 9 ECT9, 8, // EC Build Time 9
Offset(0x2c), Offset(0x2c),
FLKA, 8, // Function Lock State FLKE, 8, // Function Lock State
Offset(0x30), Offset(0x30),
STEF, 8, // Sensor T Error F STEF, 8, // Sensor T Error F

4
src/ec/starlabs/merlin/variants/glk/events.asl
View File

@ -36,7 +36,7 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up
Method (_Q08, 0, NotSerialized) // Event: Function Lock Method (_Q08, 0, NotSerialized) // Event: Function Lock
{ {
FLKS = FLKA FLKC = FLKE
} }
// //
// TODO: // TODO:
@ -44,7 +44,7 @@ Method (_Q08, 0, NotSerialized) // Event: Function Lock
// //
// Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock // Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock
// { // {
// TPLS = TPLA // TPLC = TPLE
// } // }
// //
// Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness // Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness

4
src/ec/starlabs/merlin/variants/kbl/emem.asl
View File

@ -22,7 +22,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
OSFG, 8, // OS Flag OSFG, 8, // OS Flag
Offset(0x14), Offset(0x14),
TPLA, 8, // Trackpad State TPLE, 8, // Trackpad State
Offset(0x18), Offset(0x18),
KLSE, 8, // Keyboard Backlight State KLSE, 8, // Keyboard Backlight State
@ -34,7 +34,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
TCHF, 8, // Thermal Charge Flag TCHF, 8, // Thermal Charge Flag
Offset(0x2c), Offset(0x2c),
FLKA, 8, // Function Lock State FLKE, 8, // Function Lock State
Offset(0x30), Offset(0x30),
STEF, 8, // Sensor T Error F STEF, 8, // Sensor T Error F

4
src/ec/starlabs/merlin/variants/kbl/events.asl
View File

@ -36,7 +36,7 @@ Method (_Q07, 0, NotSerialized) // Event: Backlight Brightness Up
Method (_Q08, 0, NotSerialized) // Event: Function Lock Method (_Q08, 0, NotSerialized) // Event: Function Lock
{ {
FLKS = FLKA FLKC = FLKE
} }
// //
// TODO: // TODO:
@ -44,7 +44,7 @@ Method (_Q08, 0, NotSerialized) // Event: Function Lock
// //
// Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock // Method (_Q04, 0, NotSerialized) // Event: Trackpad Lock
// { // {
// TPLS = TPLA // TPLC = TPLE
// } // }
// //
// Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness // Method (_Q__, 0, NotSerialized) // Event: Keyboard Backlight Brightness

4
src/ec/starlabs/merlin/variants/merlin/emem.asl
View File

@ -38,8 +38,8 @@ Field (ECF2, ByteAcc, Lock, Preserve)
Offset(0x30), // Keyboard: Offset(0x30), // Keyboard:
FCLA, 8, // Fn Ctrl Reverse FCLA, 8, // Fn Ctrl Reverse
FLKA, 8, // Function Lock State FLKE, 8, // Function Lock State
TPLA, 8, // Trackpad State TPLE, 8, // Trackpad State
KLBE, 8, // Keyboard Backlight Brightness KLBE, 8, // Keyboard Backlight Brightness
KLSE, 8, // Keyboard Backlight State KLSE, 8, // Keyboard Backlight State
KLTE, 8, // Keyboard Backlight Timeout KLTE, 8, // Keyboard Backlight Timeout

4
src/ec/starlabs/merlin/variants/merlin/events.asl
View File

@ -36,12 +36,12 @@ Method (_Q06) // Event: Backlight Brightness Up
Method (_Q87) // Event: Function Lock Method (_Q87) // Event: Function Lock
{ {
FLKS = FLKA FLKC = FLKE
} }
Method (_Q88) // Event: Trackpad Lock Method (_Q88) // Event: Trackpad Lock
{ {
TPLS = TPLA TPLC = TPLE
} }
Method (_Q11) // Event: Keyboard Backlight Brightness Method (_Q11) // Event: Keyboard Backlight Brightness
{ {

4
src/ec/starlabs/merlin/variants/tgl/emem.asl
View File

@ -17,10 +17,10 @@ Field (ECF2, ByteAcc, Lock, Preserve)
KLBE, 8, // Keyboard Backlight Brightness KLBE, 8, // Keyboard Backlight Brightness
KLSE, 8, // Keyboard Backlight State KLSE, 8, // Keyboard Backlight State
BDID, 8, // Board ID BDID, 8, // Board ID
TPLA, 8, // Trackpad State TPLE, 8, // Trackpad State
KBCD, 8, // Rotate Flag KBCD, 8, // Rotate Flag
WIFI, 8, // WiFi Enable WIFI, 8, // WiFi Enable
FLKA, 8, // Function Lock State FLKE, 8, // Function Lock State
KLTE, 8, // Keyboard Backlight Timeout KLTE, 8, // Keyboard Backlight Timeout
Offset(0x13), Offset(0x13),

4
src/ec/starlabs/merlin/variants/tgl/events.asl
View File

@ -36,12 +36,12 @@ Method (_Q06, 0, NotSerialized) // Event: Backlight Brightness Up
Method (_Q87, 0, NotSerialized) // Event: Function Lock Method (_Q87, 0, NotSerialized) // Event: Function Lock
{ {
FLKS = FLKA FLKC = FLKE
} }
Method (_Q88, 0, NotSerialized) // Event: Trackpad Lock Method (_Q88, 0, NotSerialized) // Event: Trackpad Lock
{ {
TPLS = TPLA TPLC = TPLE
} }
Method (_Q11) // Event: Keyboard Backlight Brightness Method (_Q11) // Event: Keyboard Backlight Brightness
{ {