diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.aml b/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.aml
index e569f35ff..7f0de7a58 100644
Binary files a/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.aml and b/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.aml differ
diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.dsl b/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.dsl
index 6c4f52887..084bed638 100644
--- a/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.dsl
+++ b/Platforms/SurfaceDuo1Pkg/Device/qcom-hdk8150/ACPI/DSDT.dsl
@@ -378,7 +378,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                 \_SB.SPMI, 
                 \_SB.PMIC
             })
-            Name (_HID, "QCOM05CE")  // _HID: Hardware ID
+            Name (_HID, "QCOM05E5")  // _HID: Hardware ID
             Alias (\_SB.PSUB, _SUB)
         }
 
@@ -911,7 +911,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,
                         )
                         {   // Pin list
-                            0x00F8
+                            0x00FA
                         }
                     GpioInt (Edge, ActiveHigh, SharedAndWake, PullNone, 0x0000,
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,
diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.aml b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.aml
index 7e4d8569d..6b457e6b2 100644
Binary files a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.aml and b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.aml differ
diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.dsl b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.dsl
index b3a36cb5c..5ef141a2e 100644
--- a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.dsl
+++ b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp50/ACPI/DSDT.dsl
@@ -375,7 +375,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                 \_SB.SPMI, 
                 \_SB.PMIC
             })
-            Name (_HID, "QCOM05CE")  // _HID: Hardware ID
+            Name (_HID, "QCOM05E5")  // _HID: Hardware ID
             Alias (\_SB.PSUB, _SUB)
         }
 
@@ -908,7 +908,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,
                         )
                         {   // Pin list
-                            0x00F8
+                            0x00FA
                         }
                     GpioInt (Edge, ActiveHigh, SharedAndWake, PullNone, 0x0000,
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,
diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.aml b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.aml
index 69d4ad7ea..9dd0cc830 100644
Binary files a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.aml and b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.aml differ
diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.dsl b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.dsl
index ddb820696..39be93a58 100644
--- a/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.dsl
+++ b/Platforms/SurfaceDuo1Pkg/Device/qcom-mtp8150/ACPI/DSDT.dsl
@@ -375,7 +375,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                 \_SB.SPMI, 
                 \_SB.PMIC
             })
-            Name (_HID, "QCOM05CE")  // _HID: Hardware ID
+            Name (_HID, "QCOM05E5")  // _HID: Hardware ID
             Alias (\_SB.PSUB, _SUB)
         }
 
@@ -908,7 +908,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,
                         )
                         {   // Pin list
-                            0x00F8
+                            0x00FA
                         }
                     GpioInt (Edge, ActiveHigh, SharedAndWake, PullNone, 0x0000,
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,
diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.aml b/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.aml
index 20ccd9d84..cabf44056 100644
Binary files a/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.aml and b/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.aml differ
diff --git a/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.dsl b/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.dsl
index fc686c0cb..833702834 100644
--- a/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.dsl
+++ b/Platforms/SurfaceDuo1Pkg/Device/qcom-qrd8150/ACPI/DSDT.dsl
@@ -378,7 +378,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                 \_SB.SPMI, 
                 \_SB.PMIC
             })
-            Name (_HID, "QCOM05CE")  // _HID: Hardware ID
+            Name (_HID, "QCOM05E5")  // _HID: Hardware ID
             Alias (\_SB.PSUB, _SUB)
         }
 
@@ -911,7 +911,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM8150 ", 0x00000003)
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,
                         )
                         {   // Pin list
-                            0x00F8
+                            0x00FA
                         }
                     GpioInt (Edge, ActiveHigh, SharedAndWake, PullNone, 0x0000,
                         "\\_SB.PM01", 0x00, ResourceConsumer, ,