[coreboot-gerrit] [XS] Change in coreboot[main]: ec/starlabs/merlin: Only include virtual button driver for detachables

[Sean Rhodes (Code Review)]

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86315?usp=email )

Change subject: ec/starlabs/merlin: Only include virtual button driver for detachables
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86315
Reviewed-by: Matt DeVillier 
Tested-by: build bot (Jenkins) 
---
M src/ec/starlabs/merlin/acpi/dock.asl
M src/ec/starlabs/merlin/acpi/ec.asl
M src/ec/starlabs/merlin/acpi/hid.asl
3 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Matt DeVillier: Looks good to me, approved
  build bot (Jenkins): Verified
  Sean Rhodes: Looks good to me, approved

diff --git a/src/ec/starlabs/merlin/acpi/dock.asl b/src/ec/starlabs/merlin/acpi/dock.asl
index 8d648bc..dd234f1 100644
--- a/src/ec/starlabs/merlin/acpi/dock.asl
+++ b/src/ec/starlabs/merlin/acpi/dock.asl
@@ -31,12 +31,10 @@

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 3560484..f3fdb07 100644
--- a/src/ec/starlabs/merlin/acpi/ec.asl
+++ b/src/ec/starlabs/merlin/acpi/ec.asl
@@ -117,7 +117,9 @@
    	#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 f3bfff6..a637239 100644
--- a/src/ec/starlabs/merlin/acpi/hid.asl
+++ b/src/ec/starlabs/merlin/acpi/hid.asl
@@ -366,7 +366,11 @@
    				//
    				Case (0x08)
    				{
+#if CONFIG(SYSTEM_TYPE_DETACHABLE)
    					Return (_SB.PCI0.LPCB.EC.VBTN.VGBS())
+#else
+						Return (0x00)
+#endif
    				}
    				//
    				// Function 9 H2BC. Button implemented state.