diff --git a/payloads/external/edk2/Kconfig.dasharo b/payloads/external/edk2/Kconfig.dasharo
index 8c98912df05..cec52f97d52 100644
--- a/payloads/external/edk2/Kconfig.dasharo
+++ b/payloads/external/edk2/Kconfig.dasharo
@@ -4,7 +4,7 @@ config EDK2_REPOSITORY
 	default "https://github.com/Dasharo/edk2"
 
 config EDK2_TAG_OR_REV
-	default "aca6edd8b3f904b9ae2de1e418b3328dc3849a0d"
+	default "d737a918af0a7a7333f600da6f8186ab111501d8"
 
 config EDK2_SYSTEM76_EC_LOGGING
 	bool "Enable edk2 logging to System76 EC"
diff --git a/src/mainboard/clevo/adl-p/Kconfig b/src/mainboard/clevo/adl-p/Kconfig
index a19edb5f31f..9e6c71a0631 100644
--- a/src/mainboard/clevo/adl-p/Kconfig
+++ b/src/mainboard/clevo/adl-p/Kconfig
@@ -6,6 +6,7 @@ config BOARD_CLEVO_ADLP_COMMON
 	select DRIVERS_INTEL_USB4_RETIMER
 	select EC_DASHARO_EC
 	select EC_ACPI
+	select FSP_TYPE_IOT
 	select HAVE_ACPI_TABLES
 	select HAVE_ACPI_RESUME
 	select HAVE_CMOS_DEFAULT
diff --git a/src/mainboard/clevo/adl-p/acpi/mainboard.asl b/src/mainboard/clevo/adl-p/acpi/mainboard.asl
index da2a78c694a..6cc555ab5fd 100644
--- a/src/mainboard/clevo/adl-p/acpi/mainboard.asl
+++ b/src/mainboard/clevo/adl-p/acpi/mainboard.asl
@@ -23,3 +23,28 @@ If (S0IX == 0) {
 Name(\_S4, Package(){0x6,0x0,0x0,0x0})
 #endif
 Name(\_S5, Package(){0x7,0x0,0x0,0x0})
+
+Scope (\_GPE)
+{
+    Method (_L6B, 0, NotSerialized)
+    {
+        If (CondRefOf (\_SB.PCI0.LPCB.EC0))
+        {
+            Local0 = \_SB.PCI0.LPCB.EC0.WFNO
+
+            Switch (ToInteger (Local0))
+            {
+                Case (0x1B) { \_SB.PCI0.LPCB.EC0._Q1B() } // lid
+                Case (0x15) { \_SB.PCI0.LPCB.EC0._Q15() } // sleep button
+                Case (0x1D) { \_SB.PCI0.LPCB.EC0._Q1D() } // power button
+                Default
+                {
+                    If (CondRefOf (\_SB.LID0)) { Notify (\_SB.LID0, 0x80) }
+                    If (CondRefOf (\_SB.SLPB)) { Notify (\_SB.SLPB, 0x80) }
+                }
+            }
+
+            \_SB.PCI0.LPCB.EC0.WFNO = Zero
+        }
+    }
+}