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 <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>

14 files changed, 28 insertions, 28 deletions

diff --git a/src/ec/starlabs/merlin/acpi/cmos.asl b/src/ec/starlabs/merlin/acpi/cmos.asl
index b6ef5a0c93..f4468f75e4 100644
--- a/src/ec/starlabs/merlin/acpi/cmos.asl
+++ b/src/ec/starlabs/merlin/acpi/cmos.asl
@@ -26,8 +26,8 @@ Field (CMS2, ByteAcc, NoLock, Preserve)
 IndexField (IND2, DAT2, ByteAcc, NoLock, Preserve)
 {
 	Offset (0x80),
-	FLKS, 8,		// Function Lock State
-	TPLS, 8,		// Trackpad State
+	FLKC, 8,		// Function Lock State
+	TPLC, 8,		// Trackpad State
 	KLBC, 8,		// Keyboard Backlight Brightness
 	KLSC, 8,		// Keyboard Backlight State
 }
diff --git a/src/ec/starlabs/merlin/acpi/suspend.asl b/src/ec/starlabs/merlin/acpi/suspend.asl
index 7c8f2b1bd5..c4a92f232d 100644
--- a/src/ec/starlabs/merlin/acpi/suspend.asl
+++ b/src/ec/starlabs/merlin/acpi/suspend.asl
@@ -7,8 +7,8 @@ Method (RPTS, 1, NotSerialized)
 	If ((Arg0 == 0x04) || (Arg0 == 0x05))
 	{
 		/* Store current EC settings */
-		\_SB.PCI0.LPCB.EC.TPLA = \_SB.PCI0.LPCB.TPLS
-		\_SB.PCI0.LPCB.EC.FLKA = \_SB.PCI0.LPCB.FLKS
+		\_SB.PCI0.LPCB.EC.TPLE = \_SB.PCI0.LPCB.TPLC
+		\_SB.PCI0.LPCB.EC.FLKE = \_SB.PCI0.LPCB.FLKC
 		\_SB.PCI0.LPCB.EC.KLBE = \_SB.PCI0.LPCB.KLBC
 	}
 }
diff --git a/src/ec/starlabs/merlin/variants/apl/emem.asl b/src/ec/starlabs/merlin/variants/apl/emem.asl
index 8341bf2bf2..d30b58c5bf 100644
--- a/src/ec/starlabs/merlin/variants/apl/emem.asl
+++ b/src/ec/starlabs/merlin/variants/apl/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/apl/events.asl b/src/ec/starlabs/merlin/variants/apl/events.asl
index d9e49130c6..e2c301bb43 100644
--- a/src/ec/starlabs/merlin/variants/apl/events.asl
+++ b/src/ec/starlabs/merlin/variants/apl/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
diff --git a/src/ec/starlabs/merlin/variants/cml/emem.asl b/src/ec/starlabs/merlin/variants/cml/emem.asl
index 1a4a48f60f..97845cd387 100644
--- a/src/ec/starlabs/merlin/variants/cml/emem.asl
+++ b/src/ec/starlabs/merlin/variants/cml/emem.asl
@@ -27,7 +27,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
 	OSFG, 8,	// OS Flag
 
 	Offset(0x14),
-	TPLA, 8,	// Trackpad State
+	TPLE, 8,	// Trackpad State
 	AFG3, 8,	// After G3
 	CLTP, 8,	// Close Trackpad
 	WKOL, 8,	// Wake on Lid
@@ -51,7 +51,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
 	ECT7, 8,	// EC Build Time 7
 	ECT8, 8,	// EC Build Time 8
 	ECT9, 8,	// EC Build Time 9
-	FLKA, 8,	// Function Lock State
+	FLKE, 8,	// Function Lock State
 	MICF, 8,	// Mic Flag
 	MUTF, 8,	// Mute Flag
 	BC12, 8,	// BC12 Flag
diff --git a/src/ec/starlabs/merlin/variants/cml/events.asl b/src/ec/starlabs/merlin/variants/cml/events.asl
index bf7b9677c6..2eedb8e6cc 100644
--- a/src/ec/starlabs/merlin/variants/cml/events.asl
+++ b/src/ec/starlabs/merlin/variants/cml/events.asl
@@ -36,12 +36,12 @@ Method (_Q07, 0, NotSerialized)			// Event: Backlight Brightness Up
 
 Method (_Q08, 0, NotSerialized)			// Event: Function Lock
 {
-	FLKS = FLKA
+	FLKC = FLKE
 }
 
 Method (_Q04, 0, NotSerialized)			// Event: Trackpad Lock
 {
-	TPLS = TPLA
+	TPLC = TPLE
 }
 //
 // TODO:
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
diff --git a/src/ec/starlabs/merlin/variants/kbl/emem.asl b/src/ec/starlabs/merlin/variants/kbl/emem.asl
index 2959632f84..66699175c5 100644
--- a/src/ec/starlabs/merlin/variants/kbl/emem.asl
+++ b/src/ec/starlabs/merlin/variants/kbl/emem.asl
@@ -22,7 +22,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
 	OSFG, 8,	// OS Flag
 
 	Offset(0x14),
-	TPLA, 8,	// Trackpad State
+	TPLE, 8,	// Trackpad State
 
 	Offset(0x18),
 	KLSE, 8,	// Keyboard Backlight State
@@ -34,7 +34,7 @@ Field (ECF2, ByteAcc, Lock, Preserve)
 	TCHF, 8,	// Thermal Charge Flag
 
 	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/kbl/events.asl b/src/ec/starlabs/merlin/variants/kbl/events.asl
index c9eb1f9f47..966365cbc6 100644
--- a/src/ec/starlabs/merlin/variants/kbl/events.asl
+++ b/src/ec/starlabs/merlin/variants/kbl/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
diff --git a/src/ec/starlabs/merlin/variants/merlin/emem.asl b/src/ec/starlabs/merlin/variants/merlin/emem.asl
index 9af8464776..06749f02e3 100644
--- a/src/ec/starlabs/merlin/variants/merlin/emem.asl
+++ b/src/ec/starlabs/merlin/variants/merlin/emem.asl
@@ -38,8 +38,8 @@ Field (ECF2, ByteAcc, Lock, Preserve)
 
 	Offset(0x30),	// Keyboard:
 	FCLA, 8,	// Fn Ctrl Reverse
-	FLKA, 8,	// Function Lock State
-	TPLA, 8,	// Trackpad State
+	FLKE, 8,	// Function Lock State
+	TPLE, 8,	// Trackpad State
 	KLBE, 8,	// Keyboard Backlight Brightness
 	KLSE, 8,	// Keyboard Backlight State
 	KLTE, 8,	// Keyboard Backlight Timeout
diff --git a/src/ec/starlabs/merlin/variants/merlin/events.asl b/src/ec/starlabs/merlin/variants/merlin/events.asl
index 3cb37d61bb..a7328561e3 100644
--- a/src/ec/starlabs/merlin/variants/merlin/events.asl
+++ b/src/ec/starlabs/merlin/variants/merlin/events.asl
@@ -36,12 +36,12 @@ Method (_Q06)					// Event: Backlight Brightness Up
 
 Method (_Q87)					// Event: Function Lock
 {
-	FLKS = FLKA
+	FLKC = FLKE
 }
 
 Method (_Q88)					// Event: Trackpad Lock
 {
-	TPLS = TPLA
+	TPLC = TPLE
 }
 Method (_Q11)					// Event: Keyboard Backlight Brightness
 {
diff --git a/src/ec/starlabs/merlin/variants/tgl/emem.asl b/src/ec/starlabs/merlin/variants/tgl/emem.asl
index f5eb1d0380..09ddc4db45 100644
--- a/src/ec/starlabs/merlin/variants/tgl/emem.asl
+++ b/src/ec/starlabs/merlin/variants/tgl/emem.asl
@@ -17,10 +17,10 @@ Field (ECF2, ByteAcc, Lock, Preserve)
 	KLBE, 8,	// Keyboard Backlight Brightness
 	KLSE, 8,	// Keyboard Backlight State
 	BDID, 8,	// Board ID
-	TPLA, 8,	// Trackpad State
+	TPLE, 8,	// Trackpad State
 	KBCD, 8,	// Rotate Flag
 	WIFI, 8,	// WiFi Enable
-	FLKA, 8,	// Function Lock State
+	FLKE, 8,	// Function Lock State
 	KLTE, 8,	// Keyboard Backlight Timeout
 
 	Offset(0x13),
diff --git a/src/ec/starlabs/merlin/variants/tgl/events.asl b/src/ec/starlabs/merlin/variants/tgl/events.asl
index 9c74ac9dae..792bef5017 100644
--- a/src/ec/starlabs/merlin/variants/tgl/events.asl
+++ b/src/ec/starlabs/merlin/variants/tgl/events.asl
@@ -36,12 +36,12 @@ Method (_Q06, 0, NotSerialized)			// Event: Backlight Brightness Up
 
 Method (_Q87, 0, NotSerialized)			// Event: Function Lock
 {
-	FLKS = FLKA
+	FLKC = FLKE
 }
 
 Method (_Q88, 0, NotSerialized)			// Event: Trackpad Lock
 {
-	TPLS = TPLA
+	TPLC = TPLE
 }
 Method (_Q11)					// Event: Keyboard Backlight Brightness
 {