6 files changed, 18 insertions, 67 deletions
diff --git a/src/ec/starlabs/merlin/variants/apl/events.asl b/src/ec/starlabs/merlin/variants/apl/events.asl
index e2c301bb4385..57da4052ac43 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
-}
-//
-// 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
-// }
-//
+	Printf ("EC: Function Lock")
+}
 
 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 2eedb8e6cc2a..00a2ca6c16b9 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 e2c301bb4385..29294211706c 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
-}
-//
-// 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
-// }
-//
-
+	Printf ("EC: Function Lock")
+}
 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 966365cbc63e..df7399d54819 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 a7328561e30b..9835ef13baaf 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 6963500d18bb..90cde395a2f0 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