summaryrefslogtreecommitdiff
path: root/src/ec/starlabs
diff options
context:
space:
mode:
Diffstat (limited to 'src/ec/starlabs')
-rw-r--r--src/ec/starlabs/merlin/acpi/suspend.asl12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ec/starlabs/merlin/acpi/suspend.asl b/src/ec/starlabs/merlin/acpi/suspend.asl
index 2dae8dae68..f89e501a14 100644
--- a/src/ec/starlabs/merlin/acpi/suspend.asl
+++ b/src/ec/starlabs/merlin/acpi/suspend.asl
@@ -2,8 +2,6 @@
Method (RPTS, 1, NotSerialized)
{
- \_SB.PCI0.LPCB.EC.OSFG = 0x00
-
If ((Arg0 == 0x04) || (Arg0 == 0x05))
{
/* Store current EC settings in CMOS */
@@ -16,10 +14,20 @@ Method (RPTS, 1, NotSerialized)
\_SB.PCI0.LPCB.KLBC =
\_SB.PCI0.LPCB.EC.ECRD (RefOf (\_SB.PCI0.LPCB.EC.KLBE))
}
+
+ /*
+ * Disable ACPI support.
+ * This should always be the last action before entering S4 or S5.
+ */
+ \_SB.PCI0.LPCB.EC.OSFG = 0x00
}
Method (RWAK, 1, Serialized)
{
+ /*
+ * Enable ACPI support.
+ * This should always be the first action when exiting S4 or S5.
+ */
\_SB.PCI0.LPCB.EC.OSFG = 0x01
/* Restore EC settings from CMOS */