From 43ac56bf434f3f437b3a9ad1809dfae7c7ea8f45 Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Sun, 12 Jan 2025 20:21:48 +0000
Subject: [PATCH] ec/starlabs/merlin: Move common variants to respective files

Move the Q-Events used by the merlin EC to their respective
files, i.e. `Q0B` for Battery Status Update to battery.asl.

This means that only revelant events will be included.

Change-Id: Ib41fbafd79b999409a520361a4d372902d878794
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/85945
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/ec/starlabs/merlin/acpi/ac.asl            |  7 +++++
 src/ec/starlabs/merlin/acpi/battery.asl       |  7 +++++
 src/ec/starlabs/merlin/acpi/ec.asl            |  2 ++
 src/ec/starlabs/merlin/acpi/hid.asl           | 12 +++++++++
 src/ec/starlabs/merlin/acpi/lid.asl           |  8 ++++++
 .../merlin/variants/merlin/events.asl         | 27 -------------------
 6 files changed, 36 insertions(+), 27 deletions(-)
 delete mode 100644 src/ec/starlabs/merlin/variants/merlin/events.asl

diff --git a/src/ec/starlabs/merlin/acpi/ac.asl b/src/ec/starlabs/merlin/acpi/ac.asl
index 01dcca90a3..b689dd5548 100644
--- a/src/ec/starlabs/merlin/acpi/ac.asl
+++ b/src/ec/starlabs/merlin/acpi/ac.asl
@@ -1,5 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#if CONFIG(EC_STARLABS_MERLIN)
+Method (_Q0A, 0, NotSerialized)			// Event: Charger Status Update
+{
+	Notify (ADP1, 0x80)
+}
+#endif
+
 Device (ADP1)
 {
 	Name (_HID, "ACPI0003")
diff --git a/src/ec/starlabs/merlin/acpi/battery.asl b/src/ec/starlabs/merlin/acpi/battery.asl
index 10fea6ac89..5f00c88399 100644
--- a/src/ec/starlabs/merlin/acpi/battery.asl
+++ b/src/ec/starlabs/merlin/acpi/battery.asl
@@ -1,5 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#if CONFIG(EC_STARLABS_MERLIN)
+Method (_Q0B, 0, NotSerialized)			// Event: Battery Information Update
+{
+	Notify (BAT0, 0x80)
+}
+#endif
+
 Device (BAT0)
 {
 	Name (_HID, EisaId("PNP0C0A"))
diff --git a/src/ec/starlabs/merlin/acpi/ec.asl b/src/ec/starlabs/merlin/acpi/ec.asl
index 1219b82a95..2fc1248005 100644
--- a/src/ec/starlabs/merlin/acpi/ec.asl
+++ b/src/ec/starlabs/merlin/acpi/ec.asl
@@ -135,7 +135,9 @@ Scope (\_SB.PCI0.LPCB)
 
 		#include "ac.asl"
 		#include "battery.asl"
+#if !CONFIG(EC_STARLABS_MERLIN)
 		#include "events.asl"
+#endif
 		#include "lid.asl"
 		#include "dock.asl"
 
diff --git a/src/ec/starlabs/merlin/acpi/hid.asl b/src/ec/starlabs/merlin/acpi/hid.asl
index 15f02fcfed..4a85f04dba 100644
--- a/src/ec/starlabs/merlin/acpi/hid.asl
+++ b/src/ec/starlabs/merlin/acpi/hid.asl
@@ -1,5 +1,17 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#if CONFIG(EC_STARLABS_MERLIN)
+Method (_Q05, 0, NotSerialized)			// Event: Backlight Brightness Down
+{
+	^HIDD.HPEM (20)
+}
+
+Method (_Q06, 0, NotSerialized)			// Event: Backlight Brightness Up
+{
+	^HIDD.HPEM (19)
+}
+#endif
+
 Device (HIDD)							// HID Device
 {
 	Name (_HID, "INTC1051")					// Intel Ultrabook HID Platform Event Driver.
diff --git a/src/ec/starlabs/merlin/acpi/lid.asl b/src/ec/starlabs/merlin/acpi/lid.asl
index 0eaa2c5bae..83d28a076b 100644
--- a/src/ec/starlabs/merlin/acpi/lid.asl
+++ b/src/ec/starlabs/merlin/acpi/lid.asl
@@ -1,5 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#if CONFIG(EC_STARLABS_MERLIN)
+Method (_Q0C, 0, NotSerialized)			// Event: Lid Opened or Closed
+{
+	\LIDS = ECRD(RefOf(LSTE))
+	Notify (LID0, 0x80)
+}
+#endif
+
 Device (LID0)
 {
 	Name (_HID, EisaId ("PNP0C0D"))
diff --git a/src/ec/starlabs/merlin/variants/merlin/events.asl b/src/ec/starlabs/merlin/variants/merlin/events.asl
deleted file mode 100644
index 64bb0d0577..0000000000
--- a/src/ec/starlabs/merlin/variants/merlin/events.asl
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Method (_Q05, 0, NotSerialized)			// Event: Backlight Brightness Down
-{
-	^^^^HIDD.HPEM (20)
-}
-
-Method (_Q06, 0, NotSerialized)			// Event: Backlight Brightness Up
-{
-	^^^^HIDD.HPEM (19)
-}
-
-Method (_Q0A, 0, NotSerialized)			// Event: Charger Status Update
-{
-	Notify (ADP1, 0x80)
-}
-
-Method (_Q0B, 0, NotSerialized)			// Event: Battery Information Update
-{
-	Notify (BAT0, 0x80)
-}
-
-Method (_Q0C, 0, NotSerialized)			// Event: Lid Opened or Closed
-{
-	\LIDS = ECRD(RefOf(LSTE))
-	Notify (LID0, 0x80)
-}