From 1ac3bee7d67aa28a20aa59cfbd3cd0298e6669a7 Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Fri, 7 Feb 2025 09:38:19 +0000
Subject: [PATCH] ec/starlabs/merlin: Only include virtual button driver for
 detachables

Including the Virtual Button Driver made laptops report as a detachable
in tablet mode. Adjust how it's included, so they report as laptops.

Change-Id: Idc2076c400524744836e2f52124ccb8502622b04
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86315
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/ec/starlabs/merlin/acpi/dock.asl | 2 --
 src/ec/starlabs/merlin/acpi/ec.asl   | 2 ++
 src/ec/starlabs/merlin/acpi/hid.asl  | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ec/starlabs/merlin/acpi/dock.asl b/src/ec/starlabs/merlin/acpi/dock.asl
index 8d648bc8b9..dd234f160b 100644
--- a/src/ec/starlabs/merlin/acpi/dock.asl
+++ b/src/ec/starlabs/merlin/acpi/dock.asl
@@ -31,12 +31,10 @@ Device (VBTN)
 
 	Method (VGBS, 0)
 	{
-#if CONFIG(SYSTEM_TYPE_DETACHABLE)
 		If (!GRXS (GPP_F15))
 		{
 			Return (0x40)
 		}
-#endif
 		Return (0x00)
 	}
 }
diff --git a/src/ec/starlabs/merlin/acpi/ec.asl b/src/ec/starlabs/merlin/acpi/ec.asl
index 35604840cb..f3fdb07334 100644
--- a/src/ec/starlabs/merlin/acpi/ec.asl
+++ b/src/ec/starlabs/merlin/acpi/ec.asl
@@ -117,7 +117,9 @@ Scope (\_SB.PCI0.LPCB)
 		#include "events.asl"
 #endif
 		#include "lid.asl"
+#if CONFIG(SYSTEM_TYPE_DETACHABLE)
 		#include "dock.asl"
+#endif
 
 		Method (_REG, 2, NotSerialized)
 		{
diff --git a/src/ec/starlabs/merlin/acpi/hid.asl b/src/ec/starlabs/merlin/acpi/hid.asl
index f3bfff611e..a63723916e 100644
--- a/src/ec/starlabs/merlin/acpi/hid.asl
+++ b/src/ec/starlabs/merlin/acpi/hid.asl
@@ -366,7 +366,11 @@ Device (HIDD)							// HID Device
 					//
 					Case (0x08)
 					{
+#if CONFIG(SYSTEM_TYPE_DETACHABLE)
 						Return (\_SB.PCI0.LPCB.EC.VBTN.VGBS())
+#else
+						Return (0x00)
+#endif
 					}
 					//
 					// Function 9 H2BC. Button implemented state.