Update DSDT and fdf
authorXilin Wu <strongtz@yeah.net>
星期三, 30 Jun 2021 14:47:05 +0000 (22:47 +0800)
committerBigfootACA <bigfoot@classfun.cn>
星期五, 2 Jul 2021 08:30:14 +0000 (16:30 +0800)
Now Bluetooth should work with relevant Windows Bluetooth drivers.

windbg kdnet debugging should also work now.

Signed-off-by: Xilin Wu <strongtz@yeah.net>
sdm845Pkg/AcpiTables/845/DSDT.aml
sdm845Pkg/AcpiTables/845/DSDT.dsl
sdm845Pkg/Devices/845.fdf
sdm845Pkg/Devices/fajita.fdf
sdm845Pkg/Devices/polaris.fdf

index f7bd748f6d574825481f5e39df43e673ab08fd97..21344e220ec957523e18dd6373925a690cd7315a 100644 (file)
Binary files a/sdm845Pkg/AcpiTables/845/DSDT.aml and b/sdm845Pkg/AcpiTables/845/DSDT.aml differ
index abcc73c7449134969ed5214955bc322fe050209c..da64a829629100cbaed3efd0560abbfdcad6ba31 100644 (file)
@@ -1,26 +1,54 @@
 /*\r
  * Intel ACPI Component Architecture\r
- * AML/ASL+ Disassembler version 20180105 (64-bit version)\r
- * Copyright (c) 2000 - 2018 Intel Corporation\r
+ * AML/ASL+ Disassembler version 20190703 (32-bit version)\r
+ * Copyright (c) 2000 - 2019 Intel Corporation\r
  * \r
  * Disassembling to symbolic ASL+ operators\r
  *\r
- * Disassembly of dsdt_850.aml, Sat Mar  9 21:03:12 2019\r
+ * Disassembly of dsdts.aml, Wed Nov  6 17:28:39 2019\r
  *\r
  * Original Table Header:\r
  *     Signature        "DSDT"\r
- *     Length           0x000443A2 (279458)\r
+ *     Length           0x00043459 (275545)\r
  *     Revision         0x02\r
- *     Checksum         0x0D\r
+ *     Checksum         0x03\r
  *     OEM ID           "QCOMM "\r
  *     OEM Table ID     "SDM850 "\r
  *     OEM Revision     0x00000003 (3)\r
  *     Compiler ID      "MSFT"\r
  *     Compiler Version 0x05000000 (83886080)\r
  */\r
\r
 DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)\r
 {\r
+    /*\r
+     * iASL Warning: There were 2 external control methods found during\r
+     * disassembly, but only 0 were resolved (2 unresolved). Additional\r
+     * ACPI tables may be required to properly disassemble the code. This\r
+     * resulting disassembler output file may not compile because the\r
+     * disassembler did not know how many arguments to assign to the\r
+     * unresolved methods. Note: SSDTs can be dynamically loaded at\r
+     * runtime and may or may not be available via the host OS.\r
+     *\r
+     * To specify the tables needed to resolve external control method\r
+     * references, the -e option can be used to specify the filenames.\r
+     * Example iASL invocations:\r
+     *     iasl -e ssdt1.aml ssdt2.aml ssdt3.aml -d dsdt.aml\r
+     *     iasl -e dsdt.aml ssdt2.aml -d ssdt1.aml\r
+     *     iasl -e ssdt*.aml -d dsdt.aml\r
+     *\r
+     * In addition, the -fe option can be used to specify a file containing\r
+     * control method external declarations with the associated method\r
+     * argument counts. Each line of the file must be of the form:\r
+     *     External (<method pathname>, MethodObj, <argument count>)\r
+     * Invocation:\r
+     *     iasl -fe refs.txt -d dsdt.aml\r
+     *\r
+     * The following methods were unresolved and many not compile properly\r
+     * because the disassembler had to guess at the number of arguments\r
+     * required for each:\r
+     */\r
+    External (_SB_.PWPR, MethodObj)    // Warning: Unknown method, guessing 2 arguments\r
+    External (_SB_.PWRR, MethodObj)    // Warning: Unknown method, guessing 0 arguments\r
     External (_SB_.TZ98, UnknownObj)\r
     External (_SB_.TZ98._PSV, IntObj)\r
     External (_SB_.TZ98._TC1, IntObj)\r
@@ -34,13 +62,14 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
     External (BOCP, IntObj)\r
     External (CUST, IntObj)\r
     External (DCMA, IntObj)\r
+    External (DPON, UnknownObj)\r
     External (EMPT, IntObj)\r
     External (IFGD, IntObj)\r
     External (PCT1, UnknownObj)\r
     External (PCT2, UnknownObj)\r
     External (RID2, IntObj)\r
     External (RID3, IntObj)\r
-    External (TRUU, UnknownObj)\r
+    External (TRUE, UnknownObj)\r
     External (VFGD, IntObj)\r
     External (VLOW, IntObj)\r
     External (VNOM, IntObj)\r
@@ -48,36 +77,34 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
     Scope (\_SB)\r
     {\r
         Name (PSUB, "C153144D")\r
-        Name (SOID, 0xFFFFFFFF)            // Holds the Chip Id\r
-        Name (SIDS, "899800000000000")   // Holds the Chip ID translated to a string\r
-        Name (SIDV, 0xFFFFFFFF)          // Holds the Chip Version as (major<<16)|(minor&0xffff)\r
-        Name (SVMJ, 0xFFFF)              // Holds the major Chip Version\r
-        Name (SVMI, 0xFFFF)              // Holds the minor Chip Version\r
-        Name (SDFE, 0xFFFF)                // Holds the Chip Family enum\r
-        Name (SFES, "899800000000000")   // Holds the Chip Family translated to a string\r
-        Name (SIDM, 0x0000000FFFFFFFFF)   // Holds the Modem Support bit field\r
-        Name (SOSN, 0xAAAAAAAABBBBBBBB)\r
-        Name (RMTB, 0x99500000)\r
-        Name (RMTX, 0x00A00000)\r
-        Name (RFMB, 0x99F00000)\r
-        Name (RFMS, 0x00010000)\r
-        Name (RFAB, 0x99F10000)\r
-        Name (RFAS, 0x00010000)\r
-        Name (TCMA, 0x8B500000)\r
-        Name (TCML, 0x00A00000)\r
-        Name (SOSI, 0xDEADBEEFFFFFFFFF)\r
-        Name (MDID, 0xFFFFFFFF)\r
+        Name (SOID, 0x0000015C)\r
+        Name (SIDS, "SDM850")\r
+        Name (SIDV, 0x00020001)\r
+        Name (SVMJ, 0x0002)\r
+        Name (SVMI, 0x0001)\r
+        Name (SDFE, 0x004F)\r
+        Name (SFES, "899800000000000")\r
+        Name (SIDM, 0x0000000FFFFF00FF)\r
+        Name (SOSN, 0x000003F48D126594)\r
+        Name (RMTB, 0x85D00000)\r
+        Name (RMTX, 0x00200000)\r
+        Name (RFMB, 0x00000000)\r
+        Name (RFMS, 0x00000000)\r
+        Name (RFAB, 0x00000000)\r
+        Name (RFAS, 0x00000000)\r
+        Name (TCMA, 0x8AB00000)\r
+        Name (TCML, 0x01400000)\r
+        Name (PRSI, Buffer() {0x53, 0x4F, 0x53, 0x49, 0x0E, 0x10, 0x72, 0x00, 0x86, 0x00, 0x00, 0x00, 0x00,0x0B})\r
+        Name (MDID, 0x00000003)\r
         Device (UFS0)\r
         {\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.PEP0\r
             })\r
-            //Name (_HID, "NOPE1234")  // _HID: Hardware ID\r
             Name (_HID, "QCOM24A5")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_CID, "ACPIQCOM24A5")  // _CID: Compatible ID\r
-            //Name (_CID, "ACPINOPE1234")  // _CID: Compatible ID\r
             Name (_UID, Zero)  // _UID: Unique ID\r
             Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
@@ -110,7 +137,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-#if 0\r
         Device (SDC2)\r
         {\r
             Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
@@ -160,7 +186,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (0x0F)\r
             }\r
         }\r
-#endif\r
 \r
         Device (ABD)\r
         {\r
@@ -187,8 +212,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        Name (ESNL, 0x14) // Exsoc name limit 20 characters\r
-        Name (DBFL, 0x17) // buffer Length, should be ESNL+3\r
+        Name (ESNL, 0x14)\r
+        Name (DBFL, 0x17)\r
         Device (PMIC)\r
         {\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
@@ -206,8 +231,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Name (CFG0, Package (0x04)\r
                 {\r
-                    // PMIC Info\r
-                    0x03,               // Number of PMICs, must match the number of info packages\r
+                    0x03, \r
                     Package (0x02)\r
                     {\r
                         Zero, \r
@@ -248,11 +272,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
-                    //\r
-                    // QGIC Interrupt Resource\r
-                    //\r
-                    // Register for SPMI interrupt 513\r
-                    //\r
                     Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r
                     {\r
                         0x00000201,\r
@@ -261,12 +280,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RBUF) /* \_SB_.PM01._CRS.RBUF */\r
             }\r
 \r
-            // _DSM method to mark PM01's ActiveBoth interrupts\r
             Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
             {\r
                 While (One)\r
                 {\r
-                    Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r
+                    Name (_T_0, Buffer (One)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                     {\r
                          0x00                                             // .\r
                     })\r
@@ -275,7 +293,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_1 = ToInteger (Arg2)\r
                             If ((_T_1 == Zero))\r
                             {\r
@@ -312,9 +330,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        // PMIC Apps Driver\r
-        //       \r
         Device (PMAP)\r
         {\r
             Name (_HID, "QCOM0268")  // _HID: Hardware ID\r
@@ -330,9 +345,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (0x0B)\r
             }\r
 \r
-            //PMAP is dependent on ABD for operation region access\r
-            \r
-            // Get pseudo SPB controller port which is used to handle the ACPI operation region access\r
             Method (GEPT, 0, NotSerialized)\r
             {\r
                 Name (BUFF, Buffer (0x04){})\r
@@ -355,22 +367,21 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
         Device (PRTC)\r
         {\r
             Name (_HID, "ACPI000E" /* Time and Alarm Device */)  // _HID: Hardware ID\r
-            /*Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
-                \_SB.PMAP       // PRTC is dependent on PMAP which implements the RTC Functions\r
-            })*/\r
+                \_SB.PMAP\r
+            })\r
             Method (_STA, 0, NotSerialized)  // _STA: Status\r
             {\r
                 Return (0x0B)\r
             }\r
 \r
-            //Get the capabilities of the time and alarm device\r
             Method (_GCP, 0, NotSerialized)  // _GCP: Get Capabilities\r
             {\r
                 Return (0x04)\r
             }\r
 \r
-            /*Field (\_SB.ABD.ROP1, BufferAcc, NoLock, Preserve)\r
+            Field (\_SB.ABD.ROP1, BufferAcc, NoLock, Preserve)\r
             {\r
                 Connection (\r
                     I2cSerialBusV2 (0x0002, ControllerInitiated, 0x00000000,\r
@@ -380,46 +391,21 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 ), \r
                 AccessAs (BufferAcc, AttribRawBytes (0x18)), \r
                 FLD0,   192\r
-            }*/\r
+            }\r
 \r
-            Method (_GRT, 0, Serialized)  // _GRT: Get Real Time\r
+            Method (_GRT, 0, NotSerialized)  // _GRT: Get Real Time\r
             {\r
-                /*Name (BUFF, Buffer (0x1A){})\r
+                Name (BUFF, Buffer (0x1A){})\r
                 CreateField (BUFF, 0x10, 0x80, TME1)\r
                 CreateField (BUFF, 0x90, 0x20, ACT1)\r
                 CreateField (BUFF, 0xB0, 0x20, ACW1)\r
-                BUFF = FLD0 /* \_SB_.PRTC.FLD0 * /\r
+                BUFF = FLD0 /* \_SB_.PRTC.FLD0 */\r
                 Return (TME1) /* \_SB_.PRTC._GRT.TME1 */\r
-\r
-                Local1 = Buffer(16){}\r
-                CreateWordField (Local1, Zero, TYEA)\r
-                CreateByteField (Local1, 0x02, TMNT)\r
-                CreateByteField (Local1, 0x03, TDAY)\r
-                CreateByteField (Local1, 0x04, THOU)\r
-                CreateByteField (Local1, 0x05, TMIN)\r
-                CreateByteField (Local1, 0x06, TSEC)\r
-                CreateByteField (Local1, 0x07, TISO)\r
-                CreateWordField (Local1, 0x08, TMIL)\r
-                CreateWordField (Local1, 0x0A, TTMZ) \r
-                CreateByteField (Local1, 0x0C, TDAS)\r
-\r
-                TYEA = 2020\r
-                TMNT = 9\r
-                TDAY = 28\r
-                THOU = 0\r
-                TMIN = 0\r
-                TSEC = 0\r
-                TISO = 1\r
-                TMIL = 0\r
-                TTMZ = 2047\r
-                TDAS = 0\r
-\r
-                return (Local1)\r
             }\r
 \r
             Method (_SRT, 1, NotSerialized)  // _SRT: Set Real Time\r
             {\r
-                /*Name (BUFF, Buffer (0x32){})\r
+                Name (BUFF, Buffer (0x32){})\r
                 CreateByteField (BUFF, Zero, STAT)\r
                 CreateField (BUFF, 0x10, 0x80, TME1)\r
                 CreateField (BUFF, 0x90, 0x20, ACT1)\r
@@ -427,152 +413,423 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 ACT1 = Zero\r
                 TME1 = Arg0\r
                 ACW1 = Zero\r
-                BUFF = FLD0 = BUFF /* \_SB_.PRTC._SRT.BUFF * /\r
+                BUFF = FLD0 = BUFF /* \_SB_.PRTC._SRT.BUFF */\r
                 If ((STAT != Zero))\r
                 {\r
                     Return (One)\r
-                }*/\r
+                }\r
 \r
                 Return (Zero)\r
             }\r
         }\r
 \r
-#if 0\r
-        Device (PM3P)\r
+\r
+\r
+        Device (PEIC)\r
         {\r
-            Name (_HID, "SAM0606")  // _HID: Hardware ID\r
-            Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
+            Name (_HID, "QCOM02D3")  // _HID: Hardware ID\r
             Method (_STA, 0, NotSerialized)  // _STA: Status\r
             {\r
-                Return (0x0F)\r
+                Return (Zero)\r
             }\r
 \r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
-                Name (RBUF, Buffer (0x02)\r
+                Name (RBUF, ResourceTemplate ()\r
                 {\r
-                     0x79, 0x00                                       // y.\r
+                    I2cSerialBusV2 (0x0008, ControllerInitiated, 0x00061A80,\r
+                        AddressingMode7Bit, "\\_SB.I2C7",\r
+                        0x00, ResourceConsumer, , Exclusive,\r
+                        )\r
                 })\r
-                Return (RBUF) /* \_SB_.PM3P._CRS.RBUF */\r
+                Return (RBUF) /* \_SB_.PEIC._CRS.RBUF */\r
             }\r
 \r
             Method (PMCF, 0, NotSerialized)\r
             {\r
-                Name (CFG0, Package (0x04)\r
+                Name (CFG0, Package (0x02)\r
                 {\r
                     Zero, \r
-                    0x02, \r
-                    One, \r
                     0x02\r
                 })\r
-                Return (CFG0) /* \_SB_.PM3P.PMCF.CFG0 */\r
+                Return (CFG0) /* \_SB_.PEIC.PMCF.CFG0 */\r
             }\r
+        }\r
 \r
-            Name (BSTP, Package (0x08)\r
+        Device (PMBT)\r
+        {\r
+            Name (_HID, "QCOM0264")  // _HID: Hardware ID\r
+            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
             {\r
-                Zero, \r
-                0xFFFFFFFF, \r
-                0xFFFFFFFF, \r
-                0xFFFFFFFF, \r
-                Zero, \r
-                Zero, \r
-                0xFFFFFFFF, \r
-                0xFFFFFFFF\r
+                \_SB.PMIC, \r
+                \_SB.ADC1, \r
+                \_SB.PEIC\r
             })\r
-            Method (GBST, 0, NotSerialized)\r
+            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            {\r
+                Return (Zero)\r
+            }\r
+\r
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
-                If ((\_SB.EMEC.AVBL == One))\r
+                Name (RBUF, ResourceTemplate ()\r
                 {\r
-                    BSTP [Zero] = \_SB.EMEC.CHST\r
-                    BSTP [One] = \_SB.EMEC.CHGC\r
-                    BSTP [0x02] = \_SB.EMEC.SOC\r
-                    BSTP [0x03] = \_SB.EMEC.VOLT\r
-                    BSTP [0x04] = \_SB.EMEC.CHTY\r
-                }\r
-                Else\r
+                    GpioInt (Edge, ActiveHigh, Shared, PullUp, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x0149\r
+                        }\r
+                    GpioInt (Edge, ActiveHigh, Exclusive, PullUp, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x014B\r
+                        }\r
+                    GpioInt (Edge, ActiveHigh, Shared, PullUp, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x00ED\r
+                        }\r
+                    GpioInt (Edge, ActiveHigh, Shared, PullUp, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x00E0\r
+                        }\r
+                })\r
+                Return (RBUF) /* \_SB_.PMBT._CRS.RBUF */\r
+            }\r
+\r
+            Method (BMNR, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x05)\r
                 {\r
-                    ADBG ("EMECNotReady")\r
-                }\r
+                    One, \r
+                    Zero, \r
+                    One, \r
+                    Zero, \r
+                    "CUST_PMIC"\r
+                })\r
+                CFG0 [0x04] = CUST /* External reference */\r
+                Return (CFG0) /* \_SB_.PMBT.BMNR.CFG0 */\r
+            }\r
 \r
-                Return (BSTP) /* \_SB_.PM3P.BSTP */\r
+            Method (BTIM, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x08)\r
+                {\r
+                    0x7530, \r
+                    0x2710, \r
+                    0x000493E0, \r
+                    0x0001D4C0, \r
+                    Zero, \r
+                    Zero, \r
+                    0x01AC7780, \r
+                    Zero\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BTIM.CFG0 */\r
             }\r
-        }\r
-#endif\r
 \r
-        //******************************************\r
-        //Configs for Battery Manager Device: PMBT\r
-        //******************************************\r
-        //--------------------\r
-        //PMBT: Method(BBAT)\r
-        //--------------------\r
-        Name (BFCC, 0x4150)             //* (mWh), Full Charge Capacity \r
-        Name (PCT1, 0x05)                 //* (% of FCC),  Default Alert 1 \r
-        Name (PCT2, 0x09)                 //* (% of FCC),  Default Alert 2 \r
-        //--------------------\r
-        //PMBT: Method(BMNR)\r
-        //--------------------\r
-        Name (CUST, "850_HAN")        //* cust file identifier\r
-        //--------------------\r
-        //PMBT: Method(BPLT)\r
-        //--------------------\r
-        Name (VNOM, 0x0ED8)         //* (mV), Nominal Battery Voltage           \r
-        Name (VLOW, 0x0CE4)         //* (mV), Low Battery Voltage   \r
-        Name (EMPT, 0x0C80)         //* (mV), VCutOff  \r
-        Name (DCMA, 0x0384)         //* (mA), DC Current  \r
-        Name (BOCP, 0x1194)         //* (mA), OCP current used in BCL  \r
-        Name (BVLO, 0x0BB8)         //* (mV), BCL low Vbatt  \r
-        Name (BLOP, 0x14)           //* (%), BCL Low batt percent notification  \r
-        Name (BNOP, 0x16)           //* (%), BCL normal batt percent notification\r
-        Name (IFGD, Zero)\r
-        Name (VFGD, Zero)\r
-        Name (VDD1, 0x10FE)\r
-        Name (FCC1, 0x0BEA)\r
-        Name (HCLI, 0x0A)\r
-        Name (SCLI, 0x14)\r
-        Name (SHLI, 0x2D)\r
-        Name (HHLI, 0x3A)\r
-        Name (FVC1, Zero)\r
-        Name (FVH1, 0xC8)\r
-        Name (CCC1, 0x0352)\r
-        //--------------------\r
-        //PMBT: Method(CTMC)\r
-        //--------------------\r
-        Name (RID2, 0x3A98)         //* (Ohm), min RID for NORMAL category: 15K\r
-        Name (RID3, 0x000222E0)     //* (Ohm), max RID for NORMAL category: 140K\r
+            Method (BBAT, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x0D)\r
+                {\r
+                    One, \r
+                    0x4C494F4E, \r
+                    0xFFFFFFFF, \r
+                    0xFFFFFFFF, \r
+                    0xFFFFFFFF, \r
+                    0xFFFFFFFF, \r
+                    "QCOMBATT01", \r
+                    "Qualcomm", \r
+                    "QCOMBAT01_07012011", \r
+                    "07012011", \r
+                    0x13, \r
+                    0x04, \r
+                    0x07DE\r
+                })\r
+                Local0 = (PCT1 * BFCC) /* External reference */\r
+                Divide (Local0, 0x64, Local1, Local2)\r
+                Local0 = (PCT2 * BFCC) /* External reference */\r
+                Divide (Local0, 0x64, Local1, Local3)\r
+                CFG0 [0x02] = BFCC /* External reference */\r
+                CFG0 [0x03] = BFCC /* External reference */\r
+                CFG0 [0x04] = Local2\r
+                CFG0 [0x05] = Local3\r
+                Return (CFG0) /* \_SB_.PMBT.BBAT.CFG0 */\r
+            }\r
 \r
-#if 0\r
-        //PMIC EIC\r
-        //\r
-        Device (PEIC)\r
-        {\r
-            Name (_HID, "QCOM02D3")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Method (BPCH, 0, NotSerialized)\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Name (CFG0, Package (0x03)\r
                 {\r
-                    I2cSerialBusV2 (0x0055, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.I2C4",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
+                    0x05DC, \r
+                    0x05DC, \r
+                    0x05DC\r
                 })\r
-                Return (RBUF) /* \_SB_.PEIC._CRS.RBUF */\r
+                Return (CFG0) /* \_SB_.PMBT.BPCH.CFG0 */\r
             }\r
 \r
-            Method (PMCF, 0, NotSerialized)\r
+            Method (BFCH, 0, NotSerialized)\r
             {\r
                 Name (CFG0, Package (0x04)\r
                 {\r
-                    // Charger Info\r
-                    0xFF, \r
+                    One, \r
+                    0x05, \r
+                    0x1388, \r
+                    0x0384\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BFCH.CFG0 */\r
+            }\r
+\r
+            Method (BCCC, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x03)\r
+                {\r
+                    One, \r
                     Zero, \r
+                    Zero\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BCCC.CFG0 */\r
+            }\r
+\r
+            Method (BRCH, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x02)\r
+                {\r
+                    0x64, \r
+                    Zero\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BRCH.CFG0 */\r
+            }\r
+\r
+            Method (_BQI, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (One)\r
+                {\r
+                    Zero\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT._BQI.CFG0 */\r
+            }\r
+\r
+            Method (BIRQ, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x04)\r
+                {\r
+                    "VbatLow", \r
+                    "BattMissing", \r
+                    "FvCal", \r
+                    "JeitaLimit"\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BIRQ.CFG0 */\r
+            }\r
+\r
+            Method (BPLT, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x2A)\r
+                {\r
+                    0x03FF, \r
+                    0xFFFFFFFF, \r
+                    0xFFFFFFFF, \r
+                    0xFFFFFFFF, \r
+                    0xFFFFFFFF, \r
+                    One, \r
+                    0x32, \r
+                    0x32, \r
+                    0x1388, \r
+                    0x08, \r
+                    One, \r
+                    0x50, \r
+                    0xFFFFFFEC, \r
+                    0x48, \r
+                    0x64, \r
+                    0x1E, \r
+                    0x05, \r
+                    0x06, \r
+                    0x01F4, \r
+                    0x7E, \r
+                    0x0190, \r
+                    0xFFFFFFFF, \r
+                    0x02EE, \r
+                    One, \r
                     Zero, \r
-                    0x02\r
+                    0x32, \r
+                    0x0A, \r
+                    One, \r
+                    0xFFFFFFEC, \r
+                    0x0A, \r
+                    0x0A, \r
+                    0x0A, \r
+                    0x0A, \r
+                    One, \r
+                    0x96, \r
+                    0x64, \r
+                    0x05, \r
+                    0x0A, \r
+                    0x02, \r
+                    0x33, \r
+                    0x02, \r
+                    0x0A\r
                 })\r
-                Return (CFG0) /* \_SB_.PEIC.PMCF.CFG0 */\r
+                CFG0 [One] = VNOM /* External reference */\r
+                CFG0 [0x02] = VLOW /* External reference */\r
+                CFG0 [0x03] = EMPT /* External reference */\r
+                CFG0 [0x04] = DCMA /* External reference */\r
+                CFG0 [0x15] = BOCP /* External reference */\r
+                CFG0 [0x19] = IFGD /* External reference */\r
+                CFG0 [0x1A] = VFGD /* External reference */\r
+                Return (CFG0) /* \_SB_.PMBT.BPLT.CFG0 */\r
+            }\r
+\r
+            Method (BPTM, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x02)\r
+                {\r
+                    0x3A98, \r
+                    Zero\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BPTM.CFG0 */\r
+            }\r
+\r
+            Method (BJTA, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x03)\r
+                {\r
+                    0x02, \r
+                    0x02, \r
+                    Package (0x0A)\r
+                    {\r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero\r
+                    }\r
+                })\r
+                CFG0 [0x02] = \_SB.PMBT.BCT1\r
+                Return (CFG0) /* \_SB_.PMBT.BJTA.CFG0 */\r
+            }\r
+\r
+            Method (BEHC, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x08)\r
+                {\r
+                    One, \r
+                    0x08, \r
+                    One, \r
+                    Zero, \r
+                    0x02, \r
+                    0x02, \r
+                    0x02, \r
+                    0x04\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BEHC.CFG0 */\r
+            }\r
+\r
+            Method (CTMC, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x07)\r
+                {\r
+                    0x07D0, \r
+                    0x36B0, \r
+                    0xFFFFFFFF, \r
+                    0xFFFFFFFF, \r
+                    0x0003A980, \r
+                    0x0006DDD0, \r
+                    One\r
+                })\r
+                CFG0 [0x02] = RID2 /* External reference */\r
+                CFG0 [0x03] = RID3 /* External reference */\r
+                Return (CFG0) /* \_SB_.PMBT.CTMC.CFG0 */\r
+            }\r
+\r
+            Method (BAT1, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x05)\r
+                {\r
+                    Zero, \r
+                    0xFFFFFFEC, \r
+                    0x41, \r
+                    Package (0x04)\r
+                    {\r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x0A)\r
+                    {\r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero\r
+                    }\r
+                })\r
+                CFG0 [0x04] = \_SB.PMBT.BCT1\r
+                Return (CFG0) /* \_SB_.PMBT.BAT1.CFG0 */\r
+            }\r
+\r
+            Name (BCT1, Package (0x0A)\r
+            {\r
+                0x10FE, \r
+                0x0834, \r
+                Zero, \r
+                0x0A, \r
+                0x2D, \r
+                0x37, \r
+                0x69, \r
+                Zero, \r
+                Zero, \r
+                0x03E8\r
+            })\r
+            Method (BMPC, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x07)\r
+                {\r
+                    Zero, \r
+                    Zero, \r
+                    0x1B58, \r
+                    0x03E8, \r
+                    0x32, \r
+                    0x3C, \r
+                    0x01F4\r
+                })\r
+                Return (CFG0) /* \_SB_.PMBT.BMPC.CFG0 */\r
+            }\r
+        }\r
+\r
+        Device (PMBM)\r
+        {\r
+            Name (_HID, "QCOM0263")  // _HID: Hardware ID\r
+\r
+            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            {\r
+                Return (0x0F)\r
+            }\r
+\r
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            {\r
+                Name (RBUF, Buffer (0x02)\r
+                {\r
+                     0x79, 0x00                                       // y.\r
+                })\r
+                Return (RBUF) /* \_SB_.PMBM._CRS.RBUF */\r
             }\r
         }\r
-#endif\r
 \r
         Device (BCL1)\r
         {\r
@@ -728,19 +985,16 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        Device (PTCC)\r
+               Device (PTCC)\r
         {\r
             Name (_HID, "QCOM02E6")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
-                \_SB.PMIC//,\r
-                //\_SB.PMBT\r
+                \_SB.PMIC\r
             })\r
-            /*Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }*/\r
+           \r
+                       \r
 \r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
@@ -823,738 +1077,103 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-#if 0\r
-        //\r
-        //PMIC Battery Manger Driver\r
-        //\r
-        Device (PMBT)\r
+        Device (PEP0)\r
         {\r
-            Name (_HID, "QCOM0264")  // _HID: Hardware ID\r
-            Name (_DEP, Package (2)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PMIC,\r
-                \_SB.OP3P\r
-            })\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Name (_HID, "QCOM0237")  // _HID: Hardware ID\r
+            Name (_CID, "PNP0D80" /* Windows-compatible System Power Management Controller */)  // _CID: Compatible ID\r
+            Method (THTZ, 4, NotSerialized)\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                While (One)\r
                 {\r
-                    GpioInt (Edge, ActiveHigh, Exclusive, PullUp, 0x0000,\r
-                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x00EB\r
-                        }\r
-                })\r
-                Return (RBUF) /* \_SB_.PMBT._CRS.RBUF */\r
-            }\r
+                    Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
+                    _T_0 = ToInteger (Arg0)\r
+                    If ((_T_0 == One))\r
+                    {\r
+                        While (One)\r
+                        {\r
+                            Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
+                            _T_1 = ToInteger (Arg3)\r
+                            If ((_T_1 == Zero))\r
+                            {\r
+                                If (Arg2)\r
+                                {\r
+                                    \_SB.TZ1.TPSV = Arg1\r
+                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
+                                }\r
 \r
-            //ACPI methods for Battery Manager Device\r
-            Method (BMNR, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x04)\r
-                {\r
-                    2,            //* 0: Select Platform: 0- No HW, 1- SMChg+FGGge, 2- SMB3pChg+SMB3pGge, 3- LBChg+VMBMS\r
-                    Zero,         //* 1: Error State Handling: 0- Don’t Shutdown, 1- Shutdown\r
-                    One,          //* 2: Listen to BatteryClass: 0- No 1- Yes\r
-                    Zero          //* 3: Test Mode Charger Current: 0- No current drawn, 1- Current drawn\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BMNR.CFG0 */\r
-            }\r
+                                Return (\_SB.TZ1._PSV ())\r
+                            }\r
+                            ElseIf ((_T_1 == 0x02))\r
+                            {\r
+                                If (Arg2)\r
+                                {\r
+                                    \_SB.TZ1.TTSP = Arg1\r
+                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
+                                }\r
 \r
-            //ACPI methods for Timer\r
-            Method (BTIM, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x08)\r
-                {\r
-                    0x2710, // Charging Heartbeat Timer\r
-                    0x2710, // Charging Tolerable Delay\r
-                    0x000493E0, // Discharging Heartbeat Timer\r
-                    0x0001D4C0, // Discharging Tolerable Delay\r
-                    Zero, // Poll Timer , 0=Timer not used.\r
-                    Zero, // Poll Tolerable Delay\r
-                    0x01AC7780, //Charging Timeout (TDone) Timer\r
-                    Zero        //Charging Timeout(TDone) Tolerable Delay\r
-                })\r
-                Name (CFG1, Package (0x08)\r
-                {\r
-                    0x7530, \r
-                    0x2710, \r
-                    0x000493E0, \r
-                    0x0001D4C0, \r
-                    Zero, \r
-                    Zero, \r
-                    0x01AC7780, \r
-                    Zero\r
-                })\r
-                Name (HWID, Zero)\r
-                Return (CFG0) /* \_SB_.PMBT.BTIM.CFG0 */\r
-            }\r
+                                Return (\_SB.TZ1._TSP ())\r
+                            }\r
+                            ElseIf ((_T_1 == 0x03))\r
+                            {\r
+                                If (Arg2)\r
+                                {\r
+                                    \_SB.TZ1.TTC1 = Arg1\r
+                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
+                                }\r
 \r
-            //ACPI methods for  Battery Info\r
-            Method (BBAT, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x0D)\r
-                {\r
-                    One, //* 0: Battery Technology  \r
-                    0x4C494F4E, //* 1: Battery Chemistry: hex(LION)  \r
-                    0x2CEC, //* 2: BFCC: (mWh), Design Capacity  \r
-                    0x2CEC, //* 3: BFCC: (mWh), Full Charge Capacity  \r
-                    0x023F, //* 4: PCT1: (% of FCC),  Default Alert 1  \r
-                    0x040B, //* 5: PCT2: (% of FCC), Default Alert 2  \r
-                    "QCOMBATT01", //* 6: Device Name  \r
-                    "Qualcomm", //* 7: Manufacture Name  \r
-                    "QCOMBAT01_07012011", //* 8: Battery Unique ID  \r
-                    "07012011", //* 9: Battery Serial Number  \r
-                    0x13, //* 10: Battery Manufacture Date  \r
-                    0x04, //* 11: Battery Manufacture Month  \r
-                    0x07DE                  //* 12: Battery Manufacture Year  \r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BBAT.CFG0 */\r
-            }\r
+                                Return (\_SB.TZ1._TC1 ())\r
+                            }\r
+                            ElseIf ((_T_1 == 0x04))\r
+                            {\r
+                                If (Arg2)\r
+                                {\r
+                                    \_SB.TZ1.TTC2 = Arg1\r
+                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
+                                }\r
 \r
-            //ACPI methods for  Proprietary chargers\r
-            Method (BPCH, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x02)\r
-                {\r
-                    0x05DC, // charger current = 1500mA\r
-                    0x05DC\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BPCH.CFG0 */\r
-            }\r
+                                Return (\_SB.TZ1._TC2 ())\r
+                            }\r
+                            Else\r
+                            {\r
+                                Return (0xFFFF)\r
+                            }\r
 \r
-            //ACPI methods for coin cell charger\r
-            Method (BCCC, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x03)\r
-                {\r
-                    One,    //Enable coin cell charger; 1 = enable, 0 = disable\r
-                    Zero,      // RSET, 0=2K1, 1=1K7, 2=1K2, 3 = 0K8\r
-                    Zero    // VSET, 0=2V5, 1=3V2, 2=3V1, 3=3V0\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BCCC.CFG0 */\r
-            }\r
+                            Break\r
+                        }\r
+                    }\r
+                    ElseIf ((_T_0 == 0x03))\r
+                    {\r
+                        While (One)\r
+                        {\r
+                            Name (_T_2, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
+                            _T_2 = ToInteger (Arg3)\r
+                            If ((_T_2 == Zero))\r
+                            {\r
+                                If (Arg2)\r
+                                {\r
+                                    \_SB.TZ3.TPSV = Arg1\r
+                                    Notify (\_SB.TZ3, 0x81) // Thermal Trip Point Change\r
+                                }\r
 \r
-            //ACPI methods for  Recharge/Maintenance Mode\r
-            Method (BRCH, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x02)\r
-                {\r
-                    0x64,   // Delta V Recharge threshold = 100mV\r
-                    Zero    // Delta V Recharge Reduction below Normal= 0mV\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BRCH.CFG0 */\r
-            }\r
+                                Return (\_SB.TZ3._PSV ())\r
+                            }\r
+                            ElseIf ((_T_2 == 0x02))\r
+                            {\r
+                                If (Arg2)\r
+                                {\r
+                                    \_SB.TZ3.TTSP = Arg1\r
+                                    Notify (\_SB.TZ3, 0x81) // Thermal Trip Point Change\r
+                                }\r
 \r
-            Method (_BQI, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x01)\r
-                {\r
-                    Zero\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT._BQI.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for Interrupt Name\r
-            Method (BIRQ, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package ()\r
-                {\r
-                                       "SmbStatIrq"\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BIRQ.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for Platform File\r
-            Method (BPLT, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x25)\r
-                {\r
-                    0x03FC, //* 0: ACPI Version  \r
-                    0x0ED8, //* 1: VNOM: (mV), Nominal Battery Voltage  \r
-                    0x0DAC, //* 2: VLOW: (mV), Low Battery Voltage  \r
-                    0x0D48, //* 3: EMPT: (mV), VcutOff                         \r
-                    0x0384, //* 4: DCMA: (mA), DC Current  \r
-                    One, //* 5: ChargePath Priority: Select 0 for DC, 1 for USB  \r
-                    0x32, //* 6: RSLOW for maxFlashCurrentPrediction  \r
-                    0x32, //* 7: RPARA for maxFlashCurrentPrediction  \r
-                    0x1388, //* 8: VINFLASH for maxFlashCurrentPrediction  \r
-                    0x08, //* 9: FlashParam for maxFlashCurrentPrediction   \r
-                    One, //* 10: AFP Mode Supported  \r
-                    0x50, //* 11:  AFP Trigger Max Battery Temp (+80 deg C)  \r
-                    0xFFFFFFEC, //* 12: AFP Trigger Min Battery Temp (-20 deg C)  \r
-                    0x48, //* 13: Watchdog timer in secs        \r
-                    0x64, //* 14: Charger iterm 100 mA for now  \r
-                    0x1E, //* 15: SRAM logging timer  \r
-                    0x05, //* 16: VBATT average Window Size  \r
-                    0x06, //* 17: Emergency Shutdown Initial SOC  \r
-                    0x01F4, //* 18: SoC convergent point \r
-                    0x7E, //* 19: LM_Threshold \r
-                    0x0190, //* 20: MH_Threshold  \r
-                    0x1194, \r
-                    0x0BB8, \r
-                    0x012C, \r
-                    0x01F4, \r
-                    0x05DC, \r
-                    0x0F, \r
-                    0x11, \r
-                    0x02EE, \r
-                    0x08, \r
-                    One, \r
-                    0x1004, \r
-                    0x32, \r
-                    One, \r
-                    Zero, \r
-                    Zero, \r
-                    One\r
-                })\r
-                Name (CFG1, Package (0x25)\r
-                {\r
-                    0x03FC, \r
-                    0x0ED8, \r
-                    0x0DAC, \r
-                    0x0D48, \r
-                    0x0384, \r
-                    One, \r
-                    0x32, \r
-                    0x32, \r
-                    0x1388, \r
-                    0x08, \r
-                    One, \r
-                    0x50, \r
-                    0xFFFFFFEC, \r
-                    0x48, \r
-                    0x64, \r
-                    0x1E, \r
-                    0x05, \r
-                    0x06, \r
-                    0x01F4, \r
-                    0x7E, \r
-                    0x0190, \r
-                    0x1194, \r
-                    0x0BB8, \r
-                    0x012C, \r
-                    0x01F4, \r
-                    0x05DC, \r
-                    0x0F, \r
-                    0x11, \r
-                    0x02EE, \r
-                    One, \r
-                    One, \r
-                    0x1004, \r
-                    0x32, \r
-                    Zero, \r
-                    Zero, \r
-                    Zero, \r
-                    One\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BPLT.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for Platform File\r
-            Method (BPTM, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x02)\r
-                {\r
-                    0x3A98, \r
-                    Zero\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BPTM.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for JEITA\r
-            Method (BJTA, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x11)\r
-                {\r
-                    One, \r
-                    0x10FE, \r
-                    0x0834, \r
-                    Zero, \r
-                    0x3C, \r
-                    0x02, \r
-                    0x04, \r
-                    0x02, \r
-                    0x10FE, \r
-                    0x041A, \r
-                    0x0A, \r
-                    0x1097, \r
-                    0x0834, \r
-                    0x2D, \r
-                    0x1064, \r
-                    0x0834, \r
-                    0x32\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BJTA.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for Thermal\r
-            Method (BTHM, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x07)\r
-                {\r
-                    0x0BB8,  // IUSBMax (mA),maximum USB input current for the HW platform\r
-                    0x03E8,  // IWLCMax (mA), maximum DC input current for the HW platform\r
-                    0x46,  // %,Thermal mitigation perc at which HVDCP voltage reduces from 9V to 5V\r
-                    0x50, // %,Thermal mitigation perc at which HVDCP voltage increases from 5V to 9V\r
-                    0x01F4, // Ibat_therm (mA), IBAt_THERM value to which it drops during thermal mitigation.\r
-                    0x31, // %, Thermal mitigation perc at which Ibat reduces from Ibat_Max to Ibat_therm\r
-                    0x36 // %, Thermal mitigation perc at which Ibat increases from Ibat_therm to Ibat_Max\r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BTHM.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for Battery Error Handling\r
-            Method (BEHC, 0, NotSerialized)\r
-            {\r
-                //Actions for Battery Error Handling\r
-                //  0x0 - Do Nothing\r
-                //     0x1 - Reload Charge Table\r
-                //  0x2 - Error Shutdown\r
-                //  0x4 - Emergency Shutdown\r
-                //  0x8 - Enter Test Mode\r
-                Name (CFG0, Package (0x08)\r
-                {\r
-                    One, \r
-                    0x08, \r
-                    One, \r
-                    One, \r
-                    One, \r
-                    0x04, \r
-                    0x02, \r
-                    0x04\r
-                })\r
-                Name (CFG1, Package (0x08)\r
-                {\r
-                    One, \r
-                    0x08, \r
-                    One, \r
-                    One, \r
-                    One, \r
-                    0x04, \r
-                    0x02, \r
-                    0x04\r
-                })\r
-                Name (HWID, Zero)\r
-                Return (CFG0) /* \_SB_.PMBT.BEHC.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for Charge Table Management Configuration\r
-            Method (CTMC, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x07)\r
-                {\r
-                    Zero,       //* 0: min RID for DEBUG category: 0K  \r
-                    0x36B0,     //* 1: max RID for DEBUG category:   \r
-                    0x4A38,     //* 2: RID2: min RID for NORMAL category:   \r
-                    0x000222E0, //* 3: RID3: max RID for NORMAL category:   \r
-                    0x0003A980, //* 4: min RID for SMART category:   \r
-                    0x0006DDD0, //* 5: max RID for SMART category:   \r
-                    One         //* 6: Number of charging table  \r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.CTMC.CFG0 */\r
-            }\r
-\r
-            //ACPI methods for Battery Charge Tables #1\r
-            Method (BCT1, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x15)\r
-                {\r
-                    Zero,       //* 0: Battery Category: 0-NORMAL, 1-SMART\r
-                    0xFFFFFFEC, //* 1: min operating battery temp (-20 deg C)  \r
-                    0x50,       //* 2: max operating battery temp (+80 deg C)\r
-                    Package (0x04)\r
-                    {\r
-                        Zero, \r
-                        Zero, \r
-                        Zero, \r
-                        Zero\r
-                    },          //* 3: 128-bit battery info for future expansion\r
-\r
-                    One,        \r
-                    0x10FE,     \r
-                    0x0834,     \r
-                    Zero,       \r
-                    0x3C, \r
-                    0x02, \r
-                    0x04, \r
-                    0x02, \r
-                    0x10FE, \r
-                    0x03E8, \r
-                    0x0A, \r
-                    0x1090, \r
-                    0x0834, \r
-                    0x2D, \r
-                    0x1054, \r
-                    0x0834, \r
-                    0x32           \r
-                })\r
-                Return (CFG0) /* \_SB_.PMBT.BCT1.CFG0 */\r
-            }\r
-        }\r
-#endif\r
-\r
-        Device (PMBT) {\r
-         Name (_HID, "QCOM0264")\r
-              Name (_DEP, Package(0x2) {\r
-                     \_SB_.PMIC,\r
-                     \_SB_.OP3P\r
-              }) \r
-              \r
-              Alias (\_SB.PSUB, _SUB)\r
-           \r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (0x0B)\r
-            }\r
-           \r
-         Method (_CRS, 0x0, NotSerialized) {\r
-         Name (RBUF, ResourceTemplate ()\r
-         {\r
-            //GpioInt(Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.PM01",,,,) {58} // STAT Interrupt     \r
-         })\r
-         Return (RBUF)\r
-         }\r
-\r
-                //ACPI methods for Battery Manager Device\r
-               Method (BMNR) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       2,      // Select Platform: 0- No HW, 1- SMChg+FGGge, 2- SMB3pChg+SMB3pGge, 3- LBChg+VMBMS\r
-                       0,      // Error State Handling: 0- Don't Shutdown, 1- Shutdown\r
-                       1,      // Listen to BatteryClass: 0- No 1- Yes\r
-                       0       // Test Mode Charger Current: 0- No current drawn, 1- Current drawn\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-           \r
-               //ACPI methods for Timer\r
-               Method (BTIM) {\r
-                       Name (CFG0, \r
-                Package(){\r
-                                       20000,  // Charging Heartbeat Timer\r
-                                       10000,  // Charging Tolerable Delay\r
-                                       300000, // Discharging Heartbeat Timer\r
-                                       120000,         // Discharging Tolerable Delay\r
-                                       0,      // Poll Timer , 0=Timer not used.\r
-                                       0,              // Poll Tolerable Delay\r
-                                       28080000,               //Charging Timeout (TDone) Timer\r
-                                       0,              //Charging Timeout(TDone) Tolerable Delay\r
-                })\r
-                       Return (CFG0)\r
-               }\r
-\r
-               \r
-               //ACPI methods for  Battery Info\r
-               Method (BBAT) {\r
-                       Name (CFG0, \r
-                Package(){\r
-                                       1,      //  Battery Technology\r
-                                       0x4C494F4E,     // Battery Chemistry: hex(LION)\r
-                                       9500, //8360,   // (mWh), Design Capacity\r
-                                       9500, //8360,   // (mWh), Full Charge Capacity\r
-                                       475,    // Default Alert 1 (5% of full capacity)\r
-                                       855,    //Default Alert 2 (9% of full capacity)\r
-                                       "QCOMBATT01",   //Device Name\r
-                                       "Qualcomm",     // Manufacture Name\r
-                                       "QCOMBAT01_07012011",   // Battery Unique ID\r
-                                       "07012011",             // Battery Serial Number\r
-                                       02,     // Battery Manufacture Date\r
-                                       07,     // Battery Manufacture Month\r
-                                       2015    // Battery Manufacture Year\r
-                               })\r
-                       Return (CFG0)\r
-               }\r
-           \r
-               //ACPI methods for  Proprietary chargers\r
-               Method (BPCH) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                               0,              // HVDCP charger not supported\r
-                               500             // Invalid Wall charger current = 500mA\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-               \r
-               //ACPI methods for coin cell charger\r
-               Method (BCCC) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       1, //Enable coin cell charger; 1 = enable, 0 = disable\r
-                       0,      // RSET, 0=2K1, 1=1K7, 2=1K2, 3 = 0K8\r
-                       0       // VSET, 0=2V5, 1=3V2, 2=3V1, 3=3V0\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-               \r
-               //ACPI methods for Interrupt Name\r
-               Method (BIRQ) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       //"SmbStatIrq" //SMB interrupt\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-           \r
-               //ACPI methods for Platform File\r
-               Method (BPLT) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       1005,   //  ACPI Version\r
-                       3800,   // (mV), Nominal Battery Voltage\r
-                       3500,   // (mV), Low Battery Voltage\r
-                       3400,   // (mV), Empty Battery Voltage\r
-                       100,    // (mA), Termination Current\r
-                       500,    // (per mil), Convergent SOC\r
-                       0,      // Min Battery ID\r
-                       1800,   // Max Battery ID\r
-                       34522,  // Thermistor c1 coefficient (=0x86DB default)\r
-                       33422,  // cc to soc coefficient (=0x8372: for 2200mAh)\r
-                       750     //soc (75%) below which no soc linearization even in CV charging\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-                               \r
-               //ACPI methods for Platform File\r
-               Method (BPTM) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       50000,          // Emergency Timer\r
-                       10000,          // Emergency Tolerable Delay\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-               \r
-               //ACPI methods for JEITA\r
-               //No JEITA\r
-               Method (BJTA) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       1,              // Select JEITA Configuration: 0- No JEITA, 1- SW JEITA, 2- HW JEITA\r
-                       4350,   // Max Battery Voltage (mV) for Standard Zone\r
-                       1500,   // Max Battery Current (mA) for Standard Zone\r
-                       0,              // Safe Min Temperature(in deg C) eg. -2 for 0xFFFFFFFE (2's complement in case of -ve number)\r
-                       60,     // Safe Max Temperature(in deg C)\r
-                       1,              // Temperature Hysteresis (in deg C)\r
-                       // SW Jeita Entries\r
-                       4,              // Total Zones (Standard Zone + 3 Jeita Zone)\r
-                       2,              // Standard Zone #\r
-                       4350,   // Voltage Zone 1, 4200 mV\r
-                       750,    // Current Zone 1, 750 mA\r
-                       10,             // Temperature Zone 1, 10 deg C\r
-                       4350,   // Voltage Zone 3, 4150 mV\r
-                       1500,   // Current Zone 3, 1500 mA\r
-                       45,             // Temperature Zone 3, 45 deg C\r
-                       4100,   // Voltage Zone 4, 4100 mV\r
-                       750,    // Current Zone 4, 1500 mA\r
-                       50              // Temperature Zone 4, 50 deg C\r
-                       })\r
-                       Return (CFG0)\r
-            }\r
-\r
-               //ACPI methods for  Recharge/Maintenance Mode\r
-               Method (BRCH) {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       100,    // Delta V Recharge threshold = 100mV\r
-                       0               // Delta V Recharge Reduction below Normal= 0mV\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-               Method (BEHC)\r
-               {\r
-                       //Actions for Battery Error Handling\r
-                       //  0x0 - Do Nothing\r
-                       //      0x1 - Reload Charge Table\r
-                       //  0x2 - Error Shutdown\r
-                       //  0x4 - Emergency Shutdown\r
-                       //  0x8 - Enter Test Mode\r
-                       Name (CFG0,\r
-                       Package(){\r
-                       1,              //1-Feature Enable, 0-Feature Disable\r
-                       0x8,    //Action(s) for DEBUG state -> Enter Test Mode\r
-                       0x1,    //Action(s) for NORMAL state -> Reload Charge Table\r
-                       0x1,    //Action(s) for SMART_AUTHENTICATED state -> Reload Charge Table\r
-                       0x2,    //Action(s) for UNKNOWN state -> Error Shutdown\r
-                       0x2,    //Action(s) for NOT_PRESENT state -> Error Shutdown\r
-                       0x2,    //Action(s) for INVALID state -> Error Shutdown\r
-                       0x2             //Action(s) for OUT_OP_RANGE state -> Error Shutdown\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-               //ACPI methods for Charge Table Management Configuration\r
-               Method (CTMC)\r
-               {\r
-                       Name (CFG0,\r
-                               Package(){\r
-                                       1800,           //min BATT_ID Voltage(mV) for DEBUG category: 1800 mV (debug board support disabled since BAT_ID is grounded)\r
-                                       1800,           //max BATT_ID Voltage(mV) for DEBUG category: 1800 mV (debug board support disabled since BAT_ID is grounded)\r
-                                       0,                      //min BATT_ID Voltage(mV) for NORMAL category: 0 mV   (maximize BAT_ID range for NORMAL battery )\r
-                                       1800,           //max BATT_ID Voltage(mV) for NORMAL category: 1800 mV(maximize BAT_ID range for NORMAL battery )\r
-                                       1800,           //min BATT_ID Voltage(mV) for SMART category: 1800 mV (smart battery support disabled since BAT_ID is grounded)\r
-                                       1800,           //max BATT_ID Voltage(mV) for SMART category: 1800 mV (smart battery support disabled since BAT_ID is grounded)\r
-                                       1,                      //Number of charging table\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-               //ACPI methods for Battery Charge Tables #1\r
-               Method (BCT1)\r
-               {\r
-                       Name (CFG0, \r
-                       Package(){\r
-                       0,              //Battery Category: 0-NORMAL, 1-SMART\r
-                       0xFFFFFFEC,     //min operating battery temp (-20 deg C)                                                        \r
-                       70,                     //max operating battery temp (+70 deg C)\r
-                       Package(4){0,0,0,0},//128-bit battery info for future expansion\r
-                       //Jeita Settings                        \r
-                       1,              // Select JEITA Configuration: 0- No JEITA, 1- SW JEITA, 2- HW JEITA\r
-                       4200,   // Max Battery Voltage (mV) for Standard Zone\r
-                       1500,   // Max Battery Current (mA) for Standard Zone\r
-                       0,              // Safe Min Temperature(in deg C) eg. -2 for 0xFFFFFFFE (2's complement in case of -ve number)\r
-                       60,     // Safe Max Temperature(in deg C)\r
-                       2,              // Temperature Hysteresis (in deg C)\r
-                       // SW Jeita Entries\r
-                       4,              // Total Zones (Standard Zone + 3 Jeita Zone)\r
-                       2,              // Standard Zone #\r
-                       4200,   // Voltage Zone 1, 4200 mV\r
-                       750,    // Current Zone 1, 750 mA\r
-                       10,             // Temperature Zone 1, 10 deg C\r
-                       4150,   // Voltage Zone 3, 4150 mV\r
-                       1500,   // Current Zone 3, 1500 mA\r
-                       45,             // Temperature Zone 3, 45 deg C\r
-                       4100,   // Voltage Zone 4, 4100 mV\r
-                       1500,   // Current Zone 4, 1500 mA\r
-                       50              // Temperature Zone 4, 50 deg C\r
-                       })\r
-                       Return (CFG0)\r
-               }\r
-       }\r
-\r
-\r
-        //\r
-        //PMIC Battery Miniclass Driver\r
-        //\r
-        Device (PMBM)\r
-        {\r
-            Name (_HID, "QCOM0263")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PMBT\r
-            })\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, Buffer (0x02)\r
-                {\r
-                     0x79, 0x00                                       // y.\r
-                })\r
-                Return (RBUF) /* \_SB_.PMBM._CRS.RBUF */\r
-            }\r
-\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (0x0B)\r
-            }\r
-        }\r
-\r
-        Device (PEP0)\r
-        {\r
-            Name (_HID, "QCOM0237")  // _HID: Hardware ID\r
-            Name (_CID, "PNP0D80" /* Windows-compatible System Power Management Controller */)  // _CID: Compatible ID\r
-            Method (THTZ, 4, NotSerialized)\r
-            {\r
-                While (One)\r
-                {\r
-                    Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                    _T_0 = ToInteger (Arg0)\r
-                    If ((_T_0 == One))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_1 = ToInteger (Arg3)\r
-                            If ((_T_1 == Zero))\r
-                            {\r
-                                If (Arg2)\r
-                                {\r
-                                    \_SB.TZ1.TPSV = Arg1\r
-                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
-                                }\r
-\r
-                                Return (\_SB.TZ1._PSV ())\r
-                            }\r
-                            ElseIf ((_T_1 == 0x02))\r
-                            {\r
-                                If (Arg2)\r
-                                {\r
-                                    \_SB.TZ1.TTSP = Arg1\r
-                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
-                                }\r
-\r
-                                Return (\_SB.TZ1._TSP ())\r
-                            }\r
-                            ElseIf ((_T_1 == 0x03))\r
-                            {\r
-                                If (Arg2)\r
-                                {\r
-                                    \_SB.TZ1.TTC1 = Arg1\r
-                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
-                                }\r
-\r
-                                Return (\_SB.TZ1._TC1 ())\r
-                            }\r
-                            ElseIf ((_T_1 == 0x04))\r
-                            {\r
-                                If (Arg2)\r
-                                {\r
-                                    \_SB.TZ1.TTC2 = Arg1\r
-                                    Notify (\_SB.TZ1, 0x81) // Thermal Trip Point Change\r
-                                }\r
-\r
-                                Return (\_SB.TZ1._TC2 ())\r
-                            }\r
-                            Else\r
-                            {\r
-                                Return (0xFFFF)\r
-                            }\r
-\r
-                            Break\r
-                        }\r
-                    }\r
-                    ElseIf ((_T_0 == 0x03))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_2 = ToInteger (Arg3)\r
-                            If ((_T_2 == Zero))\r
-                            {\r
-                                If (Arg2)\r
-                                {\r
-                                    \_SB.TZ3.TPSV = Arg1\r
-                                    Notify (\_SB.TZ3, 0x81) // Thermal Trip Point Change\r
-                                }\r
-\r
-                                Return (\_SB.TZ3._PSV ())\r
-                            }\r
-                            ElseIf ((_T_2 == 0x02))\r
-                            {\r
-                                If (Arg2)\r
-                                {\r
-                                    \_SB.TZ3.TTSP = Arg1\r
-                                    Notify (\_SB.TZ3, 0x81) // Thermal Trip Point Change\r
-                                }\r
-\r
-                                Return (\_SB.TZ3._TSP ())\r
-                            }\r
-                            ElseIf ((_T_2 == 0x03))\r
-                            {\r
-                                If (Arg2)\r
-                                {\r
-                                    \_SB.TZ3.TTC1 = Arg1\r
-                                    Notify (\_SB.TZ3, 0x81) // Thermal Trip Point Change\r
-                                }\r
+                                Return (\_SB.TZ3._TSP ())\r
+                            }\r
+                            ElseIf ((_T_2 == 0x03))\r
+                            {\r
+                                If (Arg2)\r
+                                {\r
+                                    \_SB.TZ3.TTC1 = Arg1\r
+                                    Notify (\_SB.TZ3, 0x81) // Thermal Trip Point Change\r
+                                }\r
 \r
                                 Return (\_SB.TZ3._TC1 ())\r
                             }\r
@@ -1580,7 +1199,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_3, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_3, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_3 = ToInteger (Arg3)\r
                             If ((_T_3 == Zero))\r
                             {\r
@@ -1634,7 +1253,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_4, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_4, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_4 = ToInteger (Arg3)\r
                             If ((_T_4 == Zero))\r
                             {\r
@@ -1688,7 +1307,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_5, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_5, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_5 = ToInteger (Arg3)\r
                             If ((_T_5 == Zero))\r
                             {\r
@@ -1742,7 +1361,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_6, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_6, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_6 = ToInteger (Arg3)\r
                             If ((_T_6 == Zero))\r
                             {\r
@@ -1806,7 +1425,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_7, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_7, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_7 = ToInteger (Arg3)\r
                             If ((_T_7 == Zero))\r
                             {\r
@@ -1860,7 +1479,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_8, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_8, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_8 = ToInteger (Arg3)\r
                             If ((_T_8 == Zero))\r
                             {\r
@@ -1914,7 +1533,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_9, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_9, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_9 = ToInteger (Arg3)\r
                             If ((_T_9 == Zero))\r
                             {\r
@@ -1968,7 +1587,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_A, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_A, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_A = ToInteger (Arg3)\r
                             If ((_T_A == Zero))\r
                             {\r
@@ -2022,7 +1641,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_B, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_B, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_B = ToInteger (Arg3)\r
                             If ((_T_B == Zero))\r
                             {\r
@@ -2076,7 +1695,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_C, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_C, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_C = ToInteger (Arg3)\r
                             If ((_T_C == Zero))\r
                             {\r
@@ -2130,7 +1749,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_D, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_D, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_D = ToInteger (Arg3)\r
                             If ((_T_D == Zero))\r
                             {\r
@@ -2194,7 +1813,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_E, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_E, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_E = ToInteger (Arg3)\r
                             If ((_T_E == Zero))\r
                             {\r
@@ -2218,7 +1837,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_F, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_F, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_F = ToInteger (Arg3)\r
                             If ((_T_F == Zero))\r
                             {\r
@@ -2272,7 +1891,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_G, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_G, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_G = ToInteger (Arg3)\r
                             If ((_T_G == Zero))\r
                             {\r
@@ -2326,7 +1945,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_H, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_H, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_H = ToInteger (Arg3)\r
                             If ((_T_H == Zero))\r
                             {\r
@@ -2380,7 +1999,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         While (One)\r
                         {\r
-                            Name (_T_I, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            Name (_T_I, Zero)  // _T_x: Emitted by ASL Compiler, x=0-9, A-Z\r
                             _T_I = ToInteger (Arg3)\r
                             If ((_T_I == One))\r
                             {\r
@@ -2443,7 +2062,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Return (ResourceTemplate ()\r
                 {\r
-                    // List interrupt resources in the order they are used in PEP_Driver.c\r
                     Interrupt (ResourceConsumer, Level, ActiveHigh, ExclusiveAndWake, ,, )\r
                     {\r
                         0x0000021A,\r
@@ -2487,10 +2105,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 })\r
             }\r
 \r
-            // need 20 char and 1 D state info\r
             Field (\_SB.ABD.ROP1, BufferAcc, NoLock, Preserve)\r
             {\r
-                /* Connection Object  - 0x007C is the unique identifier */\r
                 Connection (\r
                     I2cSerialBusV2 (0x0001, ControllerInitiated, 0x00000000,\r
                         AddressingMode7Bit, "\\_SB.ABD",\r
@@ -2501,66 +2117,46 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 FLD0,   168\r
             }\r
 \r
-            //Get port to connect to\r
             Method (GEPT, 0, NotSerialized)\r
             {\r
                 Name (BUFF, Buffer (0x04){})\r
                 CreateByteField (BUFF, Zero, STAT)\r
                 CreateWordField (BUFF, 0x02, DATA)\r
-                DATA = One //in this example we will connect to ABDO\r
+                DATA = One\r
                 Return (DATA) /* \_SB_.PEP0.GEPT.DATA */\r
             }\r
 \r
             Name (ROST, Zero)\r
-            // Number of CPUs to Park\r
             Method (NPUR, 1, NotSerialized)\r
             {\r
                 \_SB.AGR0._PUR [One] = Arg0\r
                 Notify (\_SB.AGR0, 0x80) // Status Change\r
             }\r
 \r
-            // ACPI method to return intr descriptor\r
             Method (INTR, 0, NotSerialized)\r
             {\r
                 Name (RBUF, Package (0x18)\r
                 {\r
-                    // Version\r
                     0x02, \r
-                    // Number of hosts\r
                     One, \r
-                    // number of memory regions\r
                     0x03, \r
-                    // number of IPC registers\r
                     One, \r
-\r
                     0x06, \r
                     0x17911008, \r
                     One, \r
-                    Zero,\r
-\r
-                    // Shared memory\r
-                    // Start address\r
+                    Zero, \r
                     0x86000000, \r
-                    // Size\r
                     0x00200000, \r
-                    // Reserved\r
                     Zero, \r
-                    // Reserved\r
                     Zero, \r
-\r
-                    // AOSS QMP\r
-                    // Start address\r
                     0x0C300000, \r
                     0x1000, \r
                     Zero, \r
                     Zero, \r
-\r
                     0x01FD4000, \r
                     0x08, \r
                     Zero, \r
                     Zero, \r
-\r
-                    // apss shared\r
                     0x1799000C, \r
                     Zero, \r
                     Zero, \r
@@ -2576,20 +2172,17 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Name (CTRX, Package (0x0B)\r
             {\r
-            // Methods (names are reversed) that are critical to\r
-            // system boot\r
-\r
                 "NSTC", \r
                 "HLCB", \r
-                "MMVD", // Discrete Vreg Mapping Package\r
-                "DSGP", //System Default Configuration, SDFR\r
-                "CCGP", // CPU Configuration\r
-                "MTPS", //Read the speaker calibration related parameters\r
-                "CPGP", // CPU cap for DCVS Package    \r
-                "DMPP", // PEP resources (usually dummy devices required for power mgmt)\r
+                "MMVD", \r
+                "DSGP", \r
+                "CCGP", \r
+                "MTPS", \r
+                "CPGP", \r
+                "DMPP", \r
                 "VRDL", \r
-                "GBDL", // Debugger configuration -- must be below DSGP (reading SDFR)\r
-                "SRDL"  // Default resources -- must be below DSGP (reading SDFR)\r
+                "GBDL", \r
+                "SRDL"\r
             })\r
             Method (STND, 0, NotSerialized)\r
             {\r
@@ -2598,15 +2191,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Name (STNX, Package (0x19)\r
             {\r
-                // Power resources for devices\r
-                // Names are reversed (so method OCMD becomes DMCO)\r
-                //\r
-                // Following format must be followed for name:\r
-                // DMxx -- Exists on QCOM SoC. Will use normal PoFX for power mgmt\r
-                // XMxx -- Exists off QCOM SoC and uses legacy power mgmt (_PS1, _PS2, etc)\r
-                //\r
-                // The files where these methods are declared must be included\r
-                // at the bottom of this file and must exists inside the scope: \_SB.PEP0\r
                 "DMPO", \r
                 "DMSB", \r
                 "DMQP", \r
@@ -2633,9 +2217,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 "XMPL", \r
                 "DMEP"\r
             })\r
-            //\r
-            // Core topology\r
-            //\r
             Method (CTPM, 0, NotSerialized)\r
             {\r
                 Name (CTPN, Package (0x02)\r
@@ -2646,7 +2227,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (CTPN) /* \_SB_.PEP0.CTPM.CTPN */\r
             }\r
 \r
-            // CPU/Core Configurations Packages\r
             Name (CCFG, Package (0x08)\r
             {\r
                 Package (0x02)\r
@@ -2697,8 +2277,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     0x17\r
                 }\r
             })\r
-            // Method to return CPU configuration packages\r
-            // PEP Get CPU Configuration\r
             Method (PGCC, 0, NotSerialized)\r
             {\r
                 Return (CCFG) /* \_SB_.PEP0.CCFG */\r
@@ -2725,23 +2303,19 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (DRVC) /* \_SB_.PEP0.DRVC */\r
             }\r
 \r
-            // CPU cap for DCVS Packages\r
             Name (DCVS, Zero)\r
-\r
-            // Method to return CPU cap for DCVS Package\r
             Method (PGDS, 0, NotSerialized)\r
             {\r
                 Return (DCVS) /* \_SB_.PEP0.DCVS */\r
             }\r
 \r
-            // PPP Supported Resources Package\r
             Name (PPPP, Package (0x32)\r
             {\r
                 Package (0x03)\r
                 {\r
-                    "PPP_RESOURCE_ID_SMPS1_A", // Resource ID\r
-                    "PM_RESOURCE_SERVICE_INTERFACE_TYPE_RPMH", // Set Interface Type\r
-                    "PM_RESOURCE_SERVICE_INTERFACE_TYPE_PMIC_KMDF" // Get Interface Type\r
+                    "PPP_RESOURCE_ID_SMPS1_A", \r
+                    "PM_RESOURCE_SERVICE_INTERFACE_TYPE_RPMH", \r
+                    "PM_RESOURCE_SERVICE_INTERFACE_TYPE_PMIC_KMDF"\r
                 }, \r
 \r
                 Package (0x03)\r
@@ -3087,18 +2661,16 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     "PM_RESOURCE_SERVICE_INTERFACE_TYPE_PMIC_KMDF"\r
                 }\r
             })\r
-            // Method to return PPP Package\r
             Method (PPPM, 0, NotSerialized)\r
             {\r
                 Return (PPPP) /* \_SB_.PEP0.PPPP */\r
             }\r
 \r
-            // Method to return System Default config packages\r
             Name (PRRP, Package (0x12)\r
             {\r
-                "PPP_RESOURCE_RANGE_INFO_SMPS_A", // Resource type range\r
-                "PPP_RESOURCE_ID_SMPS1_A", // Initial supported resource\r
-                "PPP_RESOURCE_ID_SMPS13_A", // Last supported resource\r
+                "PPP_RESOURCE_RANGE_INFO_SMPS_A", \r
+                "PPP_RESOURCE_ID_SMPS1_A", \r
+                "PPP_RESOURCE_ID_SMPS13_A", \r
                 "PPP_RESOURCE_RANGE_INFO_SMPS_C", \r
                 "PPP_RESOURCE_ID_SMPS1_C", \r
                 "PPP_RESOURCE_ID_SMPS4_C", \r
@@ -3115,32 +2687,23 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 "PPP_RESOURCE_ID_BUCK_BOOST1_B", \r
                 "PPP_RESOURCE_ID_BUCK_BOOST1_B"\r
             })\r
-            // Method to return Pep Ppp Resource Range Package\r
             Method (PPRR, 0, NotSerialized)\r
             {\r
                 Return (PRRP) /* \_SB_.PEP0.PRRP */\r
             }\r
 \r
-            // Method to return System Default config packages\r
-            // PEP Get System Default package\r
             Method (PGSD, 0, NotSerialized)\r
             {\r
                 Return (SDFR) /* \_SB_.PEP0.SDFR */\r
             }\r
 \r
-            // Full PEP Device Package\r
             Name (FPDP, Zero)\r
-            // Method to return Full PEP Managed Device List Package\r
             Method (FPMD, 0, NotSerialized)\r
             {\r
                 Return (FPDP) /* \_SB_.PEP0.FPDP */\r
             }\r
 \r
-            // \r
-            // PEP Processor Performance configuration \r
-            // CPU cap for DCVS Packages\r
             Name (PPPC, Zero)\r
-            // Method to return CPU cap for DCVS Package\r
             Method (PGPC, 0, NotSerialized)\r
             {\r
                 Return (PPPC) /* \_SB_.PEP0.PPPC */\r
@@ -3150,11 +2713,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Return (\_SB.DPP0)\r
             }\r
-/*\r
+\r
             Method (DMRF, 0, NotSerialized)\r
             {\r
                 Return (\_SB.DPP1)\r
-            }*/\r
+            }\r
         }\r
 \r
         Scope (\_SB.PEP0)\r
@@ -3164,7 +2727,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (NPDC) /* \_SB_.PEP0.NPDC */\r
             }\r
 \r
-            Name (NPDC, Package (0x01)\r
+            Name (NPDC, Package (One)\r
             {\r
                 Package (0x02)\r
                 {\r
@@ -3371,7 +2934,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (NLMH) /* \_SB_.PEP0.NLMH */\r
             }\r
 \r
-            Name (NLMH, Package (0x01)\r
+            Name (NLMH, Package (One)\r
             {\r
                 Package (0x03)\r
                 {\r
@@ -3401,89 +2964,82 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Scope (\_SB.PEP0)\r
         {\r
-            // Discrete Vreg Mapping Package\r
             Name (DVMP, Package (0x02)\r
             {\r
-                // Virtual regulator to aggregate GPIO pin control of CHIP_PWD_L\r
-                // CHIP_PWD_L must be deasserted for BT to share a clock with AR6004\r
-                // BT and WLAN devices will take a vote on this virtual regulator to\r
-                // control the shared GPIO pin\r
                 Package (0x04)\r
                 {\r
-                    "PPP_RESOURCE_ID_PMIC_GPIO_DV1", // Discrete Vreg ID\r
-                    "PPP_RESOURCE_TYPE_DISCRETE_PMIC_GPIO", // Vreg type\r
+                    "PPP_RESOURCE_ID_PMIC_GPIO_DV1", \r
+                    "PPP_RESOURCE_TYPE_DISCRETE_PMIC_GPIO", \r
                     Package (0x02)\r
                     {\r
-                        "PM_DISCRETE_VREG_STATE_ON", // Mapping for VREG ON\r
+                        "PM_DISCRETE_VREG_STATE_ON", \r
                         Package (0x0A)\r
                         {\r
-                            Zero,  // pmic_number (PM8994) - must match pmic.asl\r
-                            0x08, // gpio_id - GPIO #9\r
-                            Zero,  // Mode - GPIO configured as output - 0, 1 for input\r
-                            Zero,  // voltage_source - PM_GPIO_VIN0\r
-                            One,  // source - PM_GPIO_SOURCE_1 (drive logic HIGH)\r
-                            Zero,  // out_buffer_config - PM_GPIO_OUT_BUFFER_CONFIG_CMOS \r
-                            One,  // out_buffer_strength - PM_GPIO_OUT_BUFFER_LOW\r
-                            Zero,  // inversion � no invert\r
-                            One,  // External pin enable - PM_GPIO_PERPH_EN_ENABLE\r
-                            0x05 // PM_GPIO_I_SOURCE_PULL_NO_PULL, ignored for Output mode.\r
+                            Zero, \r
+                            0x08, \r
+                            Zero, \r
+                            Zero, \r
+                            One, \r
+                            Zero, \r
+                            One, \r
+                            Zero, \r
+                            One, \r
+                            0x05\r
                         }\r
                     }, \r
 \r
                     Package (0x02)\r
                     {\r
-                        "PM_DISCRETE_VREG_STATE_OFF", // Mapping for VREG OFF\r
+                        "PM_DISCRETE_VREG_STATE_OFF", \r
                         Package (0x0A)\r
                         {\r
-                            Zero,  // pmic_number 0\r
-                            0x08, // gpio_id - GPIO #9\r
-                            Zero,  // Mode - GPIO configured as output - 0, 1 for input\r
-                            Zero,  // voltage_source - PM_GPIO_VIN0\r
-                            Zero,  // source - PM_GPIO_SOURCE_0 (drive logic LOW)\r
-                            Zero,  // out_buffer_config - PM_GPIO_OUT_BUFFER_CONFIG_CMOS \r
-                            One,  // out_buffer_strength - PM_GPIO_OUT_BUFFER_LOW\r
-                            Zero,  // inversion � no invert\r
-                            One,  // External pin enable - PM_GPIO_PERPH_EN_ENABLE\r
-                            0x05 // PM_GPIO_I_SOURCE_PULL_NO_PULL, ignored for Output mode.\r
+                            Zero, \r
+                            0x08, \r
+                            Zero, \r
+                            Zero, \r
+                            Zero, \r
+                            Zero, \r
+                            One, \r
+                            Zero, \r
+                            One, \r
+                            0x05\r
                         }\r
                     }\r
                 }, \r
 \r
-                //discrete vreg vote for MPP4\r
                 Package (0x04)\r
                 {\r
-                    "PPP_RESOURCE_ID_PMIC_MPP_DV1", // Discrete Vreg ID\r
-                    "PPP_RESOURCE_TYPE_DISCRETE_PMIC_MPP", // Vreg type\r
+                    "PPP_RESOURCE_ID_PMIC_MPP_DV1", \r
+                    "PPP_RESOURCE_TYPE_DISCRETE_PMIC_MPP", \r
                     Package (0x02)\r
                     {\r
-                        "PM_DISCRETE_VREG_STATE_ON", // Mapping for VREG ON\r
+                        "PM_DISCRETE_VREG_STATE_ON", \r
                         Package (0x06)\r
                         {\r
-                            Zero, // PMIC number\r
-                            0x03, // MPP index (mpp #4)\r
-                            Zero, // Direction, 0 - output\r
-                            0x02, // VIO_2\r
-                            One, // PM_MPP__DLOGIC__OUT_CTRL_HIGH\r
-                            Zero // PM_MPP__DLOGIC__DBUS_NONE\r
+                            Zero, \r
+                            0x03, \r
+                            Zero, \r
+                            0x02, \r
+                            One, \r
+                            Zero\r
                         }\r
                     }, \r
 \r
                     Package (0x02)\r
                     {\r
-                        "PM_DISCRETE_VREG_STATE_OFF", // Mapping for VREG OFF\r
+                        "PM_DISCRETE_VREG_STATE_OFF", \r
                         Package (0x06)\r
                         {\r
-                            Zero,  // PMIC number\r
-                            0x03,  // MPP index (mpp #4)\r
-                            Zero,  // Direction, 0 - output\r
-                            0x02,  // VIO_2\r
-                            Zero,  // PM_MPP__DLOGIC__OUT_CTRL_LOW\r
-                            Zero  // PM_MPP__DLOGIC__DBUS_NONE\r
+                            Zero, \r
+                            0x03, \r
+                            Zero, \r
+                            0x02, \r
+                            Zero, \r
+                            Zero\r
                         }\r
                     }\r
                 }\r
             })\r
-            // Method to return Discrete Vreg Mapping Package\r
             Method (DVMM, 0, NotSerialized)\r
             {\r
                 Return (DVMP) /* \_SB_.PEP0.DVMP */\r
@@ -3497,29 +3053,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (NDBG) /* \_SB_.PEP0.NDBG */\r
             }\r
 \r
-            Name (NDBG, \r
-                /**\r
-                * The debuggers package is used by PEP to detect when a debugger is connected,\r
-                * turn on the required power resources for a debugger and to turn off all \r
-                * debugger related resources when not in use (this logic is encompassed in PEP).\r
-                *\r
-                * The expected hiearchy of this package:\r
-                * DEBUGGERS\r
-                *      TYPE\r
-                *          String = SERIAL, USB2.0, USB3.0\r
-                *          INSTANCES\r
-                *              The instancepath of the drivers which the debugger impersonates\r
-                *          DEBUG_ON\r
-                *              The resources that need to be turned on for the debugger to work\r
-                *              for the given controller type (SERIAL/USB2.0/USB3.0)\r
-                *          DEBUG_OFF\r
-                *              The resources to turn off when no debugger is connected for this\r
-                *              debugger type and no HLOS driver is loaded for any one of the given\r
-                *              HLOS types. The implementation for this feature is documented within\r
-                *              PEP.\r
-                *\r
-                */\r
-            Package (0x04)\r
+            Name (NDBG, Package (0x04)\r
             {\r
                 "DEBUGGERS", \r
                 Package (0x05)\r
@@ -4390,7 +3924,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // default resource information\r
+\r
         Scope (\_SB.PEP0)\r
         {\r
             Method (LDRS, 0, NotSerialized)\r
@@ -4398,25 +3932,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (NDRS) /* \_SB_.PEP0.NDRS */\r
             }\r
 \r
-            Name (NDRS, \r
-                /**\r
-                * The default resources package is used by PEP to handle system default resources.\r
-                * Rather than having to declare them all in the SDF declaration, you define resources\r
-                * separately and annotate them by functionality. At runtime, the parsed resources\r
-                * will be placed into separate components within the SDF device node.\r
-                *\r
-                * The expected hiearchy of this package:\r
-                * DEFAULT_RESOURCES\r
-                *      (WORKAROUND|OPTIMIZATION)\r
-                *      String = Name\r
-                *          For debugging and querying -- keep it short\r
-                *      String = "BOOT", "SCREENON", "DEMAND"\r
-                *          When to activate these resources\r
-                *      RESOURCES\r
-                *          The list of resources to activate for this set workaround / optimization\r
-                *\r
-                */\r
-            Package (0x03)\r
+            Name (NDRS, Package (0x03)\r
             {\r
                 "DEFAULT_RESOURCES", \r
                 Package (0x04)\r
@@ -4515,9 +4031,9 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Package (0x08)\r
                 {\r
                     "LPR", \r
-                    "KryoSilver0", // LPR Name\r
-                    Zero, // LPR Core Mask (0xFFFFFFFF is coordinated)\r
-                    Zero, //LastMan Adder\r
+                    "KryoSilver0", \r
+                    Zero, \r
+                    Zero, \r
                     Package (0x07)\r
                     {\r
                         "MODE", \r
@@ -4543,12 +4059,12 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     Package (0x07)\r
                     {\r
                         "MODE", \r
-                        "C3", // Mode name\r
+                        "C3", \r
                         0x0BB8, \r
                         0x1194, \r
                         0x03, \r
                         Zero, \r
-                        0x40000003 // Mode PSCI Flags \r
+                        0x40000003\r
                     }, \r
 \r
                     Package (0x07)\r
@@ -6666,7 +6182,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (PEPH, 0, NotSerialized)\r
             {\r
-                Return (Package (0x01)\r
+                Return (Package (One)\r
                 {\r
                     "ACPI\\VEN_QCOM&DEV_0237"\r
                 })\r
@@ -6674,7 +6190,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (BCLH, 0, NotSerialized)\r
             {\r
-                Return (Package (0x01)\r
+                Return (Package (One)\r
                 {\r
                     "ACPI\\VEN_QCOM&DEV_0294"\r
                 })\r
@@ -6877,9 +6393,9 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }, \r
 \r
-                Package (0x05)\r
+                Package (0x09)\r
                 {\r
-                    0x04\r
+                    0x08\r
                     Package (0x04)\r
                     {\r
                         "SYS_THERM1", \r
@@ -6887,7 +6403,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Zero, \r
                         Zero\r
                     }, \r
-#if 0\r
+\r
                     Package (0x04)\r
                     {\r
                         "SYS_THERM2", \r
@@ -6895,12 +6411,12 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         One, \r
                         Zero\r
                     }, \r
-#endif\r
+\r
                     Package (0x04)\r
                     {\r
                         "PA_THERM", \r
                         "ACPI\\VEN_QCOM&DEV_029B", \r
-                        0x01\r
+                        0x02\r
                         Zero\r
                     }, \r
 \r
@@ -6908,11 +6424,10 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         "PA_THERM1", \r
                         "ACPI\\VEN_QCOM&DEV_029C", \r
-                        0x02\r
+                        0x03\r
                         Zero\r
                     }, \r
 \r
-#if 0\r
                     Package (0x04)\r
                     {\r
                         "SYS_THERM3", \r
@@ -6920,31 +6435,30 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         0x04, \r
                         Zero\r
                     }, \r
-#endif\r
 \r
                     Package (0x04)\r
                     {\r
                         "PMIC_THERM", \r
                         "ACPI\\VEN_QCOM&DEV_029E", \r
-                        0x03\r
+                        0x05\r
                         Zero\r
                     }, \r
-#if 0\r
+\r
                     Package (0x04)\r
                     {\r
                         "BAT_THERM", \r
                         "ACPI\\VEN_QCOM&DEV_029F", \r
-                        0x04\r
+                        0x06\r
                         Zero\r
                     }, \r
+\r
                     Package (0x04)\r
                     {\r
                         "RF_THERM", \r
                         "ACPI\\VEN_QCOM&DEV_02A0", \r
-                        0x05\r
+                        0x07\r
                         Zero\r
                     }\r
-#endif\r
                 }, \r
 \r
                 Package (0x02)\r
@@ -6992,7 +6506,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }, \r
 \r
-                Package (0x01)\r
+                Package (One)\r
                 {\r
                     Zero\r
                 }, \r
@@ -7054,10 +6568,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Scope (\_SB.PEP0)\r
         {\r
-            // Defined in pep_common.asl for audio resources under method STND (Name STNX)\r
             Method (APMD, 0, NotSerialized)\r
             {\r
-                // We return object named APCC - defined below for audio resources\r
                 Return (APCC) /* \_SB_.PEP0.APCC */\r
             }\r
 \r
@@ -7065,7 +6577,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Package (0x1A)\r
                 {\r
-                    // These resources are for Codec hardware\r
                     "DEVICE", \r
                     "\\_SB.ADSP.SLM1.ADCM.AUDD", \r
                     Package (0x05)\r
@@ -7576,45 +7087,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-//#if 0\r
         Scope (\_SB.PEP0)\r
         {\r
-            //-----------------------------------------------------------------------------------------\r
-            //  GRAPHICS, DISPLAY, and VIDEO resources\r
-            //\r
-            //  !!WARNING: The below table entries are auto-generated and are part of several\r
-            //             interdependent ACPI methods that are all auto-generated from a single source.\r
-            //             These components should NOT be edited by hand, as they must stay in sync\r
-            //             with all other dependent graphics methods.\r
-            //-----------------------------------------------------------------------------------------\r
-            //  OWNING DRIVER: qcdxkm850.sys\r
-            //\r
-            //  HW CONTROLLED: 3D core\r
-            //                 MDP core\r
-            //                 Internal display circuitry\r
-            //                 HDMI circuitry\r
-            //                 Rotator core\r
-            //                 Video Decode core\r
-            //                 ...\r
-            //\r
-            //  COMPONENTS:\r
-            //                 C0\r
-            //                 C1\r
-            //                 C2\r
-            //                 C3\r
-            //                 C4\r
-            //                 C5\r
-            //                 C6\r
-            //                 C7\r
-            //                 C8\r
-            //                 C9\r
-            //-----------------------------------------------------------------------------------------\r
-            //\r
-            \r
-            //--------------------------------------------------------------------------------------\r
-            //  Complete list of individual component methods\r
-            //--------------------------------------------------------------------------------------\r
-            //\r
             Method (GPMD, 0, NotSerialized)\r
             {\r
                 Name (LIST, Package (0x0B)\r
@@ -7636,7 +7110,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G0MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -7659,7 +7133,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x12)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -7901,7 +7375,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }, \r
@@ -7989,7 +7463,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     Package (0x02)\r
                                     {\r
                                         "DELAY", \r
-                                        Package (0x01)\r
+                                        Package (One)\r
                                         {\r
                                             0x0A\r
                                         }\r
@@ -8053,7 +7527,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     Package (0x02)\r
                                     {\r
                                         "DELAY", \r
-                                        Package (0x01)\r
+                                        Package (One)\r
                                         {\r
                                             0x96\r
                                         }\r
@@ -10838,7 +10312,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G1MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -11108,7 +10582,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     Package (0x02)\r
                                     {\r
                                         "DELAY", \r
-                                        Package (0x01)\r
+                                        Package (One)\r
                                         {\r
                                             One\r
                                         }\r
@@ -11245,7 +10719,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G2MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -11268,7 +10742,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x0B)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -11443,7 +10917,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }\r
@@ -11457,7 +10931,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x0F)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -11712,7 +11186,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }\r
@@ -13172,7 +12646,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G3MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -13195,7 +12669,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x0C)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -13390,7 +12864,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }, \r
@@ -13414,7 +12888,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x10)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -13689,7 +13163,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }, \r
@@ -15009,7 +14483,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G4MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -15205,7 +14679,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x13)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -15610,7 +15084,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }\r
@@ -15722,7 +15196,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     Package (0x02)\r
                                     {\r
                                         "DELAY", \r
-                                        Package (0x01)\r
+                                        Package (One)\r
                                         {\r
                                             One\r
                                         }\r
@@ -18440,7 +17914,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G5MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -18586,7 +18060,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G6MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -18782,7 +18256,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x13)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -19187,7 +18661,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }\r
@@ -19299,7 +18773,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     Package (0x02)\r
                                     {\r
                                         "DELAY", \r
-                                        Package (0x01)\r
+                                        Package (One)\r
                                         {\r
                                             One\r
                                         }\r
@@ -22017,7 +21491,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G7MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -22040,7 +21514,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x09)\r
                                 {\r
                                     "ENTER", \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -22159,7 +21633,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }\r
@@ -24933,7 +24407,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G8MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -25134,7 +24608,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_SAVE"\r
                                     }, \r
@@ -25402,7 +24876,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         {\r
                                             "PPP_RESOURCE_ID_LDO24_A", \r
                                             One, \r
-                                            0x002EEBB8\r
+                                            0x002F1E80\r
                                             One, \r
                                             0x07, \r
                                             Zero, \r
@@ -25427,7 +24901,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                         }\r
                                     }, \r
 \r
-                                    Package (0x01)\r
+                                    Package (One)\r
                                     {\r
                                         "PSTATE_RESTORE"\r
                                     }\r
@@ -27338,7 +26812,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (G9MD, 0, NotSerialized)\r
             {\r
-                Name (GPCC, Package (0x01)\r
+                Name (GPCC, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
@@ -27378,11 +26852,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        // BearSmmu\r
         Scope (\_SB.PEP0)\r
         {\r
-            // BearSmmu Resources\r
-            //\r
             Method (SMMD, 0, NotSerialized)\r
             {\r
                 Return (SMMC) /* \_SB_.PEP0.SMMC */\r
@@ -27492,10 +26963,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // resources needed by oem drivers\r
         Scope (\_SB.PEP0)\r
         {\r
-            // OEM\r
             Method (OPMD, 0, NotSerialized)\r
             {\r
                 Return (OPCC) /* \_SB_.PEP0.OPCC */\r
@@ -27532,7 +27001,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             {\r
                                 "PPP_RESOURCE_ID_LDO18_A", \r
                                 One, \r
-                                0x001B7740, \r
+                                0x002D2A80, \r
                                 One, \r
                                 One, \r
                                 Zero\r
@@ -27542,7 +27011,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x14\r
                             }\r
@@ -27565,7 +27034,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x78\r
                             }\r
@@ -27607,7 +27076,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x14\r
                             }\r
@@ -27654,7 +27123,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x0A\r
                             }\r
@@ -27693,7 +27162,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x0A\r
                             }\r
@@ -27734,7 +27203,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x0A\r
                             }\r
@@ -27750,10 +27219,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // resources needed by subsystem drivers\r
         Scope (\_SB.PEP0)\r
         {\r
-            // Subsystem Drivers\r
             Method (SPMD, 0, NotSerialized)\r
             {\r
                 Return (SPCC) /* \_SB_.PEP0.SPCC */\r
@@ -27768,17 +27235,17 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     Package (0x06)\r
                     {\r
                         "COMPONENT", \r
-                        Zero, // Component 0.\r
+                        Zero, \r
                         Package (0x02)\r
                         {\r
                             "FSTATE", \r
-                            Zero // f0 state\r
+                            Zero\r
                         }, \r
 \r
                         Package (0x0D)\r
                         {\r
                             "PSTATE", \r
-                            Zero, // P0 state\r
+                            Zero, \r
                             Package (0x02)\r
                             {\r
                                 "CLOCK", \r
@@ -28280,7 +27747,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // resources needed by pep drivers\r
         Scope (\_SB.PEP0)\r
         {\r
             Method (PPMD, 0, NotSerialized)\r
@@ -28306,7 +27772,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }, \r
 \r
-                // PEP Stats Driver\r
                 Package (0x03)\r
                 {\r
                     "DEVICE", \r
@@ -28351,9 +27816,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }\r
             })\r
-#if 0\r
-            // System Default Resources Packages\r
-            Name (SDFR, Package (0x01)\r
+            Name (SDFR, Package (One)\r
             {\r
                 Package (0x03)\r
                 {\r
@@ -28389,64 +27852,22 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }\r
             })\r
-#endif\r
         }\r
-//#endif\r
+\r
         Scope (\_SB.PEP0)\r
         {\r
-            // System Default Resources Packages\r
-            Name (SDFR, Package (0x01)\r
-            {\r
-                Package (0x03)\r
-                {\r
-                    "DEVICE", \r
-                    "\\_SB.SDFR", \r
-                    Package (0x06)\r
-                    {\r
-                        "COMPONENT", \r
-                        Zero, \r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            Zero\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            One\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            0x02\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            0x03\r
-                        }\r
-                    }\r
-                }\r
-            })\r
-#if 0\r
             Method (BPMD, 0, NotSerialized)\r
             {\r
                 Return (BPCC) /* \_SB_.PEP0.BPCC */\r
             }\r
-#endif\r
 \r
             Method (LPMD, 0, NotSerialized)\r
             {\r
                 Return (LPCC) /* \_SB_.PEP0.LPCC */\r
             }\r
 \r
-            // resources needed by core BSP drivers\r
             Name (BPCC, Package (0x04)\r
             {\r
-                // Storage\r
                 Package (0x05)\r
                 {\r
                     "DEVICE", \r
@@ -28894,7 +28315,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             {\r
                                 "PPP_RESOURCE_ID_LDO2_A", \r
                                 One, \r
-                                0x0012C4B0, \r
+                                0x00124F80, \r
                                 One, \r
                                 0x07, \r
                                 Zero\r
@@ -29968,7 +29389,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
             Name (LPCC, Package (0x07)\r
             {\r
-                Package (0x07)\r
+                               \r
+                               Package (0x07)\r
                 {\r
                     "DEVICE", \r
                     "\\_SB.UCP0", \r
@@ -30191,6 +29613,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         0x03\r
                     }\r
                 }, \r
+                \r
+                               \r
                 Package (0x07)\r
                 {\r
                     "DEVICE", \r
@@ -30205,7 +29629,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             Zero\r
                         }, \r
 \r
-                        Package (0x05)\r
+                        Package (0x06)\r
                         {\r
                             "PSTATE", \r
                             Zero, \r
@@ -30241,9 +29665,9 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     "gcc_usb_phy_cfg_ahb2phy_clk", \r
                                     One\r
                                 }\r
-                            }\r
+                            }\r
 \r
-                            /*Package (0x02)\r
+                            Package (0x02)\r
                             {\r
                                 "PMICVREGVOTE", \r
                                 Package (0x06)\r
@@ -30255,10 +29679,10 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     0x07, \r
                                     Zero\r
                                 }\r
-                            }*/\r
+                            }\r
                         }, \r
 \r
-                        Package (0x05)\r
+                        Package (0x06)\r
                         {\r
                             "PSTATE", \r
                             One, \r
@@ -30294,9 +29718,9 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     "/arc/client/rail_cx", \r
                                     Zero\r
                                 }\r
-                            }\r
+                            }\r
 \r
-                            /*Package (0x02)\r
+                            Package (0x02)\r
                             {\r
                                 "PMICVREGVOTE", \r
                                 Package (0x06)\r
@@ -30308,7 +29732,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                     0x07, \r
                                     Zero\r
                                 }\r
-                            }*/\r
+                            }\r
                         }\r
                     }, \r
 \r
@@ -32677,16 +32101,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // resources needed by ipa driver\r
-        //===========================================================================\r
-        // Implementation of function states for IPA driver.\r
-        // Present implementation has two function states F0 and F1.\r
-        //\r
-        // F0 = Full power mode.\r
-        // F1 = Low power mode.\r
-        //\r
-        // Resource being managed is /clk/ipa\r
-        //===========================================================================\r
+\r
         Scope (\_SB.PEP0)\r
         {\r
             Method (IPMD, 0, NotSerialized)\r
@@ -32694,7 +32109,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (IPSC) /* \_SB_.PEP0.IPSC */\r
             }\r
 \r
-            Name (IPSC, Package (0x01)\r
+            Name (IPSC, Package (One)\r
             {\r
                 Package (0x03)\r
                 {\r
@@ -33336,43 +32751,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // power management resources needed by qdss driver\r
-        //===========================================================================\r
-        // Description & Possible use cases for Qdss's  p-state implementation\r
-        // Qdss employs pstate-sets to robustly configure clock and tlmm registers\r
-        // pstate-set 0 has pstates for clock frequencies\r
-        // pstate-set 1 has pstates for managing tlmm registers for tpiu operation\r
-        // TPIU related data sourced from meta build's std_trace_msm8994.cmm; it can also\r
-        // be verified through TLMM GPIO assignment in ipcat and TLMM_GPIO_CFGn register\r
-        // bit assignments as documented in SWI. \r
-        // NOTE: elessar V1 and V2 have different TLMM GPIO pin/function assignments, so\r
-        //             register values should be updated for V2.\r
-        //========================================================\r
-        //      Sinks              p-states allowed\r
-        //--------------------------------------------------------\r
-        //     non-TPIU            P{0,0}\r
-        //                         P{0,1}\r
-        //                         P{0,2}\r
-        //                         P{0,3}\r
-        //       TPIU              P{0,0} AND (P{1,1} OR P{1,3})\r
-        //                         P{0,1} AND (P{1,0} OR P{1,2})\r
-        //                         P{0,2} AND (P{1,0} OR P{1,2})\r
-        //                         P{0,3} AND (P{1,0} OR P{1,2})\r
-        //\r
-        // Description of pstate-sets and corresponding p-states :\r
-        //  pstate-set-0 is the set with allowed qdss clock frequencies\r
-        //  under set-0 each p-state holds the following meaning:\r
-        //      pstate-0 CLOCK OFF (0 Hz)\r
-        //      pstate-1 SVS CLOCK FREQUENCY  (depends on the voltage; ranges 150 to 300 MHz)\r
-        //      pstate-2 HIGH CLOCK FREQUENCY (300 MHz)\r
-        //      pstate-3 LOW CLOCK FREQUENCY  (150 MHz)\r
-        //\r
-        //  under set-1 each p-state hold the following meaning:\r
-        //      pstate-0 sets SET-B TLMM registers to make TPIU operational\r
-        //      pstate-1 clears SET-B TLMM registers to make TPIU operational\r
-        //      pstate-2 sets SD TLMM registers to make TPIU operational\r
-        //      pstate-3 clears SD TLMM registers to make TPIU operational\r
-        //===========================================================================\r
         Scope (\_SB.PEP0)\r
         {\r
             Method (QDMD, 0, NotSerialized)\r
@@ -33380,7 +32758,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (QDSC) /* \_SB_.PEP0.QDSC */\r
             }\r
 \r
-            Name (QDSC, Package (0x01)\r
+            Name (QDSC, Package (One)\r
             {\r
                 Package (0x03)\r
                 {\r
@@ -34382,7 +33760,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // resources needed by camera drivers\r
         Scope (\_SB.PEP0)\r
         {\r
             Method (CPMX, 0, NotSerialized)\r
@@ -36848,7 +36225,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             {\r
                                 "PPP_RESOURCE_ID_LDO16_A", \r
                                 One, \r
-                                0x001B7740, \r
+                                0x00294280, \r
                                 One, \r
                                 One, \r
                                 Zero\r
@@ -36872,7 +36249,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x04\r
                             }\r
@@ -36895,7 +36272,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -36916,7 +36293,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -36957,7 +36334,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             {\r
                                 "PPP_RESOURCE_ID_LDO19_A", \r
                                 One, \r
-                                0x002AB980, \r
+                                0x002F5D00, \r
                                 One, \r
                                 One, \r
                                 Zero\r
@@ -36967,7 +36344,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -36990,7 +36367,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x02\r
                             }\r
@@ -37025,7 +36402,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37039,7 +36416,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37072,7 +36449,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37095,7 +36472,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37118,7 +36495,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37139,7 +36516,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37162,7 +36539,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37213,7 +36590,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37390,7 +36767,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             {\r
                                 "PPP_RESOURCE_ID_LDO16_A", \r
                                 One, \r
-                                0x001B7740, \r
+                                0x00294280, \r
                                 One, \r
                                 One, \r
                                 Zero\r
@@ -37414,7 +36791,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37437,7 +36814,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37486,7 +36863,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37509,7 +36886,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 0x02\r
                             }\r
@@ -37544,7 +36921,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37558,7 +36935,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37593,7 +36970,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37616,7 +36993,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37637,7 +37014,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37660,7 +37037,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37711,7 +37088,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37900,7 +37277,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37921,7 +37298,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37934,7 +37311,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             {\r
                                 "PPP_RESOURCE_ID_LDO22_A", \r
                                 One, \r
-                                0x002AB980, \r
+                                0x00328980, \r
                                 One, \r
                                 0x07, \r
                                 Zero\r
@@ -37944,7 +37321,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37967,7 +37344,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -37990,7 +37367,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -38011,7 +37388,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -38035,7 +37412,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -38058,7 +37435,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -38081,7 +37458,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DELAY", \r
-                            Package (0x01)\r
+                            Package (One)\r
                             {\r
                                 One\r
                             }\r
@@ -38205,7 +37582,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Scope (\_SB.PEP0)\r
         {\r
-            // CAMERA\r
             Method (CPMD, 0, NotSerialized)\r
             {\r
                 Return (CPCC) /* \_SB_.PEP0.CPCC */\r
@@ -44520,15 +43896,12 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // resources needed by touch driver\r
-        Scope (\_SB.PEP0)\r
+               Scope (\_SB.PEP0)\r
         {\r
-//#if 0\r
             Method (LPMX, 0, NotSerialized)\r
             {\r
                 Return (LPXC) /* \_SB_.PEP0.LPXC */\r
             }\r
-//#endif\r
 \r
             Name (LPXC, Package (0x01)\r
             {\r
@@ -44708,7 +44081,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // Bus Access Modules (BAM)\r
         Device (BAM1)\r
         {\r
             Name (_HID, "QCOM0213")  // _HID: Hardware ID\r
@@ -44875,7 +44247,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_HID, "QCOM0236")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, 0x07)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.PEP0\r
             })\r
@@ -44904,7 +44276,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
             Method (_STA, 0, NotSerialized)  // _STA: Status\r
             {\r
-                Return (0x0B)\r
+                Return (0x0F)\r
             }\r
         }\r
 \r
@@ -44913,7 +44285,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_HID, "QCOM0236")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, 0x0A)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.PEP0\r
             })\r
@@ -44941,39 +44313,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        Device (I2C1)\r
-        {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0, \r
-                \_SB.QGP0\r
-            })\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x00880000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x00000279,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.I2C1._CRS.RBUF */\r
-            }\r
-        }\r
-\r
-        Device (I2C3)\r
+        /*Device (I2C4)\r
         {\r
             Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, 0x03)  // _UID: Unique ID\r
+            Name (_UID, 0x04)  // _UID: Unique ID\r
             Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
             {\r
                 \_SB.PEP0, \r
@@ -44981,34 +44325,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
             Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x00888000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x0000027B,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.I2C3._CRS.RBUF */\r
-            }\r
-        }\r
-\r
-        Device (I2C4)\r
-        {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, 0x04)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0//, \r
-                //\_SB.QGP0\r
-            })\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
@@ -45021,43 +44337,15 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         0x0000027C,\r
                     }\r
                 })\r
-                Return (RBUF) /* \_SB_.I2C4._CRS.RBUF */\r
-            }\r
-        }\r
-\r
-        Device (I2C5)\r
-        {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, 0x05)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0, \r
-                \_SB.QGP0\r
-            })\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x00890000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x0000027D,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.I2C5._CRS.RBUF */\r
+                Return (RBUF) // \_SB_.I2C4._CRS.RBUF \r
             }\r
-        }\r
+        }*/\r
 \r
-        Device (I2C8)\r
+        /*Device (IC11)\r
         {\r
             Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, 0x08)  // _UID: Unique ID\r
+            Name (_UID, 0x0B)  // _UID: Unique ID\r
             Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
             {\r
                 \_SB.PEP0, \r
@@ -45065,34 +44353,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
             Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0089C000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x00000280,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.I2C8._CRS.RBUF */\r
-            }\r
-        }\r
-\r
-        Device (IC11)\r
-        {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, 0x0B)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0//, \r
-                //\_SB.QGP0\r
-            })\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
@@ -45105,46 +44365,19 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         0x00000183,\r
                     }\r
                 })\r
-                Return (RBUF) /* \_SB_.IC11._CRS.RBUF */\r
-            }\r
-        }\r
-\r
-        Device (IC12)\r
-        {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, 0x0C)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0, \r
-                \_SB.QGP0\r
-            })\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x00A8C000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x00000184,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.IC12._CRS.RBUF */\r
+                Return (RBUF) // \_SB_.IC11._CRS.RBUF \r
             }\r
-        }\r
+        }*/\r
 \r
-        Device (IC13)\r
+               Device (IC13)\r
         {\r
             Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, 0x0D)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
             {\r
-                \_SB.PEP0\r
+                \_SB.PEP0,\r
+                               \_SB.QGP0\r
             })\r
             Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
@@ -45164,59 +44397,23 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        Device (IC15)\r
-        {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
-            Name (_UID, 0x0F)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0, \r
-                \_SB.QGP0\r
-            })\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x00A98000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x00000187,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.IC15._CRS.RBUF */\r
-            }\r
-        }\r
 \r
-        Device (IC16)\r
-        {\r
-            Name (_HID, "QCOM0220")  // _HID: Hardware ID\r
-            Name (_UID, 0x10)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0, \r
-                \_SB.QGP0\r
-            })\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x00A9C000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x00000188,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.IC16._CRS.RBUF */\r
-            }\r
-        }\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
 \r
         Device (SPI9)\r
         {\r
@@ -45246,9 +44443,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        //  PEP resources for buses\r
-        //\r
         Scope (\_SB.PEP0)\r
         {\r
             Method (BSMD, 0, NotSerialized)\r
@@ -45268,7 +44462,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 }\r
             }\r
 \r
-            Name (BSRC, Package (0x0C)\r
+            Name (BSRC, Package (0x0B)\r
             {\r
                 Package (0x04)\r
                 {\r
@@ -46505,254 +45699,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }, \r
 \r
-                Package (0x07)\r
-                {\r
-                    "DEVICE", \r
-                    "\\_SB.I2C3", \r
-                    Package (0x03)\r
-                    {\r
-                        "COMPONENT", \r
-                        Zero, \r
-                        Package (0x02)\r
-                        {\r
-                            "FSTATE", \r
-                            Zero\r
-                        }\r
-                    }, \r
-\r
-                    Package (0x0B)\r
-                    {\r
-                        "DSTATE", \r
-                        Zero, \r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_BLSP_1", \r
-                                "ICBID_SLAVE_EBI1", \r
-                                0x53724E00, \r
-                                0x0682\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_APPSS_PROC", \r
-                                "ICBID_SLAVE_BLSP_1", \r
-                                0x08D24D00, \r
-                                0x02FAF080\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap_0_m_ahb_clk", \r
-                                One\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap_0_s_ahb_clk", \r
-                                One\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x04)\r
-                            {\r
-                                "gcc_qupv3_wrap0_s2_clk", \r
-                                0x08, \r
-                                0x0124F800, \r
-                                0x04\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap0_core_2x_clk", \r
-                                One\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap0_core_clk", \r
-                                One\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
-                            {\r
-                                0x1B, \r
-                                One, \r
-                                One, \r
-                                One, \r
-                                0x03, \r
-                                Zero\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
-                            {\r
-                                0x1C, \r
-                                One, \r
-                                One, \r
-                                One, \r
-                                0x03, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
-\r
-                    Package (0x02)\r
-                    {\r
-                        "DSTATE", \r
-                        One\r
-                    }, \r
-\r
-                    Package (0x02)\r
-                    {\r
-                        "DSTATE", \r
-                        0x02\r
-                    }, \r
-\r
-                    Package (0x0B)\r
-                    {\r
-                        "DSTATE", \r
-                        0x03, \r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap_0_m_ahb_clk", \r
-                                0x02\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap_0_s_ahb_clk", \r
-                                0x02\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap0_s2_clk", \r
-                                0x02\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap0_core_2x_clk", \r
-                                0x02\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap0_core_clk", \r
-                                0x02\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_BLSP_1", \r
-                                "ICBID_SLAVE_EBI1", \r
-                                Zero, \r
-                                Zero\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_APPSS_PROC", \r
-                                "ICBID_SLAVE_BLSP_1", \r
-                                Zero, \r
-                                Zero\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
-                            {\r
-                                0x1B, \r
-                                Zero, \r
-                                Zero, \r
-                                Zero, \r
-                                0x03, \r
-                                Zero\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "TLMMGPIO", \r
-                            Package (0x06)\r
-                            {\r
-                                0x1C, \r
-                                Zero, \r
-                                Zero, \r
-                                Zero, \r
-                                0x03, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }\r
-                }, \r
-\r
                 Package (0x07)\r
                 {\r
                     "DEVICE", \r
@@ -48008,36 +46954,10 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         }\r
                     }, \r
 \r
-                    Package (0x0B)\r
+                    Package (0x09)\r
                     {\r
                         "DSTATE", \r
                         Zero, \r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_BLSP_2", \r
-                                "ICBID_SLAVE_EBI1", \r
-                                0x53724E00, \r
-                                0x0682\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "BUSARB", \r
-                            Package (0x05)\r
-                            {\r
-                                0x03, \r
-                                "ICBID_MASTER_APPSS_PROC", \r
-                                "ICBID_SLAVE_BLSP_2", \r
-                                0x08D24D00, \r
-                                0x02FAF080\r
-                            }\r
-                        }, \r
-\r
                         Package (0x02)\r
                         {\r
                             "CLOCK", \r
@@ -48072,21 +46992,27 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                         Package (0x02)\r
                         {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
+                            "BUSARB", \r
+                            Package (0x05)\r
                             {\r
-                                "gcc_qupv3_wrap1_core_2x_clk", \r
-                                One\r
+                                0x03, \r
+                                "ICBID_MASTER_BLSP_2", \r
+                                "ICBID_SLAVE_EBI1", \r
+                                0x53724E00, \r
+                                0x0682\r
                             }\r
                         }, \r
 \r
                         Package (0x02)\r
                         {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
+                            "BUSARB", \r
+                            Package (0x05)\r
                             {\r
-                                "gcc_qupv3_wrap1_core_clk", \r
-                                One\r
+                                0x03, \r
+                                "ICBID_MASTER_APPSS_PROC", \r
+                                "ICBID_SLAVE_BLSP_2", \r
+                                0x08D24D00, \r
+                                0x02FAF080\r
                             }\r
                         }, \r
 \r
@@ -48131,7 +47057,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         0x02\r
                     }, \r
 \r
-                    Package (0x0B)\r
+                    Package (0x09)\r
                     {\r
                         "DSTATE", \r
                         0x03, \r
@@ -48165,26 +47091,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             }\r
                         }, \r
 \r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap1_core_2x_clk", \r
-                                0x02\r
-                            }\r
-                        }, \r
-\r
-                        Package (0x02)\r
-                        {\r
-                            "CLOCK", \r
-                            Package (0x02)\r
-                            {\r
-                                "gcc_qupv3_wrap1_core_clk", \r
-                                0x02\r
-                            }\r
-                        }, \r
-\r
                         Package (0x02)\r
                         {\r
                             "BUSARB", \r
@@ -48239,7 +47145,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             }\r
                         }\r
                     }\r
-                }, \r
+                },\r
 \r
                 Package (0x07)\r
                 {\r
@@ -48737,7 +47643,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }\r
             })\r
-            Name (DFS1, Package (0x01)\r
+            Name (DFS1, Package (One)\r
             {\r
                 Package (0x07)\r
                 {\r
@@ -49160,7 +48066,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     }\r
                 }\r
             })\r
-            Name (DFS2, Package (0x01)\r
+            Name (DFS2, Package (One)\r
             {\r
                 Package (0x07)\r
                 {\r
@@ -49585,16 +48491,12 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        // RPE Subsystem Notifier (RPEN) \r
         Device (RPEN)\r
         {\r
             Name (_HID, "QCOM026D")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
         }\r
 \r
-        //\r
-        // Peripheral Image Loader (PIL) Driver\r
-        //\r
         Device (PILC)\r
         {\r
             Name (_HID, "QCOM023B")  // _HID: Hardware ID\r
@@ -49603,58 +48505,27 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (PILP) /* \_SB_.PILC.PILP */\r
             }\r
 \r
-            Name (PILP, Package (0x01)\r
+            Name (PILP, Package (One)\r
             {\r
-                // Methods needed for PIL bootup proceedure\r
-                // Drive will parse this list and call each \r
-                // method accordingly\r
                 "OPCA"\r
             })\r
-            Method(ACPO, 0x0, NotSerialized)\r
-            {\r
-                Name(PKGG, Package(0x1)\r
-                {\r
-                    Package(0x3)\r
-                    {\r
-                        // Represents MBA subsystem\r
-                        Zero,\r
-                        Zero,\r
-                        Buffer(0x10)\r
-                        {\r
-       0x6d, 0x76, 0x58, 0xba, 0xf2, 0xab, 0x02, 0x44, 0x88, 0xd7, 0x90, 0xab,\r
-       0x24, 0x3f, 0x6c, 0x77\r
-                        }\r
-                    }\r
-                })\r
-                // Copy ACPI globals for Address for this subsystem into above package for use in driver\r
-                Store(RMTB, Index(DerefOf(Index(PKGG, Zero, )), Zero, ))\r
-                Store(RMTX, Index(DerefOf(Index(PKGG, Zero, )), One, ))\r
-                Return(PKGG)\r
-            }\r
-#if 0\r
             Method (ACPO, 0, NotSerialized)\r
             {\r
-                Name (PKGG, Package (0x01)\r
+                Name (PKGG, Package (One)\r
                 {\r
                     Package (0x03)\r
                     {\r
-                        // Represents MBA subsystem\r
                         Zero, \r
                         Zero, \r
                         ToUUID ("ba58766d-abf2-4402-88d7-90ab243f6c77")\r
                     }\r
                 })\r
-                // Copy ACPI globals for Address for this subsystem into above package for use in driver\r
                 DerefOf (PKGG [Zero]) [Zero] = RMTB /* \_SB_.RMTB */\r
                 DerefOf (PKGG [Zero]) [One] = RMTX /* \_SB_.RMTX */\r
                 Return (PKGG) /* \_SB_.PILC.ACPO.PKGG */\r
             }\r
-#endif\r
         }\r
 \r
-        // \r
-        // RPE Crash Dump Injector (CDI) Driver\r
-        //\r
         Device (CDI)\r
         {\r
             Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
@@ -49681,9 +48552,8 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 \_SB.RPEN, \r
                 \_SB.SSDD\r
             })\r
-            //Name (_HID, "QCOM02BE")  // _HID: Hardware ID\r
-            Name (_HID, "MEOW02BE")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
+            Name (_HID, "QCOM02BE")  // _HID: Hardware ID\r
+                       Alias(\_SB.PSUB, _SUB)\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
                 Name (RBUF, ResourceTemplate ()\r
@@ -49702,15 +48572,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-\r
-\r
-// comment up to here\r
-\r
-\r
-\r
-        //\r
-        // ADSP Driver: load ADSP image\r
-        //\r
         Device (ADSP)\r
         {\r
             Name (_DEP, Package (0x07)  // _DEP: Dependencies\r
@@ -49724,19 +48585,15 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 \_SB.PDSR\r
             })\r
             Name (_HID, "QCOM023D")  // _HID: Hardware ID\r
-            //Name (_HID, "MEOW023D")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
-            //\r
-            // WDIR - Watch Dog Interrupt Registers\r
-            //\r
             Method (WDIR, 0, NotSerialized)\r
             {\r
                 Return (Package (0x04)\r
                 {\r
-                    0x02,           // Interrupt number - 2nd bit in Eleventh register\r
-                    0x17A0011C,     // APCS_GICD_ISENABLERn  (n represents Eleventh register), register used to enable WDOG bite interrupt.\r
-                    0x17A0019C,     // APCS_GICD_ICENABLERn  (n represents Eleventh register), register used to disable WDOG bite interrupt.\r
-                    0x17A0021C      // APCS_GICD_ICPENDRn  (n represents Eleventh register), register used to clear pending WDOG bite interrupt.\r
+                    0x02, \r
+                    0x17A0011C, \r
+                    0x17A0019C, \r
+                    0x17A0021C\r
                 })\r
             }\r
 \r
@@ -49744,9 +48601,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
-                    // Inbound interrupt from LPASS dog bite\r
-                    // See http://ipcatalog.qualcomm.com/irqs/chip/50/map/110\r
-                    // q6ss_wdog_exp_irq = 194\r
                     Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
                     {\r
                         0x000000C2,\r
@@ -49764,12 +48618,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Name (_ADR, Zero)  // _ADR: Address\r
                 Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
-                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
+                               Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
                 Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
                 {\r
                     Name (RBUF, ResourceTemplate ()\r
                     {\r
-                        // SLIMbus register address space\r
                         Memory32Fixed (ReadWrite,\r
                             0x171C0000,         // Address Base\r
                             0x0002C000,         // Address Length\r
@@ -49784,24 +48637,15 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Method (CHLD, 0, NotSerialized)\r
                 {\r
-                    Return (Package (0x01)\r
+                    Return (Package (One)\r
                     {\r
                         "SLM1\\QCOM023F"\r
                     })\r
                 }\r
 \r
-                // ADCM Driver Configurations\r
                 Device (ADCM)\r
                 {\r
-                    Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                    // HID values are present in Qualcomm.HID.props under <WDKRoot>MSBuild\Qualcomm\r
-                    // Parent of ADCM shall defined this ( Refer mproc.asl or slimbus.asl)\r
-                    // AMSS in bear family and Slimbus in Badger family makes below entry\r
-                    // HID_ACD = QCOM242D\r
-                    // Name (_HID, "HID_ACD")\r
-                    \r
-                    // Address object for acpi device enumerated device (ADCM) on parent device bus\r
-                    // Used to identify multiple child if present\r
+                                       Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
                     Name (_ADR, Zero)  // _ADR: Address\r
                     Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
                     {\r
@@ -49810,17 +48654,17 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     })\r
                     Method (CHLD, 0, NotSerialized)\r
                     {\r
-                        Return (Package (0x01)\r
+                        Return (Package (One)\r
                         {\r
-                            "ADCM\\SAMM0802"\r
+                                                       "ADCM\\QCOM0240"\r
                         })\r
                     }\r
 \r
                     Device (AUDD)\r
                     {\r
                         Name (_ADR, Zero)  // _ADR: Address\r
-                        Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                        Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+                                               Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
+                        Name (_DEP, Package (One)  // _DEP: Dependencies\r
                         {\r
                             \_SB.SPI9\r
                         })\r
@@ -49862,19 +48706,14 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             Return (CH) /* \_SB_.ADSP.SLM1.ADCM.AUDD.CHLD.CH__ */\r
                         }\r
 \r
-                        // MBHC Driver Configurations\r
                         Device (MBHC)\r
                         {\r
                             Name (_ADR, Zero)  // _ADR: Address\r
                             Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
                         }\r
 \r
-                        // Miniport Device Configurations\r
                         Device (QCRT)\r
                         {\r
-                            // Address object for acpi device enumerated device (QCRT) on parent device bus\r
-                            // Used to identify multiple child if present \r
-                            // Since, QCRT is second child of AUDD, we have assigned slot-1\r
                             Name (_ADR, One)  // _ADR: Address\r
                             Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
                         }\r
@@ -49904,9 +48743,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        // AMSS Driver: Used for loading the modem binaries\r
-        //\r
         Device (AMSS)\r
         {\r
             Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
@@ -49933,8 +48769,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
-                    // Inbound interrupt from Q6SW dog bite:\r
-                    // q6ss_wdog_exp_irq = 298\r
                     Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
                     {\r
                         0x0000012A,\r
@@ -49943,9 +48777,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RBUF) /* \_SB_.AMSS._CRS.RBUF */\r
             }\r
 \r
-            //\r
-            // WDIR - Watch Dog Interrupt Registers\r
-            //\r
             Method (WDIR, 0, NotSerialized)\r
             {\r
                 Return (Package (0x04)\r
@@ -49969,13 +48800,13 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 {\r
                     Zero, \r
                     Zero\r
-                }) // wakeable from S0\r
-                Name (_S0W, 0x02)  // S0 should put device in D2 for wake\r
-                Name (_S4W, 0x02)  // all other Sx (just in case) should also wake from D2\r
+                })\r
+                Name (_S0W, 0x02)  // _S0W: S0 Device Wake State\r
+                Name (_S4W, 0x02)  // _S4W: S4 Device Wake State\r
                 Name (_PRR, Package (One)  // _PRR: Power Resource for Reset\r
                 {\r
                     \_SB.AMSS.QWLN.WRST\r
-                })                             // Power resource reference for device reset and recovery.\r
+                })\r
                 Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
                 {\r
                     Name (RBUF, ResourceTemplate ()\r
@@ -49989,7 +48820,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             0x00000010,         // Address Length\r
                             )\r
                         Memory32Fixed (ReadWrite,\r
-                            0x8DF00000,         // Address Base // fajita\r
+                            0x8DF00000,         // Address Base\r
                             0x00100000,         // Address Length\r
                             )\r
                         Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )\r
@@ -50046,7 +48877,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Method (WMSA, 0, NotSerialized)\r
                 {\r
-                    Return (Package (0x01)\r
+                    Return (Package (One)\r
                     {\r
                         0x00100000\r
                     })\r
@@ -50094,7 +48925,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     Name (_HID, "SAM0609")  // _HID: Hardware ID\r
                     Name (_UID, Zero)  // _UID: Unique ID\r
                     Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                    Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+                    Name (_DEP, Package (One)  // _DEP: Dependencies\r
                     {\r
                         \_SB.AMSS.QWLN\r
                     })\r
@@ -50106,9 +48937,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        // QMI Service manager\r
-        //\r
         Device (QSM)\r
         {\r
             Name (_HID, "QCOM02B9")  // _HID: Hardware ID\r
@@ -50138,10 +48966,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        // Subsys Dummy Device\r
-        //    Subsys devices that use QCCI should have an dependency on this\r
-        //\r
         Device (SSDD)\r
         {\r
             Name (_HID, "QCOM02D1")  // _HID: Hardware ID\r
@@ -50178,7 +49002,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 \_SB.PDSR\r
             })\r
             Name (_HID, "QCOM02F7")  // _HID: Hardware ID\r
-            //Name (_HID, "MEOW02F7")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
@@ -50228,7 +49051,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 }\r
                 Else\r
                 {\r
-                    Return (\_SB.PSUB)\r
+                                       Return (\_SB.PSUB)\r
                 }\r
             }\r
         }\r
@@ -50258,7 +49081,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_HID, "QCOM0212")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.MMU1\r
             })\r
@@ -50455,7 +49278,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_HID, "QCOM0212")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, One)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.PEP0\r
             })\r
@@ -50517,7 +49340,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_UID, One)  // _UID: Unique ID\r
         }\r
 \r
-//#if 0\r
         Device (GPU0)\r
         {\r
             Name (_HID, "QCOM027E")  // _HID: Hardware ID\r
@@ -50525,9 +49347,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_CID, "ACPIQCOM027E")  // _CID: Compatible ID\r
             Name (_UID, Zero)  // _UID: Unique ID\r
             Name (_HRV, 0x7C)  // _HRV: Hardware Revision\r
-            // Expose the internal monitor device to allow it to be used in a thermal zone\r
-            // for thermal mitigation.\r
-            //\r
             Device (MON0)\r
             {\r
                 Method (_ADR, 0, NotSerialized)  // _ADR: Address\r
@@ -50605,8 +49424,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                     {\r
                         0x000000CF,\r
                     }\r
-                    // TLMM GPIO used to reset the DSI panel\r
-                    //\r
                     GpioIo (Shared, PullUp, 0x0000, 0x0000, IoRestrictionNone,\r
                         "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
                         )\r
@@ -50617,24 +49434,17 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RBUF) /* \_SB_.GPU0._CRS.RBUF */\r
             }\r
 \r
-            //------------------------------------------------------------------------------\r
-            // Resource Auxiliary Info\r
-            // This method is a companion method to the main _CRS resource method.  It\r
-            // includes information for each resource, such as the owning component, a\r
-            // string identifier, etc.\r
-            //------------------------------------------------------------------------------\r
-            //\r
             Method (RESI, 0, NotSerialized)\r
             {\r
                 Name (RINF, Package (0x10)\r
                 {\r
-                    0x03,                                // Table Format Major Version\r
-                    Zero,                                // Table Format Minor Version\r
+                    0x03, \r
+                    Zero, \r
                     Package (0x03)\r
                     {\r
                         "RESOURCE", \r
-                        "MDP_REGS",                   // Resource Name\r
-                        "DISPLAY"                     // Owning Component\r
+                        "MDP_REGS", \r
+                        "DISPLAY"\r
                     }, \r
 \r
                     Package (0x03)\r
@@ -50721,8 +49531,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         "VIDEO"\r
                     }, \r
 \r
-                    // TLMM GPIO used to reset the DSI panel\r
-                    //\r
                     Package (0x03)\r
                     {\r
                         "RESOURCE", \r
@@ -50733,52 +49541,33 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RINF) /* \_SB_.GPU0.RESI.RINF */\r
             }\r
 \r
-            //------------------------------------------------------------------------------\r
-            // Graphics Engines and Display Config\r
-            // This method encapsulates all per-platform configuration data for engines and\r
-            // the display.  This method consists of three sub-packages.  The first package\r
-            // encapsulates all configuration information for the supported engines.  The\r
-            // second package encapsulates all display configuration data.  The third\r
-            // package is the list of all page tables used by the SMMUs in the engines and\r
-            // display.\r
-            //------------------------------------------------------------------------------\r
-            //\r
             Method (ENGS, 0, NotSerialized)\r
             {\r
                 Name (EBUF, Package (0x06)\r
                 {\r
-                    0x03,       // Table Format Major Version\r
-                    0x02,       // Table Format Minor Version\r
-                    0x003B0014, // XML Common/Platform Source File Revision\r
-\r
-                    //------------------------------------------------------------------------------\r
-                    // Graphics Engine List\r
-                    // This package enumerates all of the expected engines that should be enumerated\r
-                    // on this platform, as well as engine-specific configuration data.  This\r
-                    // includes resource assignments, power component assignments, MMU IDs,\r
-                    // and even chip family information.\r
-                    //------------------------------------------------------------------------------\r
-                    //\r
-                    Package (0x08)\r
+                    0x03, \r
+                    0x02, \r
+                    0x003B0014, \r
+                    Package (0x07)\r
                     {\r
                         "ENGINES", \r
-                        0x06,               // Number of engines\r
+                        0x05, \r
                         Package (0x0A)\r
                         {\r
                             "ENGINE", \r
-                            "GRAPHICS",                 // Engine String Identifier\r
-                            "Adreno6X",                 // Chip Family Identifier\r
-                            One,                        // Index of Primary Power Component\r
-                            0x02,                       // P-State Set Index of Footswitch override\r
-                            Zero,                       // P-State Set Index of Reset\r
+                            "GRAPHICS", \r
+                            "Adreno6X", \r
+                            One, \r
+                            0x02, \r
+                            Zero, \r
                             Package (0x0B)\r
                             {\r
                                 "MMUINFO", \r
-                                "Miniport",              // SMMU managed by miniport or engine\r
-                                "ArmSmmuV2",             // SMMU Family \r
-                                0x02,                   // Number of SMMU stages\r
-                                0x31,                   // Address bits\r
-                                "V8L",                  // Address format\r
+                                "Miniport", \r
+                                "ArmSmmuV2", \r
+                                0x02, \r
+                                0x31, \r
+                                "V8L", \r
                                 "SMMUID", \r
                                 ToUUID ("9833c712-3292-4ffb-b0f4-2bd20e1f7f66"), \r
                                 "SMMUINTERFACEID", \r
@@ -50791,7 +49580,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 Package (0x0E)\r
                                 {\r
                                     "PAGETABLEUSAGE", \r
-                                    0x04,                   // Number of page tables\r
+                                    0x04, \r
                                     "GraphicsGlobalPT", \r
                                     Zero, \r
                                     0x03030000, \r
@@ -50869,11 +49658,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x09)\r
                         {\r
                             "ENGINE", \r
-                            "MDPBLT",                      // Engine String Identifier\r
-                            "MDP5.x",                      // Chip Family Identifier\r
-                            0x02,                       // Index of Primary Power Component\r
-                            One,                        // P-State Set Index of Footswitch override\r
-                            Zero,                       // P-State Set Index of Reset\r
+                            "MDPBLT", \r
+                            "MDP5.x", \r
+                            0x02, \r
+                            One, \r
+                            Zero, \r
                             Package (0x02)\r
                             {\r
                                 "SHAREDSMMU", \r
@@ -51038,7 +49827,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 }\r
                             }\r
                         }, \r
-\r
+#if 0\r
                         Package (0x09)\r
                         {\r
                             "ENGINE", \r
@@ -51087,7 +49876,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "THERMAL_DOMAINS"\r
                             }\r
                         }, \r
-\r
+#endif\r
                         Package (0x08)\r
                         {\r
                             "ENGINE", \r
@@ -51117,25 +49906,18 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         }\r
                     }, \r
 \r
-                    //------------------------------------------------------------------------------\r
-                    // Display Info Package\r
-                    // This package enumerates all resources assigned to the display.  Additionally,\r
-                    // this routine includes any display configuration data, such as hotplug\r
-                    // support.\r
-                    //------------------------------------------------------------------------------\r
-                    //\r
-                    Package (0x08)\r
+                    Package (0x07)\r
                     {\r
                         "DISPLAYS", \r
-                        "MDP5.x",                    // Chip Family Identifier\r
-                        0x03,                        // Number of displays\r
+                        "MDP5.x", \r
+                        0x02, \r
                         Package (0x07)\r
                         {\r
                             "DISPLAY", \r
-                            "INTERNAL1",    // Display Name\r
-                            Zero,       // Index of Display Power Component\r
-                            One,        // P-State Set Index of Footswitch override\r
-                            Zero,       // P-State Set Index of reset\r
+                            "INTERNAL1", \r
+                            Zero, \r
+                            One, \r
+                            Zero, \r
                             Package (0x04)\r
                             {\r
                                 "PERF_CONTROLS", \r
@@ -51192,7 +49974,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "THERMAL_DOMAINS"\r
                             }\r
                         }, \r
-\r
+#if 0\r
                         Package (0x07)\r
                         {\r
                             "DISPLAY", \r
@@ -51219,7 +50001,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                                 "THERMAL_DOMAINS"\r
                             }\r
                         }, \r
-\r
+#endif\r
                         Package (0x02)\r
                         {\r
                             "RESOURCES", \r
@@ -51334,26 +50116,19 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         }\r
                     }, \r
 \r
-                    //------------------------------------------------------------------------------\r
-                    // Page Table List\r
-                    // This package enumerates all of the page tables used by any of the displays\r
-                    // and engines. Page tables defined here may be referenced by one or more engine\r
-                    // or display.\r
-                    //------------------------------------------------------------------------------\r
-                    //\r
                     Package (0x0F)\r
                     {\r
                         "PAGETABLES", \r
-                        0x0D,           // Number of page tables\r
+                        0x0D, \r
                         Package (0x07)\r
                         {\r
-                            "GraphicsGlobalPT",           // Name \r
-                            One,                        // Global\r
-                            Zero,                       // Secure\r
-                            One,                        // HighTTBR\r
-                            One,                        // HiddenFromOS\r
-                            0x0000008000000000,           // VaStart \r
-                            0x0000000800000000           // VaSizeBytes\r
+                            "GraphicsGlobalPT", \r
+                            One, \r
+                            Zero, \r
+                            One, \r
+                            One, \r
+                            0x0000008000000000, \r
+                            0x0000000800000000\r
                         }, \r
 \r
                         Package (0x07)\r
@@ -51413,15 +50188,15 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                         Package (0x09)\r
                         {\r
-                            "VideoNonSecurePT",            // Name\r
-                            Zero,                       // Global\r
-                            Zero,                       // Secure\r
-                            Zero,                       // HighTTBR\r
-                            One,                        // HiddenFromOS\r
-                            0x00100000,                 // VaStart\r
-                            0xBFF00000,                 // VaSizeBytes\r
-                            0x1B,                       // VideoBufferMask\r
-                            Zero                        // VideoCBIndex\r
+                            "VideoNonSecurePT", \r
+                            Zero, \r
+                            Zero, \r
+                            Zero, \r
+                            One, \r
+                            0x00100000, \r
+                            0xBFF00000, \r
+                            0x1B, \r
+                            Zero\r
                         }, \r
 \r
                         Package (0x09)\r
@@ -51502,20 +50277,16 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (EBUF) /* \_SB_.GPU0.ENGS.EBUF */\r
             }\r
 \r
-            //------------------------------------------------------------------------------\r
-            // Graphics Thermal Management Details\r
-            //------------------------------------------------------------------------------\r
-            //\r
             Method (TMDT, 0, NotSerialized)\r
             {\r
                 Name (RBUF, Package (0x03)\r
                 {\r
-                    One,         // Table Format Major Version\r
-                    Zero,         // Table Format Minor Version\r
+                    One, \r
+                    Zero, \r
                     Package (0x03)\r
                     {\r
                         "THERMAL_DOMAINS", \r
-                        One,    // Num Thermal Domains\r
+                        One, \r
                         Package (0x03)\r
                         {\r
                             "GPU", \r
@@ -51532,25 +50303,13 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RBUF) /* \_SB_.GPU0.TMDT.RBUF */\r
             }\r
 \r
-            //------------------------------------------------------------------------------\r
-            // Graphics PEP Component List\r
-            // This method is a companion method to the graphics entries inside PEP's DCFG\r
-            // method.  It includes the same components, generated from a single XML source,\r
-            // with any additional information required to be passed to dxgkrnl.\r
-            //------------------------------------------------------------------------------\r
-            //\r
             Method (PMCL, 0, NotSerialized)\r
             {\r
                 Name (RBUF, Package (0x0D)\r
                 {\r
-                    0x03,       // Table Format Major Version\r
-                    One,        // Table Format Minor Version\r
-                    0x0A,       // Number of power components\r
-\r
-                    //----------------------------------------------------------------------------------\r
-                    //  C0 - Internal Display Power States\r
-                    //----------------------------------------------------------------------------------\r
-                    //\r
+                    0x03, \r
+                    One, \r
+                    0x0A, \r
                     Package (0x0F)\r
                     {\r
                         "COMPONENT", \r
@@ -51586,10 +50345,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             One\r
                         }, \r
 \r
-                        //----------------------------------------------------------------------------------\r
-                        // C0.PS0 - Internal Display: MDP Reset Control\r
-                        //----------------------------------------------------------------------------------\r
-                        //\r
                         Package (0x0A)\r
                         {\r
                             "PSTATE_SET", \r
@@ -51617,10 +50372,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             }\r
                         }, \r
 \r
-                        //----------------------------------------------------------------------------------\r
-                        // C0.PS1 - Internal Display: MDP Footswitch override\r
-                        //----------------------------------------------------------------------------------\r
-                        //\r
                         Package (0x0A)\r
                         {\r
                             "PSTATE_SET", \r
@@ -51648,10 +50399,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             }\r
                         }, \r
 \r
-                        //----------------------------------------------------------------------------------\r
-                        // C0.PS2 - Internal Display: Power states for MDP scan-out HW\r
-                        //----------------------------------------------------------------------------------\r
-                        //\r
                         Package (0x0D)\r
                         {\r
                             "PSTATE_SET", \r
@@ -51703,10 +50450,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             }\r
                         }, \r
 \r
-                        //----------------------------------------------------------------------------------\r
-                        // C0.PS3 - Internal Display: MDP Core Clock Frequency\r
-                        //----------------------------------------------------------------------------------\r
-                        //\r
                         Package (0x15)\r
                         {\r
                             "PSTATE_SET", \r
@@ -51822,10 +50565,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             }\r
                         }, \r
 \r
-                        //----------------------------------------------------------------------------------\r
-                        // C0.PS4 - Internal Display: Display Bandwidth to EBI\r
-                        //----------------------------------------------------------------------------------\r
-                        //\r
                         Package (0x33)\r
                         {\r
                             "PSTATE_SET", \r
@@ -52182,10 +50921,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         }\r
                     }, \r
 \r
-                    //----------------------------------------------------------------------------------\r
-                    //  C1 - 3D Graphics Engine Power States\r
-                    //----------------------------------------------------------------------------------\r
-                    //\r
                     Package (0x10)\r
                     {\r
                         "COMPONENT", \r
@@ -52231,10 +50966,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                             One\r
                         }, \r
 \r
-                        //----------------------------------------------------------------------------------\r
-                        // C1.PS0 - 3D Graphics Core P-State Set: Reset\r
-                        //----------------------------------------------------------------------------------\r
-                        //\r
                         Package (0x0A)\r
                         {\r
                             "PSTATE_SET", \r
@@ -58008,1070 +56739,590 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RBUF) /* \_SB_.GPU0.PMCL.RBUF */\r
             }\r
 \r
-            // panel specific ROM data\r
             Method (_ROM, 3, NotSerialized)  // _ROM: Read-Only Memory\r
             {\r
-                /*Name (PCFG, Buffer (2488)\r
-                {\r
-    0x3C, 0x3F, 0x78, 0x6D, 0x6C, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x3D, 0x22, 0x31,\r
-    0x2E, 0x30, 0x22, 0x20, 0x65, 0x6E, 0x63, 0x6F, 0x64, 0x69, 0x6E, 0x67, 0x3D, 0x22, 0x75, 0x74,\r
-    0x66, 0x2D, 0x38, 0x22, 0x3F, 0x3E, 0x3C, 0x50, 0x61, 0x6E, 0x65, 0x6C, 0x4E, 0x61, 0x6D, 0x65,\r
-    0x3E, 0x53, 0x36, 0x45, 0x33, 0x46, 0x43, 0x32, 0x58, 0x30, 0x31, 0x3C, 0x2F, 0x50, 0x61, 0x6E,\r
-    0x65, 0x6C, 0x4E, 0x61, 0x6D, 0x65, 0x3E, 0x3C, 0x50, 0x61, 0x6E, 0x65, 0x6C, 0x44, 0x65, 0x73,\r
-    0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x3E, 0x73, 0x61, 0x6D, 0x73, 0x75, 0x6E, 0x67,\r
-    0x20, 0x53, 0x36, 0x45, 0x33, 0x46, 0x43, 0x32, 0x58, 0x30, 0x31, 0x20, 0x63, 0x6D, 0x64, 0x20,\r
-    0x6D, 0x6F, 0x64, 0x65, 0x20, 0x64, 0x73, 0x69, 0x20, 0x70, 0x61, 0x6E, 0x65, 0x6C, 0x28, 0x31,\r
-    0x30, 0x38, 0x30, 0x78, 0x32, 0x33, 0x34, 0x30, 0x20, 0x32, 0x34, 0x62, 0x70, 0x70, 0x29, 0x3C,\r
-    0x2F, 0x50, 0x61, 0x6E, 0x65, 0x6C, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6F,\r
-    0x6E, 0x3E, 0x3C, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x20, 0x69, 0x64, 0x3D, 0x22, 0x41, 0x63, 0x74,\r
-    0x69, 0x76, 0x65, 0x20, 0x54, 0x69, 0x6D, 0x69, 0x6E, 0x67, 0x22, 0x3E, 0x20, 0x3C, 0x48, 0x6F,\r
-    0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x3E, 0x31,\r
-    0x30, 0x38, 0x30, 0x3C, 0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x41,\r
-    0x63, 0x74, 0x69, 0x76, 0x65, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74,\r
-    0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E, 0x74, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x37, 0x32, 0x3C,\r
-    0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E, 0x74,\r
-    0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74,\r
-    0x61, 0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x33, 0x36, 0x3C, 0x2F,\r
-    0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F,\r
-    0x72, 0x63, 0x68, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,\r
-    0x53, 0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73, 0x65, 0x3E, 0x31, 0x36, 0x3C, 0x2F, 0x48, 0x6F,\r
-    0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73,\r
-    0x65, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x53, 0x79,\r
-    0x6E, 0x63, 0x53, 0x6B, 0x65, 0x77, 0x3E, 0x30, 0x3C, 0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F,\r
-    0x6E, 0x74, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x53, 0x6B, 0x65, 0x77, 0x3E, 0x20, 0x3C, 0x48,\r
-    0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x4C, 0x65, 0x66, 0x74, 0x42, 0x6F, 0x72,\r
-    0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61,\r
-    0x6C, 0x4C, 0x65, 0x66, 0x74, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x3E, 0x20, 0x3C, 0x48, 0x6F,\r
-    0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x52, 0x69, 0x67, 0x68, 0x74, 0x42, 0x6F, 0x72,\r
-    0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61,\r
-    0x6C, 0x52, 0x69, 0x67, 0x68, 0x74, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x3E, 0x20, 0x3C, 0x56,\r
-    0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x3E, 0x32, 0x33,\r
-    0x34, 0x30, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x41, 0x63, 0x74, 0x69,\r
-    0x76, 0x65, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x46, 0x72, 0x6F,\r
-    0x6E, 0x74, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x33, 0x32, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74,\r
-    0x69, 0x63, 0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E, 0x74, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x20,\r
-    0x3C, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72,\r
-    0x63, 0x68, 0x3E, 0x31, 0x38, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x42,\r
-    0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69,\r
-    0x63, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73, 0x65, 0x3E, 0x34, 0x3C, 0x2F,\r
-    0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73,\r
-    0x65, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63,\r
-    0x53, 0x6B, 0x65, 0x77, 0x3E, 0x30, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C,\r
-    0x53, 0x79, 0x6E, 0x63, 0x53, 0x6B, 0x65, 0x77, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69,\r
-    0x63, 0x61, 0x6C, 0x54, 0x6F, 0x70, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F,\r
-    0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x54, 0x6F, 0x70, 0x42, 0x6F, 0x72, 0x64, 0x65,\r
-    0x72, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x42, 0x6F, 0x74, 0x74,\r
-    0x6F, 0x6D, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74,\r
-    0x69, 0x63, 0x61, 0x6C, 0x42, 0x6F, 0x74, 0x74, 0x6F, 0x6D, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72,\r
-    0x3E, 0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72, 0x74, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6F, 0x6C,\r
-    0x61, 0x72, 0x69, 0x74, 0x79, 0x3E, 0x46, 0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E, 0x76,\r
-    0x65, 0x72, 0x74, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6F, 0x6C, 0x61, 0x72, 0x69, 0x74, 0x79, 0x3E,\r
-    0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72, 0x74, 0x56, 0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F, 0x6C,\r
-    0x61, 0x69, 0x72, 0x74, 0x79, 0x3E, 0x46, 0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E, 0x76,\r
-    0x65, 0x72, 0x74, 0x56, 0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F, 0x6C, 0x61, 0x69, 0x72, 0x74, 0x79,\r
-    0x3E, 0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72, 0x74, 0x48, 0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F,\r
-    0x6C, 0x61, 0x72, 0x69, 0x74, 0x79, 0x3E, 0x46, 0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E,\r
-    0x76, 0x65, 0x72, 0x74, 0x48, 0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F, 0x6C, 0x61, 0x72, 0x69, 0x74,\r
-    0x79, 0x3E, 0x20, 0x3C, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x3E,\r
-    0x30, 0x78, 0x30, 0x3C, 0x2F, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6F, 0x6C, 0x6F, 0x72,\r
-    0x3E, 0x3C, 0x2F, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E, 0x3C, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x20,\r
-    0x69, 0x64, 0x3D, 0x22, 0x44, 0x69, 0x73, 0x70, 0x6C, 0x61, 0x79, 0x20, 0x49, 0x6E, 0x74, 0x65,\r
-    0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x3E, 0x20, 0x3C, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61,\r
-    0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x39, 0x3C, 0x2F, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66,\r
-    0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x20, 0x3C, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66,\r
-    0x61, 0x63, 0x65, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x33,\r
-    0x3C, 0x2F, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x43, 0x6F, 0x6C, 0x6F, 0x72,\r
-    0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x3C, 0x2F, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E, 0x3C,\r
-    0x47, 0x72, 0x6F, 0x75, 0x70, 0x20, 0x69, 0x64, 0x3D, 0x22, 0x44, 0x53, 0x49, 0x20, 0x49, 0x6E,\r
-    0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x43, 0x68,\r
-    0x61, 0x6E, 0x6E, 0x65, 0x6C, 0x49, 0x64, 0x3E, 0x32, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43, 0x68,\r
-    0x61, 0x6E, 0x6E, 0x65, 0x6C, 0x49, 0x64, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x56, 0x69, 0x72,\r
-    0x74, 0x75, 0x61, 0x6C, 0x49, 0x64, 0x3E, 0x30, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x56, 0x69, 0x72,\r
-    0x74, 0x75, 0x61, 0x6C, 0x49, 0x64, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x43, 0x6F, 0x6C, 0x6F,\r
-    0x72, 0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x33, 0x36, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43,\r
-    0x6F, 0x6C, 0x6F, 0x72, 0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49,\r
-    0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x4D, 0x6F, 0x64, 0x65, 0x3E, 0x31, 0x3C, 0x2F, 0x44,\r
-    0x53, 0x49, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x4D, 0x6F, 0x64, 0x65, 0x3E, 0x20, 0x3C,\r
-    0x44, 0x53, 0x49, 0x4C, 0x61, 0x6E, 0x65, 0x73, 0x3E, 0x34, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x4C,\r
-    0x61, 0x6E, 0x65, 0x73, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,\r
-    0x68, 0x52, 0x61, 0x74, 0x65, 0x3E, 0x30, 0x78, 0x33, 0x43, 0x30, 0x30, 0x30, 0x30, 0x3C, 0x2F,\r
-    0x44, 0x53, 0x49, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x3E, 0x20,\r
-    0x3C, 0x44, 0x53, 0x49, 0x43, 0x6D, 0x64, 0x53, 0x77, 0x61, 0x70, 0x49, 0x6E, 0x74, 0x65, 0x72,\r
-    0x66, 0x61, 0x63, 0x65, 0x3E, 0x46, 0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43,\r
-    0x6D, 0x64, 0x53, 0x77, 0x61, 0x70, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3E,\r
-    0x20, 0x3C, 0x44, 0x53, 0x49, 0x43, 0x6D, 0x64, 0x55, 0x73, 0x69, 0x6E, 0x67, 0x54, 0x72, 0x69,\r
-    0x67, 0x67, 0x65, 0x72, 0x3E, 0x46, 0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43,\r
-    0x6D, 0x64, 0x55, 0x73, 0x69, 0x6E, 0x67, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x3E, 0x20,\r
-    0x3C, 0x44, 0x53, 0x49, 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65,\r
-    0x66, 0x72, 0x65, 0x73, 0x68, 0x3E, 0x54, 0x72, 0x75, 0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x45,\r
-    0x6E, 0x61, 0x62, 0x6C, 0x65, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,\r
-    0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,\r
-    0x68, 0x46, 0x72, 0x61, 0x6D, 0x65, 0x4E, 0x75, 0x6D, 0x44, 0x69, 0x76, 0x3E, 0x31, 0x3C, 0x2F,\r
-    0x44, 0x53, 0x49, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x46, 0x72,\r
-    0x61, 0x6D, 0x65, 0x4E, 0x75, 0x6D, 0x44, 0x69, 0x76, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x43,\r
-    0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x6C, 0x65, 0x72, 0x4D, 0x61, 0x70, 0x70, 0x69, 0x6E, 0x67,\r
-    0x3E, 0x0A, 0x20, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43, 0x6F, 0x6E,\r
-    0x74, 0x72, 0x6F, 0x6C, 0x6C, 0x65, 0x72, 0x4D, 0x61, 0x70, 0x70, 0x69, 0x6E, 0x67, 0x3E, 0x0A,\r
-    0x20, 0x3C, 0x44, 0x53, 0x49, 0x4C, 0x50, 0x31, 0x31, 0x41, 0x74, 0x49, 0x6E, 0x69, 0x74, 0x3E,\r
-    0x54, 0x72, 0x75, 0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x4C, 0x50, 0x31, 0x31, 0x41, 0x74, 0x49,\r
-    0x6E, 0x69, 0x74, 0x3E, 0x3C, 0x2F, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E, 0x3C, 0x44, 0x53, 0x49,\r
-    0x49, 0x6E, 0x69, 0x74, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6E, 0x63, 0x65, 0x3E, 0x20, 0x33, 0x39,\r
-    0x20, 0x39, 0x46, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x30, 0x35, 0x20, 0x31, 0x31,\r
-    0x20, 0x30, 0x30, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x30, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x39,\r
-    0x46, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x35, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20,\r
-    0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x31, 0x35, 0x20, 0x42, 0x30, 0x20, 0x30, 0x31, 0x0A,\r
-    0x20, 0x31, 0x35, 0x20, 0x43, 0x44, 0x20, 0x30, 0x31, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30,\r
-    0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x30, 0x46, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x39, 0x46, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x31, 0x35, 0x20, 0x33,\r
-    0x35, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x35, 0x41, 0x20, 0x35,\r
-    0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x45, 0x42, 0x20, 0x31, 0x37, 0x20, 0x34, 0x31, 0x20, 0x39, 0x32, 0x20, 0x30,\r
-    0x45, 0x20, 0x31, 0x30, 0x20, 0x38, 0x32, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46,\r
-    0x30, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x32, 0x41, 0x20, 0x30,\r
-    0x30, 0x20, 0x30, 0x30, 0x20, 0x30, 0x34, 0x20, 0x33, 0x37, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x32,\r
-    0x42, 0x20, 0x30, 0x30, 0x20, 0x30, 0x30, 0x20, 0x30, 0x39, 0x20, 0x32, 0x33, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x42,\r
-    0x30, 0x20, 0x30, 0x39, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x45, 0x38, 0x20, 0x31, 0x30, 0x20, 0x33,\r
-    0x30, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x46, 0x43, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x42, 0x30, 0x20, 0x30, 0x31, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x45, 0x33, 0x20, 0x38, 0x38, 0x0A,\r
-    0x20, 0x33, 0x39, 0x20, 0x42, 0x30, 0x20, 0x30, 0x37, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x45, 0x44,\r
-    0x20, 0x36, 0x37, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x43, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35,\r
-    0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x42, 0x30, 0x20, 0x30, 0x37, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x42, 0x37, 0x20, 0x30,\r
-    0x31, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x42, 0x30, 0x20, 0x30, 0x38, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x42, 0x37, 0x20, 0x31, 0x32, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x41, 0x35, 0x20,\r
-    0x41, 0x35, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x35, 0x33, 0x20, 0x32, 0x30, 0x0A, 0x20, 0x31, 0x35,\r
-    0x20, 0x35, 0x35, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41,\r
-    0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x42, 0x31, 0x20, 0x30, 0x30, 0x20, 0x30, 0x31,\r
-    0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x42,\r
-    0x33, 0x20, 0x30, 0x30, 0x20, 0x43, 0x31, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x41,\r
-    0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x37, 0x38, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x39, 0x46, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x30, 0x35, 0x20, 0x32, 0x39, 0x20,\r
-    0x30, 0x30, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A,\r
-    0x3C, 0x2F, 0x44, 0x53, 0x49, 0x49, 0x6E, 0x69, 0x74, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6E, 0x63,\r
-    0x65, 0x3E, 0x3C, 0x44, 0x53, 0x49, 0x54, 0x65, 0x72, 0x6D, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6E,\r
-    0x63, 0x65, 0x3E, 0x20, 0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A,\r
-    0x20, 0x30, 0x35, 0x20, 0x32, 0x38, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x32, 0x38,\r
-    0x0A, 0x20, 0x30, 0x35, 0x20, 0x31, 0x30, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x39,\r
-    0x46, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x35,\r
-    0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x42, 0x30, 0x20, 0x30, 0x35, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x46, 0x34, 0x20, 0x30, 0x31, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20,\r
-    0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x37, 0x38, 0x0A, 0x3C, 0x2F, 0x44,\r
-    0x53, 0x49, 0x54, 0x65, 0x72, 0x6D, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6E, 0x63, 0x65, 0x3E, 0x3C,\r
-    0x47, 0x72, 0x6F, 0x75, 0x70, 0x20, 0x69, 0x64, 0x3D, 0x27, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69,\r
-    0x67, 0x68, 0x74, 0x20, 0x43, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6F,\r
-    0x6E, 0x27, 0x3E, 0x20, 0x3C, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x54, 0x79,\r
-    0x70, 0x65, 0x3E, 0x33, 0x3C, 0x2F, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x54,\r
-    0x79, 0x70, 0x65, 0x3E, 0x20, 0x3C, 0x44, 0x69, 0x73, 0x70, 0x6C, 0x61, 0x79, 0x52, 0x65, 0x73,\r
-    0x65, 0x74, 0x49, 0x6E, 0x66, 0x6F, 0x3E, 0x30, 0x20, 0x32, 0x30, 0x30, 0x30, 0x20, 0x35, 0x30,\r
-    0x30, 0x30, 0x20, 0x31, 0x32, 0x30, 0x30, 0x30, 0x20, 0x30, 0x3C, 0x2F, 0x44, 0x69, 0x73, 0x70,\r
-    0x6C, 0x61, 0x79, 0x52, 0x65, 0x73, 0x65, 0x74, 0x49, 0x6E, 0x66, 0x6F, 0x3E, 0x0A, 0x3C, 0x2F,\r
-    0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E, 0x0A, 0x00 \r
-                })*/\r
                 \r
-                               Name (PCFG, Buffer (2822)\r
+                \r
+                               Name (PCFG, Buffer (0x0915)\r
+                {\r
+                    /* 0000 */  0x3C, 0x3F, 0x78, 0x6D, 0x6C, 0x20, 0x76, 0x65,  // <?xml ve\r
+                    /* 0008 */  0x72, 0x73, 0x69, 0x6F, 0x6E, 0x3D, 0x22, 0x31,  // rsion="1\r
+                    /* 0010 */  0x2E, 0x30, 0x22, 0x20, 0x65, 0x6E, 0x63, 0x6F,  // .0" enco\r
+                    /* 0018 */  0x64, 0x69, 0x6E, 0x67, 0x3D, 0x22, 0x75, 0x74,  // ding="ut\r
+                    /* 0020 */  0x66, 0x2D, 0x38, 0x22, 0x3F, 0x3E, 0x3C, 0x50,  // f-8"?><P\r
+                    /* 0028 */  0x61, 0x6E, 0x65, 0x6C, 0x4E, 0x61, 0x6D, 0x65,  // anelName\r
+                    /* 0030 */  0x3E, 0x53, 0x4F, 0x46, 0x45, 0x46, 0x30, 0x30,  // >SOFEF00\r
+                    /* 0038 */  0x5F, 0x4D, 0x3C, 0x2F, 0x50, 0x61, 0x6E, 0x65,  // _M</Pane\r
+                    /* 0040 */  0x6C, 0x4E, 0x61, 0x6D, 0x65, 0x3E, 0x3C, 0x50,  // lName><P\r
+                    /* 0048 */  0x61, 0x6E, 0x65, 0x6C, 0x44, 0x65, 0x73, 0x63,  // anelDesc\r
+                    /* 0050 */  0x72, 0x69, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x3E,  // ription>\r
+                    /* 0058 */  0x73, 0x61, 0x6D, 0x73, 0x75, 0x6E, 0x67, 0x20,  // samsung \r
+                    /* 0060 */  0x53, 0x4F, 0x46, 0x45, 0x46, 0x30, 0x30, 0x5F,  // SOFEF00_\r
+                    /* 0068 */  0x4D, 0x20, 0x63, 0x6D, 0x64, 0x20, 0x6D, 0x6F,  // M cmd mo\r
+                    /* 0070 */  0x64, 0x65, 0x20, 0x64, 0x73, 0x69, 0x20, 0x70,  // de dsi p\r
+                    /* 0078 */  0x61, 0x6E, 0x65, 0x6C, 0x28, 0x31, 0x30, 0x38,  // anel(108\r
+                    /* 0080 */  0x30, 0x78, 0x32, 0x32, 0x38, 0x30, 0x20, 0x32,  // 0x2280 2\r
+                    /* 0088 */  0x34, 0x62, 0x70, 0x70, 0x29, 0x3C, 0x2F, 0x50,  // 4bpp)</P\r
+                    /* 0090 */  0x61, 0x6E, 0x65, 0x6C, 0x44, 0x65, 0x73, 0x63,  // anelDesc\r
+                    /* 0098 */  0x72, 0x69, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x3E,  // ription>\r
+                    /* 00A0 */  0x3C, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x20, 0x69,  // <Group i\r
+                    /* 00A8 */  0x64, 0x3D, 0x22, 0x41, 0x63, 0x74, 0x69, 0x76,  // d="Activ\r
+                    /* 00B0 */  0x65, 0x20, 0x54, 0x69, 0x6D, 0x69, 0x6E, 0x67,  // e Timing\r
+                    /* 00B8 */  0x22, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72, 0x69,  // "> <Hori\r
+                    /* 00C0 */  0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x41, 0x63,  // zontalAc\r
+                    /* 00C8 */  0x74, 0x69, 0x76, 0x65, 0x3E, 0x31, 0x30, 0x38,  // tive>108\r
+                    /* 00D0 */  0x30, 0x3C, 0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A,  // 0</Horiz\r
+                    /* 00D8 */  0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x41, 0x63, 0x74,  // ontalAct\r
+                    /* 00E0 */  0x69, 0x76, 0x65, 0x3E, 0x20, 0x3C, 0x48, 0x6F,  // ive> <Ho\r
+                    /* 00E8 */  0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,  // rizontal\r
+                    /* 00F0 */  0x46, 0x72, 0x6F, 0x6E, 0x74, 0x50, 0x6F, 0x72,  // FrontPor\r
+                    /* 00F8 */  0x63, 0x68, 0x3E, 0x31, 0x31, 0x32, 0x3C, 0x2F,  // ch>112</\r
+                    /* 0100 */  0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74,  // Horizont\r
+                    /* 0108 */  0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E, 0x74, 0x50,  // alFrontP\r
+                    /* 0110 */  0x6F, 0x72, 0x63, 0x68, 0x3E, 0x20, 0x3C, 0x48,  // orch> <H\r
+                    /* 0118 */  0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61,  // orizonta\r
+                    /* 0120 */  0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72,  // lBackPor\r
+                    /* 0128 */  0x63, 0x68, 0x3E, 0x33, 0x36, 0x3C, 0x2F, 0x48,  // ch>36</H\r
+                    /* 0130 */  0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61,  // orizonta\r
+                    /* 0138 */  0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72,  // lBackPor\r
+                    /* 0140 */  0x63, 0x68, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72,  // ch> <Hor\r
+                    /* 0148 */  0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x53,  // izontalS\r
+                    /* 0150 */  0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73, 0x65,  // yncPulse\r
+                    /* 0158 */  0x3E, 0x31, 0x36, 0x3C, 0x2F, 0x48, 0x6F, 0x72,  // >16</Hor\r
+                    /* 0160 */  0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x53,  // izontalS\r
+                    /* 0168 */  0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73, 0x65,  // yncPulse\r
+                    /* 0170 */  0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72, 0x69, 0x7A,  // > <Horiz\r
+                    /* 0178 */  0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x53, 0x79, 0x6E,  // ontalSyn\r
+                    /* 0180 */  0x63, 0x53, 0x6B, 0x65, 0x77, 0x3E, 0x30, 0x3C,  // cSkew>0<\r
+                    /* 0188 */  0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E,  // /Horizon\r
+                    /* 0190 */  0x74, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x53,  // talSyncS\r
+                    /* 0198 */  0x6B, 0x65, 0x77, 0x3E, 0x20, 0x3C, 0x48, 0x6F,  // kew> <Ho\r
+                    /* 01A0 */  0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,  // rizontal\r
+                    /* 01A8 */  0x4C, 0x65, 0x66, 0x74, 0x42, 0x6F, 0x72, 0x64,  // LeftBord\r
+                    /* 01B0 */  0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x48, 0x6F,  // er>0</Ho\r
+                    /* 01B8 */  0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,  // rizontal\r
+                    /* 01C0 */  0x4C, 0x65, 0x66, 0x74, 0x42, 0x6F, 0x72, 0x64,  // LeftBord\r
+                    /* 01C8 */  0x65, 0x72, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72,  // er> <Hor\r
+                    /* 01D0 */  0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x52,  // izontalR\r
+                    /* 01D8 */  0x69, 0x67, 0x68, 0x74, 0x42, 0x6F, 0x72, 0x64,  // ightBord\r
+                    /* 01E0 */  0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x48, 0x6F,  // er>0</Ho\r
+                    /* 01E8 */  0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,  // rizontal\r
+                    /* 01F0 */  0x52, 0x69, 0x67, 0x68, 0x74, 0x42, 0x6F, 0x72,  // RightBor\r
+                    /* 01F8 */  0x64, 0x65, 0x72, 0x3E, 0x20, 0x3C, 0x56, 0x65,  // der> <Ve\r
+                    /* 0200 */  0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x41, 0x63,  // rticalAc\r
+                    /* 0208 */  0x74, 0x69, 0x76, 0x65, 0x3E, 0x32, 0x32, 0x38,  // tive>228\r
+                    /* 0210 */  0x30, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74, 0x69,  // 0</Verti\r
+                    /* 0218 */  0x63, 0x61, 0x6C, 0x41, 0x63, 0x74, 0x69, 0x76,  // calActiv\r
+                    /* 0220 */  0x65, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74,  // e> <Vert\r
+                    /* 0228 */  0x69, 0x63, 0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E,  // icalFron\r
+                    /* 0230 */  0x74, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x33,  // tPorch>3\r
+                    /* 0238 */  0x36, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74, 0x69,  // 6</Verti\r
+                    /* 0240 */  0x63, 0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E, 0x74,  // calFront\r
+                    /* 0248 */  0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x20, 0x3C,  // Porch> <\r
+                    /* 0250 */  0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C,  // Vertical\r
+                    /* 0258 */  0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72, 0x63,  // BackPorc\r
+                    /* 0260 */  0x68, 0x3E, 0x31, 0x32, 0x3C, 0x2F, 0x56, 0x65,  // h>12</Ve\r
+                    /* 0268 */  0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x42, 0x61,  // rticalBa\r
+                    /* 0270 */  0x63, 0x6B, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E,  // ckPorch>\r
+                    /* 0278 */  0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63,  //  <Vertic\r
+                    /* 0280 */  0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x50, 0x75,  // alSyncPu\r
+                    /* 0288 */  0x6C, 0x73, 0x65, 0x3E, 0x38, 0x3C, 0x2F, 0x56,  // lse>8</V\r
+                    /* 0290 */  0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x53,  // erticalS\r
+                    /* 0298 */  0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73, 0x65,  // yncPulse\r
+                    /* 02A0 */  0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69,  // > <Verti\r
+                    /* 02A8 */  0x63, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x53,  // calSyncS\r
+                    /* 02B0 */  0x6B, 0x65, 0x77, 0x3E, 0x30, 0x3C, 0x2F, 0x56,  // kew>0</V\r
+                    /* 02B8 */  0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x53,  // erticalS\r
+                    /* 02C0 */  0x79, 0x6E, 0x63, 0x53, 0x6B, 0x65, 0x77, 0x3E,  // yncSkew>\r
+                    /* 02C8 */  0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63,  //  <Vertic\r
+                    /* 02D0 */  0x61, 0x6C, 0x54, 0x6F, 0x70, 0x42, 0x6F, 0x72,  // alTopBor\r
+                    /* 02D8 */  0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x56,  // der>0</V\r
+                    /* 02E0 */  0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x54,  // erticalT\r
+                    /* 02E8 */  0x6F, 0x70, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72,  // opBorder\r
+                    /* 02F0 */  0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69,  // > <Verti\r
+                    /* 02F8 */  0x63, 0x61, 0x6C, 0x42, 0x6F, 0x74, 0x74, 0x6F,  // calBotto\r
+                    /* 0300 */  0x6D, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x3E,  // mBorder>\r
+                    /* 0308 */  0x30, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74, 0x69,  // 0</Verti\r
+                    /* 0310 */  0x63, 0x61, 0x6C, 0x42, 0x6F, 0x74, 0x74, 0x6F,  // calBotto\r
+                    /* 0318 */  0x6D, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x3E,  // mBorder>\r
+                    /* 0320 */  0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72, 0x74,  //  <Invert\r
+                    /* 0328 */  0x44, 0x61, 0x74, 0x61, 0x50, 0x6F, 0x6C, 0x61,  // DataPola\r
+                    /* 0330 */  0x72, 0x69, 0x74, 0x79, 0x3E, 0x46, 0x61, 0x6C,  // rity>Fal\r
+                    /* 0338 */  0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E, 0x76, 0x65,  // se</Inve\r
+                    /* 0340 */  0x72, 0x74, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6F,  // rtDataPo\r
+                    /* 0348 */  0x6C, 0x61, 0x72, 0x69, 0x74, 0x79, 0x3E, 0x20,  // larity> \r
+                    /* 0350 */  0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72, 0x74, 0x56,  // <InvertV\r
+                    /* 0358 */  0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F, 0x6C, 0x61,  // syncPola\r
+                    /* 0360 */  0x69, 0x72, 0x74, 0x79, 0x3E, 0x46, 0x61, 0x6C,  // irty>Fal\r
+                    /* 0368 */  0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E, 0x76, 0x65,  // se</Inve\r
+                    /* 0370 */  0x72, 0x74, 0x56, 0x73, 0x79, 0x6E, 0x63, 0x50,  // rtVsyncP\r
+                    /* 0378 */  0x6F, 0x6C, 0x61, 0x69, 0x72, 0x74, 0x79, 0x3E,  // olairty>\r
+                    /* 0380 */  0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72, 0x74,  //  <Invert\r
+                    /* 0388 */  0x48, 0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F, 0x6C,  // HsyncPol\r
+                    /* 0390 */  0x61, 0x72, 0x69, 0x74, 0x79, 0x3E, 0x46, 0x61,  // arity>Fa\r
+                    /* 0398 */  0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E, 0x76,  // lse</Inv\r
+                    /* 03A0 */  0x65, 0x72, 0x74, 0x48, 0x73, 0x79, 0x6E, 0x63,  // ertHsync\r
+                    /* 03A8 */  0x50, 0x6F, 0x6C, 0x61, 0x72, 0x69, 0x74, 0x79,  // Polarity\r
+                    /* 03B0 */  0x3E, 0x20, 0x3C, 0x42, 0x6F, 0x72, 0x64, 0x65,  // > <Borde\r
+                    /* 03B8 */  0x72, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x3E, 0x30,  // rColor>0\r
+                    /* 03C0 */  0x78, 0x30, 0x3C, 0x2F, 0x42, 0x6F, 0x72, 0x64,  // x0</Bord\r
+                    /* 03C8 */  0x65, 0x72, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x3E,  // erColor>\r
+                    /* 03D0 */  0x3C, 0x2F, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E,  // </Group>\r
+                    /* 03D8 */  0x3C, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x20, 0x69,  // <Group i\r
+                    /* 03E0 */  0x64, 0x3D, 0x22, 0x44, 0x69, 0x73, 0x70, 0x6C,  // d="Displ\r
+                    /* 03E8 */  0x61, 0x79, 0x20, 0x49, 0x6E, 0x74, 0x65, 0x72,  // ay Inter\r
+                    /* 03F0 */  0x66, 0x61, 0x63, 0x65, 0x22, 0x3E, 0x20, 0x3C,  // face"> <\r
+                    /* 03F8 */  0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63,  // Interfac\r
+                    /* 0400 */  0x65, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x39, 0x3C,  // eType>9<\r
+                    /* 0408 */  0x2F, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61,  // /Interfa\r
+                    /* 0410 */  0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x20,  // ceType> \r
+                    /* 0418 */  0x3C, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61,  // <Interfa\r
+                    /* 0420 */  0x63, 0x65, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x46,  // ceColorF\r
+                    /* 0428 */  0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x33, 0x3C,  // ormat>3<\r
+                    /* 0430 */  0x2F, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61,  // /Interfa\r
+                    /* 0438 */  0x63, 0x65, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x46,  // ceColorF\r
+                    /* 0440 */  0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x3C, 0x2F,  // ormat></\r
+                    /* 0448 */  0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E, 0x3C, 0x47,  // Group><G\r
+                    /* 0450 */  0x72, 0x6F, 0x75, 0x70, 0x20, 0x69, 0x64, 0x3D,  // roup id=\r
+                    /* 0458 */  0x22, 0x44, 0x53, 0x49, 0x20, 0x49, 0x6E, 0x74,  // "DSI Int\r
+                    /* 0460 */  0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x3E,  // erface">\r
+                    /* 0468 */  0x20, 0x3C, 0x44, 0x53, 0x49, 0x43, 0x68, 0x61,  //  <DSICha\r
+                    /* 0470 */  0x6E, 0x6E, 0x65, 0x6C, 0x49, 0x64, 0x3E, 0x32,  // nnelId>2\r
+                    /* 0478 */  0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43, 0x68, 0x61,  // </DSICha\r
+                    /* 0480 */  0x6E, 0x6E, 0x65, 0x6C, 0x49, 0x64, 0x3E, 0x20,  // nnelId> \r
+                    /* 0488 */  0x3C, 0x44, 0x53, 0x49, 0x56, 0x69, 0x72, 0x74,  // <DSIVirt\r
+                    /* 0490 */  0x75, 0x61, 0x6C, 0x49, 0x64, 0x3E, 0x30, 0x3C,  // ualId>0<\r
+                    /* 0498 */  0x2F, 0x44, 0x53, 0x49, 0x56, 0x69, 0x72, 0x74,  // /DSIVirt\r
+                    /* 04A0 */  0x75, 0x61, 0x6C, 0x49, 0x64, 0x3E, 0x20, 0x3C,  // ualId> <\r
+                    /* 04A8 */  0x44, 0x53, 0x49, 0x43, 0x6F, 0x6C, 0x6F, 0x72,  // DSIColor\r
+                    /* 04B0 */  0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x33,  // Format>3\r
+                    /* 04B8 */  0x36, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43, 0x6F,  // 6</DSICo\r
+                    /* 04C0 */  0x6C, 0x6F, 0x72, 0x46, 0x6F, 0x72, 0x6D, 0x61,  // lorForma\r
+                    /* 04C8 */  0x74, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x54,  // t> <DSIT\r
+                    /* 04D0 */  0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x4D, 0x6F,  // rafficMo\r
+                    /* 04D8 */  0x64, 0x65, 0x3E, 0x31, 0x3C, 0x2F, 0x44, 0x53,  // de>1</DS\r
+                    /* 04E0 */  0x49, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63,  // ITraffic\r
+                    /* 04E8 */  0x4D, 0x6F, 0x64, 0x65, 0x3E, 0x20, 0x3C, 0x44,  // Mode> <D\r
+                    /* 04F0 */  0x53, 0x49, 0x4C, 0x61, 0x6E, 0x65, 0x73, 0x3E,  // SILanes>\r
+                    /* 04F8 */  0x34, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x4C, 0x61,  // 4</DSILa\r
+                    /* 0500 */  0x6E, 0x65, 0x73, 0x3E, 0x20, 0x3C, 0x44, 0x53,  // nes> <DS\r
+                    /* 0508 */  0x49, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,  // IRefresh\r
+                    /* 0510 */  0x52, 0x61, 0x74, 0x65, 0x3E, 0x30, 0x78, 0x33,  // Rate>0x3\r
+                    /* 0518 */  0x43, 0x30, 0x30, 0x30, 0x30, 0x3C, 0x2F, 0x44,  // C0000</D\r
+                    /* 0520 */  0x53, 0x49, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,  // SIRefres\r
+                    /* 0528 */  0x68, 0x52, 0x61, 0x74, 0x65, 0x3E, 0x20, 0x3C,  // hRate> <\r
+                    /* 0530 */  0x44, 0x53, 0x49, 0x43, 0x6D, 0x64, 0x53, 0x77,  // DSICmdSw\r
+                    /* 0538 */  0x61, 0x70, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66,  // apInterf\r
+                    /* 0540 */  0x61, 0x63, 0x65, 0x3E, 0x46, 0x61, 0x6C, 0x73,  // ace>Fals\r
+                    /* 0548 */  0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43, 0x6D,  // e</DSICm\r
+                    /* 0550 */  0x64, 0x53, 0x77, 0x61, 0x70, 0x49, 0x6E, 0x74,  // dSwapInt\r
+                    /* 0558 */  0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3E, 0x20,  // erface> \r
+                    /* 0560 */  0x3C, 0x44, 0x53, 0x49, 0x43, 0x6D, 0x64, 0x55,  // <DSICmdU\r
+                    /* 0568 */  0x73, 0x69, 0x6E, 0x67, 0x54, 0x72, 0x69, 0x67,  // singTrig\r
+                    /* 0570 */  0x67, 0x65, 0x72, 0x3E, 0x46, 0x61, 0x6C, 0x73,  // ger>Fals\r
+                    /* 0578 */  0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43, 0x6D,  // e</DSICm\r
+                    /* 0580 */  0x64, 0x55, 0x73, 0x69, 0x6E, 0x67, 0x54, 0x72,  // dUsingTr\r
+                    /* 0588 */  0x69, 0x67, 0x67, 0x65, 0x72, 0x3E, 0x20, 0x3C,  // igger> <\r
+                    /* 0590 */  0x44, 0x53, 0x49, 0x45, 0x6E, 0x61, 0x62, 0x6C,  // DSIEnabl\r
+                    /* 0598 */  0x65, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65, 0x66,  // eAutoRef\r
+                    /* 05A0 */  0x72, 0x65, 0x73, 0x68, 0x3E, 0x54, 0x72, 0x75,  // resh>Tru\r
+                    /* 05A8 */  0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x45, 0x6E,  // e</DSIEn\r
+                    /* 05B0 */  0x61, 0x62, 0x6C, 0x65, 0x41, 0x75, 0x74, 0x6F,  // ableAuto\r
+                    /* 05B8 */  0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x3E,  // Refresh>\r
+                    /* 05C0 */  0x20, 0x3C, 0x44, 0x53, 0x49, 0x41, 0x75, 0x74,  //  <DSIAut\r
+                    /* 05C8 */  0x6F, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,  // oRefresh\r
+                    /* 05D0 */  0x46, 0x72, 0x61, 0x6D, 0x65, 0x4E, 0x75, 0x6D,  // FrameNum\r
+                    /* 05D8 */  0x44, 0x69, 0x76, 0x3E, 0x31, 0x3C, 0x2F, 0x44,  // Div>1</D\r
+                    /* 05E0 */  0x53, 0x49, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65,  // SIAutoRe\r
+                    /* 05E8 */  0x66, 0x72, 0x65, 0x73, 0x68, 0x46, 0x72, 0x61,  // freshFra\r
+                    /* 05F0 */  0x6D, 0x65, 0x4E, 0x75, 0x6D, 0x44, 0x69, 0x76,  // meNumDiv\r
+                    /* 05F8 */  0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x43, 0x6F,  // > <DSICo\r
+                    /* 0600 */  0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x6C, 0x65, 0x72,  // ntroller\r
+                    /* 0608 */  0x4D, 0x61, 0x70, 0x70, 0x69, 0x6E, 0x67, 0x3E,  // Mapping>\r
+                    /* 0610 */  0x0A, 0x20, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x3C,  // .  00. <\r
+                    /* 0618 */  0x2F, 0x44, 0x53, 0x49, 0x43, 0x6F, 0x6E, 0x74,  // /DSICont\r
+                    /* 0620 */  0x72, 0x6F, 0x6C, 0x6C, 0x65, 0x72, 0x4D, 0x61,  // rollerMa\r
+                    /* 0628 */  0x70, 0x70, 0x69, 0x6E, 0x67, 0x3E, 0x0A, 0x20,  // pping>. \r
+                    /* 0630 */  0x3C, 0x44, 0x53, 0x49, 0x4C, 0x50, 0x31, 0x31,  // <DSILP11\r
+                    /* 0638 */  0x41, 0x74, 0x49, 0x6E, 0x69, 0x74, 0x3E, 0x54,  // AtInit>T\r
+                    /* 0640 */  0x72, 0x75, 0x65, 0x3C, 0x2F, 0x44, 0x53, 0x49,  // rue</DSI\r
+                    /* 0648 */  0x4C, 0x50, 0x31, 0x31, 0x41, 0x74, 0x49, 0x6E,  // LP11AtIn\r
+                    /* 0650 */  0x69, 0x74, 0x3E, 0x3C, 0x2F, 0x47, 0x72, 0x6F,  // it></Gro\r
+                    /* 0658 */  0x75, 0x70, 0x3E, 0x3C, 0x44, 0x53, 0x49, 0x49,  // up><DSII\r
+                    /* 0660 */  0x6E, 0x69, 0x74, 0x53, 0x65, 0x71, 0x75, 0x65,  // nitSeque\r
+                    /* 0668 */  0x6E, 0x63, 0x65, 0x3E, 0x20, 0x30, 0x35, 0x20,  // nce> 05 \r
+                    /* 0670 */  0x31, 0x31, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x66,  // 11 00. f\r
+                    /* 0678 */  0x66, 0x20, 0x30, 0x41, 0x0A, 0x20, 0x32, 0x39,  // f 0A. 29\r
+                    /* 0680 */  0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35,  //  F0 5A 5\r
+                    /* 0688 */  0x41, 0x0A, 0x20, 0x32, 0x39, 0x20, 0x42, 0x30,  // A. 29 B0\r
+                    /* 0690 */  0x20, 0x30, 0x37, 0x0A, 0x20, 0x32, 0x39, 0x20,  //  07. 29 \r
+                    /* 0698 */  0x42, 0x36, 0x20, 0x31, 0x32, 0x0A, 0x20, 0x32,  // B6 12. 2\r
+                    /* 06A0 */  0x39, 0x20, 0x42, 0x30, 0x20, 0x30, 0x31, 0x0A,  // 9 B0 01.\r
+                    /* 06A8 */  0x20, 0x32, 0x39, 0x20, 0x42, 0x42, 0x20, 0x30,  //  29 BB 0\r
+                    /* 06B0 */  0x33, 0x0A, 0x20, 0x32, 0x39, 0x20, 0x45, 0x46,  // 3. 29 EF\r
+                    /* 06B8 */  0x20, 0x42, 0x30, 0x20, 0x33, 0x31, 0x20, 0x30,  //  B0 31 0\r
+                    /* 06C0 */  0x30, 0x20, 0x33, 0x33, 0x20, 0x33, 0x31, 0x20,  // 0 33 31 \r
+                    /* 06C8 */  0x31, 0x34, 0x20, 0x33, 0x35, 0x0A, 0x20, 0x32,  // 14 35. 2\r
+                    /* 06D0 */  0x39, 0x20, 0x46, 0x30, 0x20, 0x41, 0x35, 0x20,  // 9 F0 A5 \r
+                    /* 06D8 */  0x41, 0x35, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46,  // A5. 39 F\r
+                    /* 06E0 */  0x30, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A,  // 0 5A 5A.\r
+                    /* 06E8 */  0x20, 0x31, 0x35, 0x20, 0x33, 0x35, 0x20, 0x30,  //  15 35 0\r
+                    /* 06F0 */  0x30, 0x0A, 0x20, 0x32, 0x39, 0x20, 0x46, 0x30,  // 0. 29 F0\r
+                    /* 06F8 */  0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20,  //  A5 A5. \r
+                    /* 0700 */  0x32, 0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41,  // 29 F0 5A\r
+                    /* 0708 */  0x20, 0x35, 0x41, 0x0A, 0x20, 0x32, 0x39, 0x20,  //  5A. 29 \r
+                    /* 0710 */  0x45, 0x32, 0x20, 0x30, 0x30, 0x20, 0x34, 0x30,  // E2 00 40\r
+                    /* 0718 */  0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30, 0x20,  // . 39 F0 \r
+                    /* 0720 */  0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x31,  // A5 A5. 1\r
+                    /* 0728 */  0x35, 0x20, 0x35, 0x33, 0x20, 0x32, 0x30, 0x0A,  // 5 53 20.\r
+                    /* 0730 */  0x20, 0x31, 0x35, 0x20, 0x35, 0x35, 0x20, 0x30,  //  15 55 0\r
+                    /* 0738 */  0x30, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x37, 0x38,  // 0. ff 78\r
+                    /* 0740 */  0x0A, 0x20, 0x30, 0x35, 0x20, 0x32, 0x39, 0x20,  // . 05 29 \r
+                    /* 0748 */  0x30, 0x30, 0x0A, 0x3C, 0x2F, 0x44, 0x53, 0x49,  // 00.</DSI\r
+                    /* 0750 */  0x49, 0x6E, 0x69, 0x74, 0x53, 0x65, 0x71, 0x75,  // InitSequ\r
+                    /* 0758 */  0x65, 0x6E, 0x63, 0x65, 0x3E, 0x3C, 0x44, 0x53,  // ence><DS\r
+                    /* 0760 */  0x49, 0x54, 0x65, 0x72, 0x6D, 0x53, 0x65, 0x71,  // ITermSeq\r
+                    /* 0768 */  0x75, 0x65, 0x6E, 0x63, 0x65, 0x3E, 0x20, 0x30,  // uence> 0\r
+                    /* 0770 */  0x35, 0x20, 0x32, 0x38, 0x20, 0x30, 0x30, 0x0A,  // 5 28 00.\r
+                    /* 0778 */  0x20, 0x66, 0x66, 0x20, 0x32, 0x38, 0x0A, 0x20,  //  ff 28. \r
+                    /* 0780 */  0x30, 0x35, 0x20, 0x31, 0x30, 0x20, 0x30, 0x30,  // 05 10 00\r
+                    /* 0788 */  0x0A, 0x20, 0x66, 0x66, 0x20, 0x38, 0x32, 0x0A,  // . ff 82.\r
+                    /* 0790 */  0x3C, 0x2F, 0x44, 0x53, 0x49, 0x54, 0x65, 0x72,  // </DSITer\r
+                    /* 0798 */  0x6D, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6E, 0x63,  // mSequenc\r
+                    /* 07A0 */  0x65, 0x3E, 0x3C, 0x47, 0x72, 0x6F, 0x75, 0x70,  // e><Group\r
+                    /* 07A8 */  0x20, 0x69, 0x64, 0x3D, 0x27, 0x42, 0x61, 0x63,  //  id='Bac\r
+                    /* 07B0 */  0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x20, 0x43,  // klight C\r
+                    /* 07B8 */  0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,  // onfigura\r
+                    /* 07C0 */  0x74, 0x69, 0x6F, 0x6E, 0x27, 0x3E, 0x20, 0x3C,  // tion'> <\r
+                    /* 07C8 */  0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67, 0x68,  // Backligh\r
+                    /* 07D0 */  0x74, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x33, 0x3C,  // tType>3<\r
+                    /* 07D8 */  0x2F, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67,  // /Backlig\r
+                    /* 07E0 */  0x68, 0x74, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x20,  // htType> \r
+                    /* 07E8 */  0x3C, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67,  // <Backlig\r
+                    /* 07F0 */  0x68, 0x74, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6C,  // htDefaul\r
+                    /* 07F8 */  0x74, 0x3E, 0x35, 0x30, 0x3C, 0x2F, 0x42, 0x61,  // t>50</Ba\r
+                    /* 0800 */  0x63, 0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x44,  // cklightD\r
+                    /* 0808 */  0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x3E, 0x20,  // efault> \r
+                    /* 0810 */  0x3C, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67,  // <Backlig\r
+                    /* 0818 */  0x68, 0x74, 0x53, 0x74, 0x65, 0x70, 0x73, 0x3E,  // htSteps>\r
+                    /* 0820 */  0x31, 0x30, 0x30, 0x3C, 0x2F, 0x42, 0x61, 0x63,  // 100</Bac\r
+                    /* 0828 */  0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x53, 0x74,  // klightSt\r
+                    /* 0830 */  0x65, 0x70, 0x73, 0x3E, 0x20, 0x3C, 0x44, 0x69,  // eps> <Di\r
+                    /* 0838 */  0x73, 0x70, 0x6C, 0x61, 0x79, 0x50, 0x72, 0x69,  // splayPri\r
+                    /* 0840 */  0x6D, 0x61, 0x72, 0x79, 0x46, 0x6C, 0x61, 0x67,  // maryFlag\r
+                    /* 0848 */  0x73, 0x3E, 0x30, 0x78, 0x34, 0x3C, 0x2F, 0x44,  // s>0x4</D\r
+                    /* 0850 */  0x69, 0x73, 0x70, 0x6C, 0x61, 0x79, 0x50, 0x72,  // isplayPr\r
+                    /* 0858 */  0x69, 0x6D, 0x61, 0x72, 0x79, 0x46, 0x6C, 0x61,  // imaryFla\r
+                    /* 0860 */  0x67, 0x73, 0x3E, 0x20, 0x3C, 0x42, 0x72, 0x69,  // gs> <Bri\r
+                    /* 0868 */  0x67, 0x68, 0x74, 0x6E, 0x65, 0x73, 0x73, 0x4D,  // ghtnessM\r
+                    /* 0870 */  0x69, 0x6E, 0x4C, 0x75, 0x6D, 0x69, 0x6E, 0x61,  // inLumina\r
+                    /* 0878 */  0x6E, 0x63, 0x65, 0x3E, 0x32, 0x30, 0x30, 0x30,  // nce>2000\r
+                    /* 0880 */  0x3C, 0x2F, 0x42, 0x72, 0x69, 0x67, 0x68, 0x74,  // </Bright\r
+                    /* 0888 */  0x6E, 0x65, 0x73, 0x73, 0x4D, 0x69, 0x6E, 0x4C,  // nessMinL\r
+                    /* 0890 */  0x75, 0x6D, 0x69, 0x6E, 0x61, 0x6E, 0x63, 0x65,  // uminance\r
+                    /* 0898 */  0x3E, 0x20, 0x3C, 0x42, 0x72, 0x69, 0x67, 0x68,  // > <Brigh\r
+                    /* 08A0 */  0x74, 0x6E, 0x65, 0x73, 0x73, 0x4D, 0x61, 0x78,  // tnessMax\r
+                    /* 08A8 */  0x4C, 0x75, 0x6D, 0x69, 0x6E, 0x61, 0x6E, 0x63,  // Luminanc\r
+                    /* 08B0 */  0x65, 0x3E, 0x33, 0x36, 0x30, 0x30, 0x30, 0x30,  // e>360000\r
+                    /* 08B8 */  0x3C, 0x2F, 0x42, 0x72, 0x69, 0x67, 0x68, 0x74,  // </Bright\r
+                    /* 08C0 */  0x6E, 0x65, 0x73, 0x73, 0x4D, 0x61, 0x78, 0x4C,  // nessMaxL\r
+                    /* 08C8 */  0x75, 0x6D, 0x69, 0x6E, 0x61, 0x6E, 0x63, 0x65,  // uminance\r
+                    /* 08D0 */  0x3E, 0x20, 0x3C, 0x44, 0x69, 0x73, 0x70, 0x6C,  // > <Displ\r
+                    /* 08D8 */  0x61, 0x79, 0x52, 0x65, 0x73, 0x65, 0x74, 0x49,  // ayResetI\r
+                    /* 08E0 */  0x6E, 0x66, 0x6F, 0x3E, 0x30, 0x20, 0x32, 0x30,  // nfo>0 20\r
+                    /* 08E8 */  0x30, 0x30, 0x20, 0x35, 0x30, 0x30, 0x30, 0x20,  // 00 5000 \r
+                    /* 08F0 */  0x31, 0x32, 0x30, 0x30, 0x30, 0x20, 0x30, 0x3C,  // 12000 0<\r
+                    /* 08F8 */  0x2F, 0x44, 0x69, 0x73, 0x70, 0x6C, 0x61, 0x79,  // /Display\r
+                    /* 0900 */  0x52, 0x65, 0x73, 0x65, 0x74, 0x49, 0x6E, 0x66,  // ResetInf\r
+                    /* 0908 */  0x6F, 0x3E, 0x0A, 0x3C, 0x2F, 0x47, 0x72, 0x6F,  // o>.</Gro\r
+                    /* 0910 */  0x75, 0x70, 0x3E, 0x0A, 0x00                     // up>..\r
+                })\r
+                Local2 = PCFG /* \_SB_.GPU0._ROM.PCFG */\r
+                If ((Arg0 >= SizeOf (Local2)))\r
+                {\r
+                    Return (Buffer (One)\r
+                    {\r
+                         0x00                                             // .\r
+                    })\r
+                }\r
+                Else\r
+                {\r
+                    Local0 = Arg0\r
+                }\r
+\r
+                If ((Arg1 > 0x1000))\r
+                {\r
+                    Local1 = 0x1000\r
+                }\r
+                Else\r
+                {\r
+                    Local1 = Arg1\r
+                }\r
+\r
+                If (((Local0 + Local1) > SizeOf (Local2)))\r
+                {\r
+                    Local1 = (SizeOf (Local2) - Local0)\r
+                }\r
+\r
+                CreateField (Local2, (0x08 * Local0), (0x08 * Local1), RBUF)\r
+                Return (RBUF) /* \_SB_.GPU0._ROM.RBUF */\r
+            }\r
+\r
+            Method (PIGC, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                Return (RBUF) /* \_SB_.GPU0.PIGC.RBUF */\r
+            }\r
+\r
+            Method (PPCC, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (One)\r
                 {\r
-    0x3C, 0x3F, 0x78, 0x6D, 0x6C, 0x20, 0x76, 0x65,\r
-    0x72, 0x73, 0x69, 0x6F, 0x6E, 0x3D, 0x22, 0x31,\r
-    0x2E, 0x30, 0x22, 0x20, 0x65, 0x6E, 0x63, 0x6F,\r
-    0x64, 0x69, 0x6E, 0x67, 0x3D, 0x22, 0x75, 0x74,\r
-    0x66, 0x2D, 0x38, 0x22, 0x3F, 0x3E, 0x3C, 0x50,\r
-    0x61, 0x6E, 0x65, 0x6C, 0x4E, 0x61, 0x6D, 0x65,\r
-    0x3E, 0x53, 0x36, 0x45, 0x33, 0x46, 0x43, 0x32,\r
-    0x58, 0x30, 0x31, 0x3C, 0x2F, 0x50, 0x61, 0x6E,\r
-    0x65, 0x6C, 0x4E, 0x61, 0x6D, 0x65, 0x3E, 0x3C,\r
-    0x50, 0x61, 0x6E, 0x65, 0x6C, 0x44, 0x65, 0x73,\r
-    0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6F, 0x6E,\r
-    0x3E, 0x73, 0x61, 0x6D, 0x73, 0x75, 0x6E, 0x67,\r
-    0x20, 0x53, 0x36, 0x45, 0x33, 0x46, 0x43, 0x32,\r
-    0x58, 0x30, 0x31, 0x20, 0x63, 0x6D, 0x64, 0x20,\r
-    0x6D, 0x6F, 0x64, 0x65, 0x20, 0x64, 0x73, 0x69,\r
-    0x20, 0x70, 0x61, 0x6E, 0x65, 0x6C, 0x28, 0x31,\r
-    0x30, 0x38, 0x30, 0x78, 0x32, 0x33, 0x34, 0x30,\r
-    0x20, 0x32, 0x34, 0x62, 0x70, 0x70, 0x29, 0x3C,\r
-    0x2F, 0x50, 0x61, 0x6E, 0x65, 0x6C, 0x44, 0x65,\r
-    0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6F,\r
-    0x6E, 0x3E, 0x3C, 0x47, 0x72, 0x6F, 0x75, 0x70,\r
-    0x20, 0x69, 0x64, 0x3D, 0x22, 0x41, 0x63, 0x74,\r
-    0x69, 0x76, 0x65, 0x20, 0x54, 0x69, 0x6D, 0x69,\r
-    0x6E, 0x67, 0x22, 0x3E, 0x20, 0x3C, 0x48, 0x6F,\r
-    0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,\r
-    0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x3E, 0x31,\r
-    0x30, 0x38, 0x30, 0x3C, 0x2F, 0x48, 0x6F, 0x72,\r
-    0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x41,\r
-    0x63, 0x74, 0x69, 0x76, 0x65, 0x3E, 0x20, 0x3C,\r
-    0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74,\r
-    0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E, 0x74, 0x50,\r
-    0x6F, 0x72, 0x63, 0x68, 0x3E, 0x37, 0x32, 0x3C,\r
-    0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E,\r
-    0x74, 0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E, 0x74,\r
-    0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x20, 0x3C,\r
-    0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74,\r
-    0x61, 0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F,\r
-    0x72, 0x63, 0x68, 0x3E, 0x33, 0x36, 0x3C, 0x2F,\r
-    0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74,\r
-    0x61, 0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F,\r
-    0x72, 0x63, 0x68, 0x3E, 0x20, 0x3C, 0x48, 0x6F,\r
-    0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,\r
-    0x53, 0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73,\r
-    0x65, 0x3E, 0x31, 0x36, 0x3C, 0x2F, 0x48, 0x6F,\r
-    0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,\r
-    0x53, 0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73,\r
-    0x65, 0x3E, 0x20, 0x3C, 0x48, 0x6F, 0x72, 0x69,\r
-    0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C, 0x53, 0x79,\r
-    0x6E, 0x63, 0x53, 0x6B, 0x65, 0x77, 0x3E, 0x30,\r
-    0x3C, 0x2F, 0x48, 0x6F, 0x72, 0x69, 0x7A, 0x6F,\r
-    0x6E, 0x74, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63,\r
-    0x53, 0x6B, 0x65, 0x77, 0x3E, 0x20, 0x3C, 0x48,\r
-    0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61,\r
-    0x6C, 0x4C, 0x65, 0x66, 0x74, 0x42, 0x6F, 0x72,\r
-    0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x48,\r
-    0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61,\r
-    0x6C, 0x4C, 0x65, 0x66, 0x74, 0x42, 0x6F, 0x72,\r
-    0x64, 0x65, 0x72, 0x3E, 0x20, 0x3C, 0x48, 0x6F,\r
-    0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61, 0x6C,\r
-    0x52, 0x69, 0x67, 0x68, 0x74, 0x42, 0x6F, 0x72,\r
-    0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F, 0x48,\r
-    0x6F, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x74, 0x61,\r
-    0x6C, 0x52, 0x69, 0x67, 0x68, 0x74, 0x42, 0x6F,\r
-    0x72, 0x64, 0x65, 0x72, 0x3E, 0x20, 0x3C, 0x56,\r
-    0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x41,\r
-    0x63, 0x74, 0x69, 0x76, 0x65, 0x3E, 0x32, 0x33,\r
-    0x34, 0x30, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74,\r
-    0x69, 0x63, 0x61, 0x6C, 0x41, 0x63, 0x74, 0x69,\r
-    0x76, 0x65, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72,\r
-    0x74, 0x69, 0x63, 0x61, 0x6C, 0x46, 0x72, 0x6F,\r
-    0x6E, 0x74, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E,\r
-    0x33, 0x32, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74,\r
-    0x69, 0x63, 0x61, 0x6C, 0x46, 0x72, 0x6F, 0x6E,\r
-    0x74, 0x50, 0x6F, 0x72, 0x63, 0x68, 0x3E, 0x20,\r
-    0x3C, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61,\r
-    0x6C, 0x42, 0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72,\r
-    0x63, 0x68, 0x3E, 0x31, 0x38, 0x3C, 0x2F, 0x56,\r
-    0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C, 0x42,\r
-    0x61, 0x63, 0x6B, 0x50, 0x6F, 0x72, 0x63, 0x68,\r
-    0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69,\r
-    0x63, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63, 0x50,\r
-    0x75, 0x6C, 0x73, 0x65, 0x3E, 0x34, 0x3C, 0x2F,\r
-    0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C,\r
-    0x53, 0x79, 0x6E, 0x63, 0x50, 0x75, 0x6C, 0x73,\r
-    0x65, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74,\r
-    0x69, 0x63, 0x61, 0x6C, 0x53, 0x79, 0x6E, 0x63,\r
-    0x53, 0x6B, 0x65, 0x77, 0x3E, 0x30, 0x3C, 0x2F,\r
-    0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C,\r
-    0x53, 0x79, 0x6E, 0x63, 0x53, 0x6B, 0x65, 0x77,\r
-    0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74, 0x69,\r
-    0x63, 0x61, 0x6C, 0x54, 0x6F, 0x70, 0x42, 0x6F,\r
-    0x72, 0x64, 0x65, 0x72, 0x3E, 0x30, 0x3C, 0x2F,\r
-    0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6C,\r
-    0x54, 0x6F, 0x70, 0x42, 0x6F, 0x72, 0x64, 0x65,\r
-    0x72, 0x3E, 0x20, 0x3C, 0x56, 0x65, 0x72, 0x74,\r
-    0x69, 0x63, 0x61, 0x6C, 0x42, 0x6F, 0x74, 0x74,\r
-    0x6F, 0x6D, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72,\r
-    0x3E, 0x30, 0x3C, 0x2F, 0x56, 0x65, 0x72, 0x74,\r
-    0x69, 0x63, 0x61, 0x6C, 0x42, 0x6F, 0x74, 0x74,\r
-    0x6F, 0x6D, 0x42, 0x6F, 0x72, 0x64, 0x65, 0x72,\r
-    0x3E, 0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72,\r
-    0x74, 0x44, 0x61, 0x74, 0x61, 0x50, 0x6F, 0x6C,\r
-    0x61, 0x72, 0x69, 0x74, 0x79, 0x3E, 0x46, 0x61,\r
-    0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E, 0x76,\r
-    0x65, 0x72, 0x74, 0x44, 0x61, 0x74, 0x61, 0x50,\r
-    0x6F, 0x6C, 0x61, 0x72, 0x69, 0x74, 0x79, 0x3E,\r
-    0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72, 0x74,\r
-    0x56, 0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F, 0x6C,\r
-    0x61, 0x69, 0x72, 0x74, 0x79, 0x3E, 0x46, 0x61,\r
-    0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E, 0x76,\r
-    0x65, 0x72, 0x74, 0x56, 0x73, 0x79, 0x6E, 0x63,\r
-    0x50, 0x6F, 0x6C, 0x61, 0x69, 0x72, 0x74, 0x79,\r
-    0x3E, 0x20, 0x3C, 0x49, 0x6E, 0x76, 0x65, 0x72,\r
-    0x74, 0x48, 0x73, 0x79, 0x6E, 0x63, 0x50, 0x6F,\r
-    0x6C, 0x61, 0x72, 0x69, 0x74, 0x79, 0x3E, 0x46,\r
-    0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F, 0x49, 0x6E,\r
-    0x76, 0x65, 0x72, 0x74, 0x48, 0x73, 0x79, 0x6E,\r
-    0x63, 0x50, 0x6F, 0x6C, 0x61, 0x72, 0x69, 0x74,\r
-    0x79, 0x3E, 0x20, 0x3C, 0x42, 0x6F, 0x72, 0x64,\r
-    0x65, 0x72, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x3E,\r
-    0x30, 0x78, 0x30, 0x3C, 0x2F, 0x42, 0x6F, 0x72,\r
-    0x64, 0x65, 0x72, 0x43, 0x6F, 0x6C, 0x6F, 0x72,\r
-    0x3E, 0x3C, 0x2F, 0x47, 0x72, 0x6F, 0x75, 0x70,\r
-    0x3E, 0x3C, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x20,\r
-    0x69, 0x64, 0x3D, 0x22, 0x44, 0x69, 0x73, 0x70,\r
-    0x6C, 0x61, 0x79, 0x20, 0x49, 0x6E, 0x74, 0x65,\r
-    0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x3E, 0x20,\r
-    0x3C, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61,\r
-    0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x39,\r
-    0x3C, 0x2F, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66,\r
-    0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x3E,\r
-    0x20, 0x3C, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66,\r
-    0x61, 0x63, 0x65, 0x43, 0x6F, 0x6C, 0x6F, 0x72,\r
-    0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x33,\r
-    0x3C, 0x2F, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66,\r
-    0x61, 0x63, 0x65, 0x43, 0x6F, 0x6C, 0x6F, 0x72,\r
-    0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E, 0x3C,\r
-    0x2F, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E, 0x3C,\r
-    0x47, 0x72, 0x6F, 0x75, 0x70, 0x20, 0x69, 0x64,\r
-    0x3D, 0x22, 0x44, 0x53, 0x49, 0x20, 0x49, 0x6E,\r
-    0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x22,\r
-    0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x43, 0x68,\r
-    0x61, 0x6E, 0x6E, 0x65, 0x6C, 0x49, 0x64, 0x3E,\r
-    0x32, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43, 0x68,\r
-    0x61, 0x6E, 0x6E, 0x65, 0x6C, 0x49, 0x64, 0x3E,\r
-    0x20, 0x3C, 0x44, 0x53, 0x49, 0x56, 0x69, 0x72,\r
-    0x74, 0x75, 0x61, 0x6C, 0x49, 0x64, 0x3E, 0x30,\r
-    0x3C, 0x2F, 0x44, 0x53, 0x49, 0x56, 0x69, 0x72,\r
-    0x74, 0x75, 0x61, 0x6C, 0x49, 0x64, 0x3E, 0x20,\r
-    0x3C, 0x44, 0x53, 0x49, 0x43, 0x6F, 0x6C, 0x6F,\r
-    0x72, 0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x3E,\r
-    0x33, 0x36, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x43,\r
-    0x6F, 0x6C, 0x6F, 0x72, 0x46, 0x6F, 0x72, 0x6D,\r
-    0x61, 0x74, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49,\r
-    0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x4D,\r
-    0x6F, 0x64, 0x65, 0x3E, 0x31, 0x3C, 0x2F, 0x44,\r
-    0x53, 0x49, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69,\r
-    0x63, 0x4D, 0x6F, 0x64, 0x65, 0x3E, 0x20, 0x3C,\r
-    0x44, 0x53, 0x49, 0x4C, 0x61, 0x6E, 0x65, 0x73,\r
-    0x3E, 0x34, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x4C,\r
-    0x61, 0x6E, 0x65, 0x73, 0x3E, 0x20, 0x3C, 0x44,\r
-    0x53, 0x49, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,\r
-    0x68, 0x52, 0x61, 0x74, 0x65, 0x3E, 0x30, 0x78,\r
-    0x33, 0x43, 0x30, 0x30, 0x30, 0x30, 0x3C, 0x2F,\r
-    0x44, 0x53, 0x49, 0x52, 0x65, 0x66, 0x72, 0x65,\r
-    0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x3E, 0x20,\r
-    0x3C, 0x44, 0x53, 0x49, 0x54, 0x45, 0x43, 0x68,\r
-    0x65, 0x63, 0x6B, 0x45, 0x6E, 0x61, 0x62, 0x6C,\r
-    0x65, 0x3E, 0x54, 0x72, 0x75, 0x65, 0x3C, 0x2F,\r
-    0x44, 0x53, 0x49, 0x54, 0x45, 0x43, 0x68, 0x65,\r
-    0x63, 0x6B, 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65,\r
-    0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49, 0x54, 0x45,\r
-    0x55, 0x73, 0x69, 0x6E, 0x67, 0x44, 0x65, 0x64,\r
-    0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x54, 0x45,\r
-    0x50, 0x69, 0x6E, 0x3E, 0x54, 0x72, 0x75, 0x65,\r
-    0x3C, 0x2F, 0x44, 0x53, 0x49, 0x54, 0x45, 0x55,\r
-    0x73, 0x69, 0x6E, 0x67, 0x44, 0x65, 0x64, 0x69,\r
-    0x63, 0x61, 0x74, 0x65, 0x64, 0x54, 0x45, 0x50,\r
-    0x69, 0x6E, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49,\r
-    0x43, 0x6D, 0x64, 0x53, 0x77, 0x61, 0x70, 0x49,\r
-    0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,\r
-    0x3E, 0x46, 0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F,\r
-    0x44, 0x53, 0x49, 0x43, 0x6D, 0x64, 0x53, 0x77,\r
-    0x61, 0x70, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66,\r
-    0x61, 0x63, 0x65, 0x3E, 0x20, 0x3C, 0x44, 0x53,\r
-    0x49, 0x43, 0x6D, 0x64, 0x55, 0x73, 0x69, 0x6E,\r
-    0x67, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,\r
-    0x3E, 0x46, 0x61, 0x6C, 0x73, 0x65, 0x3C, 0x2F,\r
-    0x44, 0x53, 0x49, 0x43, 0x6D, 0x64, 0x55, 0x73,\r
-    0x69, 0x6E, 0x67, 0x54, 0x72, 0x69, 0x67, 0x67,\r
-    0x65, 0x72, 0x3E, 0x20, 0x3C, 0x44, 0x53, 0x49,\r
-    0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x41, 0x75,\r
-    0x74, 0x6F, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,\r
-    0x68, 0x3E, 0x54, 0x72, 0x75, 0x65, 0x3C, 0x2F,\r
-    0x44, 0x53, 0x49, 0x45, 0x6E, 0x61, 0x62, 0x6C,\r
-    0x65, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65, 0x66,\r
-    0x72, 0x65, 0x73, 0x68, 0x3E, 0x20, 0x3C, 0x44,\r
-    0x53, 0x49, 0x41, 0x75, 0x74, 0x6F, 0x52, 0x65,\r
-    0x66, 0x72, 0x65, 0x73, 0x68, 0x46, 0x72, 0x61,\r
-    0x6D, 0x65, 0x4E, 0x75, 0x6D, 0x44, 0x69, 0x76,\r
-    0x3E, 0x31, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x41,\r
-    0x75, 0x74, 0x6F, 0x52, 0x65, 0x66, 0x72, 0x65,\r
-    0x73, 0x68, 0x46, 0x72, 0x61, 0x6D, 0x65, 0x4E,\r
-    0x75, 0x6D, 0x44, 0x69, 0x76, 0x3E, 0x20, 0x3C,\r
-    0x44, 0x53, 0x49, 0x43, 0x6F, 0x6E, 0x74, 0x72,\r
-    0x6F, 0x6C, 0x6C, 0x65, 0x72, 0x4D, 0x61, 0x70,\r
-    0x70, 0x69, 0x6E, 0x67, 0x3E, 0x0A, 0x20, 0x20,\r
-    0x30, 0x30, 0x0A, 0x20, 0x3C, 0x2F, 0x44, 0x53,\r
-    0x49, 0x43, 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C,\r
-    0x6C, 0x65, 0x72, 0x4D, 0x61, 0x70, 0x70, 0x69,\r
-    0x6E, 0x67, 0x3E, 0x0A, 0x20, 0x3C, 0x44, 0x53,\r
-    0x49, 0x4C, 0x50, 0x31, 0x31, 0x41, 0x74, 0x49,\r
-    0x6E, 0x69, 0x74, 0x3E, 0x54, 0x72, 0x75, 0x65,\r
-    0x3C, 0x2F, 0x44, 0x53, 0x49, 0x4C, 0x50, 0x31,\r
-    0x31, 0x41, 0x74, 0x49, 0x6E, 0x69, 0x74, 0x3E,\r
-    0x3C, 0x2F, 0x47, 0x72, 0x6F, 0x75, 0x70, 0x3E,\r
-    0x3C, 0x44, 0x53, 0x49, 0x49, 0x6E, 0x69, 0x74,\r
-    0x53, 0x65, 0x71, 0x75, 0x65, 0x6E, 0x63, 0x65,\r
-    0x3E, 0x20, 0x33, 0x39, 0x20, 0x39, 0x46, 0x20,\r
-    0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x30,\r
-    0x35, 0x20, 0x31, 0x31, 0x20, 0x30, 0x30, 0x0A,\r
-    0x20, 0x66, 0x66, 0x20, 0x30, 0x41, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x35, 0x41,\r
-    0x20, 0x35, 0x41, 0x35, 0x0A, 0x20, 0x33, 0x39,\r
-    0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35,\r
-    0x41, 0x0A, 0x20, 0x31, 0x35, 0x20, 0x42, 0x30,\r
-    0x20, 0x30, 0x31, 0x0A, 0x20, 0x31, 0x35, 0x20,\r
-    0x43, 0x44, 0x20, 0x30, 0x31, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20,\r
-    0x35, 0x41, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x30,\r
-    0x46, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x39, 0x46,\r
-    0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20,\r
-    0x31, 0x35, 0x20, 0x33, 0x35, 0x20, 0x30, 0x30,\r
-    0x0A, 0x20, 0x33, 0x39, 0x20, 0x39, 0x46, 0x20,\r
-    0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20,\r
-    0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x45,\r
-    0x42, 0x20, 0x31, 0x37, 0x20, 0x34, 0x31, 0x20,\r
-    0x39, 0x32, 0x20, 0x30, 0x45, 0x20, 0x31, 0x30,\r
-    0x20, 0x38, 0x32, 0x20, 0x35, 0x41, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x46, 0x30, 0x20, 0x41, 0x35,\r
-    0x20, 0x41, 0x35, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x32, 0x41, 0x20, 0x30, 0x30, 0x20, 0x30, 0x30,\r
-    0x20, 0x30, 0x34, 0x20, 0x33, 0x37, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x32, 0x42, 0x20, 0x30, 0x30,\r
-    0x20, 0x30, 0x30, 0x20, 0x30, 0x39, 0x20, 0x32,\r
-    0x33, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30,\r
-    0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x42, 0x30, 0x20, 0x30, 0x39,\r
-    0x0A, 0x20, 0x33, 0x39, 0x20, 0x45, 0x38, 0x20,\r
-    0x31, 0x30, 0x20, 0x33, 0x30, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x46, 0x30, 0x20, 0x41, 0x35, 0x20,\r
-    0x41, 0x35, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46,\r
-    0x43, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A,\r
-    0x20, 0x33, 0x39, 0x20, 0x42, 0x30, 0x20, 0x30,\r
-    0x31, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x45, 0x33,\r
-    0x20, 0x38, 0x38, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x42, 0x30, 0x20, 0x30, 0x37, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x45, 0x44, 0x20, 0x36, 0x37, 0x0A,\r
-    0x20, 0x33, 0x39, 0x20, 0x46, 0x43, 0x20, 0x41,\r
-    0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x33, 0x39,\r
-    0x20, 0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35,\r
-    0x41, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x42, 0x30,\r
-    0x20, 0x30, 0x37, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x42, 0x37, 0x20, 0x30, 0x31, 0x0A, 0x20, 0x33,\r
-    0x39, 0x20, 0x42, 0x30, 0x20, 0x30, 0x38, 0x0A,\r
-    0x20, 0x33, 0x39, 0x20, 0x42, 0x37, 0x20, 0x31,\r
-    0x32, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30,\r
-    0x20, 0x41, 0x35, 0x20, 0x41, 0x35, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x35, 0x33, 0x20, 0x32, 0x30,\r
-    0x0A, 0x20, 0x31, 0x35, 0x20, 0x35, 0x35, 0x20,\r
-    0x30, 0x30, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46,\r
-    0x30, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A,\r
-    0x20, 0x33, 0x39, 0x20, 0x42, 0x31, 0x20, 0x30,\r
-    0x30, 0x20, 0x30, 0x31, 0x0A, 0x20, 0x33, 0x39,\r
-    0x20, 0x46, 0x30, 0x20, 0x41, 0x35, 0x20, 0x41,\r
-    0x35, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46, 0x30,\r
-    0x20, 0x35, 0x41, 0x20, 0x35, 0x41, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x42, 0x33, 0x20, 0x30, 0x30,\r
-    0x20, 0x43, 0x31, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x46, 0x30, 0x20, 0x41, 0x35, 0x20, 0x41, 0x35,\r
-    0x0A, 0x20, 0x66, 0x66, 0x20, 0x37, 0x38, 0x0A,\r
-    0x20, 0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x41,\r
-    0x35, 0x20, 0x41, 0x35, 0x0A, 0x20, 0x30, 0x35,\r
-    0x20, 0x32, 0x39, 0x20, 0x30, 0x30, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x35, 0x41,\r
-    0x20, 0x35, 0x41, 0x0A, 0x3C, 0x2F, 0x44, 0x53,\r
-    0x49, 0x49, 0x6E, 0x69, 0x74, 0x53, 0x65, 0x71,\r
-    0x75, 0x65, 0x6E, 0x63, 0x65, 0x3E, 0x3C, 0x44,\r
-    0x53, 0x49, 0x54, 0x65, 0x72, 0x6D, 0x53, 0x65,\r
-    0x71, 0x75, 0x65, 0x6E, 0x63, 0x65, 0x3E, 0x20,\r
-    0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x41, 0x35,\r
-    0x20, 0x41, 0x35, 0x0A, 0x20, 0x30, 0x35, 0x20,\r
-    0x32, 0x38, 0x20, 0x30, 0x30, 0x0A, 0x20, 0x66,\r
-    0x66, 0x20, 0x32, 0x38, 0x0A, 0x20, 0x30, 0x35,\r
-    0x20, 0x31, 0x30, 0x20, 0x30, 0x30, 0x0A, 0x20,\r
-    0x33, 0x39, 0x20, 0x39, 0x46, 0x20, 0x35, 0x41,\r
-    0x20, 0x35, 0x41, 0x0A, 0x20, 0x33, 0x39, 0x20,\r
-    0x46, 0x30, 0x20, 0x35, 0x41, 0x20, 0x35, 0x41,\r
-    0x0A, 0x20, 0x33, 0x39, 0x20, 0x42, 0x30, 0x20,\r
-    0x30, 0x35, 0x0A, 0x20, 0x33, 0x39, 0x20, 0x46,\r
-    0x34, 0x20, 0x30, 0x31, 0x0A, 0x20, 0x33, 0x39,\r
-    0x20, 0x46, 0x30, 0x20, 0x41, 0x35, 0x20, 0x41,\r
-    0x35, 0x0A, 0x20, 0x66, 0x66, 0x20, 0x37, 0x38,\r
-    0x0A, 0x3C, 0x2F, 0x44, 0x53, 0x49, 0x54, 0x65,\r
-    0x72, 0x6D, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6E,\r
-    0x63, 0x65, 0x3E, 0x3C, 0x47, 0x72, 0x6F, 0x75,\r
-    0x70, 0x20, 0x69, 0x64, 0x3D, 0x27, 0x42, 0x61,\r
-    0x63, 0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x20,\r
-    0x43, 0x6F, 0x6E, 0x66, 0x69, 0x67, 0x75, 0x72,\r
-    0x61, 0x74, 0x69, 0x6F, 0x6E, 0x27, 0x3E, 0x20,\r
-    0x3C, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67,\r
-    0x68, 0x74, 0x54, 0x79, 0x70, 0x65, 0x3E, 0x33,\r
-    0x3C, 0x2F, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69,\r
-    0x67, 0x68, 0x74, 0x54, 0x79, 0x70, 0x65, 0x3E,\r
-    0x20, 0x3C, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69,\r
-    0x67, 0x68, 0x74, 0x44, 0x65, 0x66, 0x61, 0x75,\r
-    0x6C, 0x74, 0x3E, 0x35, 0x30, 0x3C, 0x2F, 0x42,\r
-    0x61, 0x63, 0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74,\r
-    0x44, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x3E,\r
-    0x20, 0x3C, 0x42, 0x61, 0x63, 0x6B, 0x6C, 0x69,\r
-    0x67, 0x68, 0x74, 0x53, 0x74, 0x65, 0x70, 0x73,\r
-    0x3E, 0x31, 0x30, 0x30, 0x3C, 0x2F, 0x42, 0x61,\r
-    0x63, 0x6B, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x53,\r
-    0x74, 0x65, 0x70, 0x73, 0x3E, 0x20, 0x3C, 0x44,\r
-    0x69, 0x73, 0x70, 0x6C, 0x61, 0x79, 0x50, 0x72,\r
-    0x69, 0x6D, 0x61, 0x72, 0x79, 0x46, 0x6C, 0x61,\r
-    0x67, 0x73, 0x3E, 0x30, 0x78, 0x34, 0x3C, 0x2F,\r
-    0x44, 0x69, 0x73, 0x70, 0x6C, 0x61, 0x79, 0x50,\r
-    0x72, 0x69, 0x6D, 0x61, 0x72, 0x79, 0x46, 0x6C,\r
-    0x61, 0x67, 0x73, 0x3E, 0x20, 0x3C, 0x42, 0x72,\r
-    0x69, 0x67, 0x68, 0x74, 0x6E, 0x65, 0x73, 0x73,\r
-    0x4D, 0x69, 0x6E, 0x4C, 0x75, 0x6D, 0x69, 0x6E,\r
-    0x61, 0x6E, 0x63, 0x65, 0x3E, 0x32, 0x30, 0x30,\r
-    0x30, 0x3C, 0x2F, 0x42, 0x72, 0x69, 0x67, 0x68,\r
-    0x74, 0x6E, 0x65, 0x73, 0x73, 0x4D, 0x69, 0x6E,\r
-    0x4C, 0x75, 0x6D, 0x69, 0x6E, 0x61, 0x6E, 0x63,\r
-    0x65, 0x3E, 0x20, 0x3C, 0x42, 0x72, 0x69, 0x67,\r
-    0x68, 0x74, 0x6E, 0x65, 0x73, 0x73, 0x4D, 0x61,\r
-    0x78, 0x4C, 0x75, 0x6D, 0x69, 0x6E, 0x61, 0x6E,\r
-    0x63, 0x65, 0x3E, 0x33, 0x36, 0x30, 0x30, 0x30,\r
-    0x30, 0x3C, 0x2F, 0x42, 0x72, 0x69, 0x67, 0x68,\r
-    0x74, 0x6E, 0x65, 0x73, 0x73, 0x4D, 0x61, 0x78,\r
-    0x4C, 0x75, 0x6D, 0x69, 0x6E, 0x61, 0x6E, 0x63,\r
-    0x65, 0x3E, 0x20, 0x3C, 0x44, 0x69, 0x73, 0x70,\r
-    0x6C, 0x61, 0x79, 0x52, 0x65, 0x73, 0x65, 0x74,\r
-    0x49, 0x6E, 0x66, 0x6F, 0x3E, 0x30, 0x20, 0x32,\r
-    0x30, 0x30, 0x30, 0x20, 0x35, 0x30, 0x30, 0x30,\r
-    0x20, 0x31, 0x32, 0x30, 0x30, 0x30, 0x20, 0x30,\r
-    0x3C, 0x2F, 0x44, 0x69, 0x73, 0x70, 0x6C, 0x61,\r
-    0x79, 0x52, 0x65, 0x73, 0x65, 0x74, 0x49, 0x6E,\r
-    0x66, 0x6F, 0x3E, 0x0A, 0x3C, 0x2F, 0x47, 0x72,\r
-    0x6F, 0x75, 0x70, 0x3E, 0x0A, 0x00\r
+                     0x00                                             // .\r
                 })\r
+                Return (RBUF) /* \_SB_.GPU0.PPCC.RBUF */\r
+            }\r
+\r
+            Method (PGCT, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                Return (RBUF) /* \_SB_.GPU0.PGCT.RBUF */\r
+            }\r
+\r
+            Method (PLGC, 3, NotSerialized)\r
+            {\r
+                Name (TBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                If ((Arg1 >= SizeOf (TBUF)))\r
+                {\r
+                    Return (Buffer (One)\r
+                    {\r
+                         0x00                                             // .\r
+                    })\r
+                }\r
+                Else\r
+                {\r
+                    Local1 = Arg1\r
+                }\r
+\r
+                If ((Arg2 > 0x1000))\r
+                {\r
+                    Local2 = 0x1000\r
+                }\r
+                Else\r
+                {\r
+                    Local2 = Arg2\r
+                }\r
+\r
+                If (((Local1 + Local2) > SizeOf (TBUF)))\r
+                {\r
+                    Local2 = (SizeOf (TBUF) - Local1)\r
+                }\r
+\r
+                CreateField (TBUF, (0x08 * Local1), (0x08 * Local2), RBUF)\r
+                Return (RBUF) /* \_SB_.GPU0.PLGC.RBUF */\r
+            }\r
+\r
+            Method (HSIC, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                Return (RBUF) /* \_SB_.GPU0.HSIC.RBUF */\r
+            }\r
+\r
+            Method (PGMT, 2, NotSerialized)\r
+            {\r
+                Name (TBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                If ((Arg0 >= SizeOf (TBUF)))\r
+                {\r
+                    Return (Buffer (One)\r
+                    {\r
+                         0x00                                             // .\r
+                    })\r
+                }\r
+                Else\r
+                {\r
+                    Local0 = Arg0\r
+                }\r
+\r
+                If ((Arg1 > 0x1000))\r
+                {\r
+                    Local1 = 0x1000\r
+                }\r
+                Else\r
+                {\r
+                    Local1 = Arg1\r
+                }\r
+\r
+                If (((Local0 + Local1) > SizeOf (TBUF)))\r
+                {\r
+                    Local1 = (SizeOf (TBUF) - Local0)\r
+                }\r
+\r
+                CreateField (TBUF, (0x08 * Local0), (0x08 * Local1), RBUF)\r
+                Return (RBUF) /* \_SB_.GPU0.PGMT.RBUF */\r
+            }\r
+\r
+            Method (PWGM, 2, NotSerialized)\r
+            {\r
+                Name (TBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                If ((Arg0 >= SizeOf (TBUF)))\r
+                {\r
+                    Return (Buffer (One)\r
+                    {\r
+                         0x00                                             // .\r
+                    })\r
+                }\r
+                Else\r
+                {\r
+                    Local0 = Arg0\r
+                }\r
+\r
+                If ((Arg1 > 0x1000))\r
+                {\r
+                    Local1 = 0x1000\r
+                }\r
+                Else\r
+                {\r
+                    Local1 = Arg1\r
+                }\r
+\r
+                If (((Local0 + Local1) > SizeOf (TBUF)))\r
+                {\r
+                    Local1 = (SizeOf (TBUF) - Local0)\r
+                }\r
+\r
+                CreateField (TBUF, (0x08 * Local0), (0x08 * Local1), RBUF)\r
+                Return (RBUF) /* \_SB_.GPU0.PWGM.RBUF */\r
+            }\r
+\r
+            Method (PGRT, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                Return (RBUF) /* \_SB_.GPU0.PGRT.RBUF */\r
+            }\r
+\r
+            Method (PBRT, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                Return (RBUF) /* \_SB_.GPU0.PBRT.RBUF */\r
+            }\r
+\r
+            Method (PBRC, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (0x02)\r
+                {\r
+                     0x00, 0x00                                       // ..\r
+                })\r
+                Return (RBUF) /* \_SB_.GPU0.PBRC.RBUF */\r
+            }\r
+\r
+            Method (DITH, 2, NotSerialized)\r
+            {\r
+                Name (RBUF, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                Return (RBUF) /* \_SB_.GPU0.DITH.RBUF */\r
+            }\r
+\r
+            Method (BLCP, 1, Serialized)\r
+            {\r
+                Name(RBUF, Buffer(0x100){})\r
+                Store(0x0, LOCAL0)\r
                 \r
-                Local2 = PCFG /* \_SB_.GPU0._ROM.PCFG */\r
-                If ((Arg0 >= SizeOf (Local2)))\r
-                {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
-                Else\r
-                {\r
-                    Local0 = Arg0\r
-                }\r
-\r
-                If ((Arg1 > 0x1000))\r
-                {\r
-                    Local1 = 0x1000\r
-                }\r
-                Else\r
-                {\r
-                    Local1 = Arg1\r
-                }\r
-\r
-                If (((Local0 + Local1) > SizeOf (Local2)))\r
-                {\r
-                    Local1 = (SizeOf (Local2) - Local0)\r
-                }\r
-\r
-                CreateField (Local2, (0x08 * Local0), (0x08 * Local1), RBUF)\r
-                Return (RBUF) /* \_SB_.GPU0._ROM.RBUF */\r
-            }\r
-\r
-            //\r
-            // IGC method - panel inverse gamma correction table.\r
-            //\r
-            // The buffer contains inverse gamma correction data for 3 color components, each with 256 16-bit integers.\r
-            // The buffer size is 3*256*2 = 1536 bytes.\r
-            // each table entry is represend by a 16-bit integer and data format in the buffer is described below:\r
-            //\r
-            // +--- 16 bits ---+--- 16 bits ---+--- 16 bits ---+---------+--- 16 bits ---+   0\r
-            // |    Red[0]     |    Red[1]     |    Red[2]     |   ...   |    Red[255]   |\r
-            // +---------------+---------------+---------------+---------+---------------+   512\r
-            // |    Green[0]   |    Green[1]   |    Green[2]   |   ...   |    Green[255] |\r
-            // +---------------+---------------+---------------+---------+---------------+   1024\r
-            // |    Blue[0]    |    Blue[1]    |    Blue[2]    |   ...   |    Blue[255]  |\r
-            // +---------------+---------------+---------------+---------+---------------+   1536\r
-            //\r
-            Method (PIGC, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.PIGC.RBUF */\r
-            }\r
-\r
-            //\r
-            // PCC method - panel color correction matrix\r
-            //\r
-            // Buffer format for HW which support 3X8 color correction matrix.\r
-            //\r
-            // The buffer contains color correction coefficients for 3 color components, each with 11 64-bit integers.\r
-            // The buffer size is 3*11*8 = 264 bytes.\r
-            // each coefficient in the matrix is represented by a long long integer (64-bit), and data format in the \r
-            // buffer is described below:\r
-            //\r
-            // +--64 bits--+--64 bits--+--------+--64 bits--+--64 bits--+--64 bits--+--64 bits--+    0\r
-            // |  Red[0]   |  Red[1]   |  ...   |  Red[7]   |     0     |     0     |    0      |\r
-            // +-----------+-----------+--------+-----------+-----------+-----------+-----------+    88\r
-            // |  Green[0] |  Green[1] |  ...   |  Green[7] |     0     |     0     |    0      |\r
-            // +-----------+-----------+--------+-----------+-----------+-----------+-----------+    176\r
-            // |  Blue[0]  |  Blue[1]  |  ...   |  Blue[7]  |     0     |     0     |    0      |\r
-            // +-----------+-----------+--------+-----------+-----------+-----------+-----------+    264\r
-            //\r
-            // Buffer format for HW which support 3X11 color correction matrix.\r
-            //\r
-            // The buffer contains color correction coefficients for 3 color components, each with 11 64-bit integers.\r
-            // The buffer size is 3*11*8 = 264 bytes.\r
-            // each coefficient in the matrix is represented by a long long integer (64-bit), and data format in the \r
-            // buffer is described below:\r
-            //\r
-            // +--- 64 bits ---+--- 64 bits ---+--- 64 bits ---+-----------+--- 64 bits ---+    0\r
-            // |    Red[0]     |    Red[1]     |    Red[2]     |    ...    |    Red[10]    |\r
-            // +---------------+---------------+---------------+-----------+---------------+    88\r
-            // |   Green[0]    |   Green[1]    |   Green[2]    |    ...    |   Green[10]   |\r
-            // +---------------+---------------+---------------+-----------+---------------+    176\r
-            // |    Blue[0]    |    Blue[1]    |    Blue[2]    |    ...    |    Blue[10]   |\r
-            // +---------------+---------------+---------------+-----------+---------------+    264\r
-            //\r
-            Method (PPCC, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.PPCC.RBUF */\r
-            }\r
-\r
-            //\r
-            // PGC method - panel segment gamma correction table\r
-            //\r
-            // there're thee components and each with 16 gamma correction segments. Each segment is defined\r
-            // as below with parameters, and each parameter is represented by a 32-bit integer (DWORD):\r
-            //\r
-            // +--4 bytes--+--4 bytes--+--4 bytes--+--4 bytes--+\r
-            // |  enable   |   start   |   gain    |   offset  |        one gamma correction segment(16 bytes)\r
-            // +-----------+-----------+-----------+-----------+\r
-            //\r
-            // +--- 16 bytes ---+--- 16 bytes ---+--- 16 bytes ---+-----------+--- 16 bytes ---+    0\r
-            // |   red_seg[0]   |  red_seg[1]    |  red_seg[2]    |    ...    |  red_seg[15]   |\r
-            // +----------------+----------------+----------------+-----------+----------------+    256\r
-            // |  green_seg[0]  |  green_seg[1]  |  green_seg[2]  |    ...    |  green_seg[15] |\r
-            // +----------------+----------------+----------------+-----------+----------------+    512\r
-            // |   blue_seg[0]  |   blue_seg[1]  |   blue_seg[2]  |    ...    |   blue_seg[15] |\r
-            // +----------------+----------------+----------------+-----------+----------------+    768\r
-            //\r
-            Method (PGCT, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.PGCT.RBUF */\r
-            }\r
-\r
-            //\r
-            // PLGC method - panel linear gamma correction table\r
-            //\r
-            // There are three color components, each color component has 1024 entries. each entry is 2 bytes.\r
-            //\r
-            // +--- 2 bytes ---+--- 2 bytes ---+--- 2 bytes ---+-----------+--- 2 bytes ---+   0\r
-            // |     red[0]    |    red[1]     |    red[2]     |    ...    |   red[1023]   |\r
-            // +---------------+---------------+---------------+-----------+---------------+   2048\r
-            // |    green[0]   |    green[1]   |    green[2]   |    ...    |   green[1023] |\r
-            // +---------------+---------------+---------------+-----------+---------------+   4096\r
-            // |    blue[0]    |    blue[1]    |    blue[2]    |    ...    |   blue[1023]  |\r
-            // +---------------+---------------+---------------+-----------+---------------+   6144\r
-            //\r
-            Method (PLGC, 3, NotSerialized)\r
-            {\r
-                Name (TBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                If ((Arg1 >= SizeOf (TBUF)))\r
-                {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
-                Else\r
-                {\r
-                    Local1 = Arg1\r
-                }\r
-\r
-                If ((Arg2 > 0x1000))\r
-                {\r
-                    Local2 = 0x1000\r
-                }\r
-                Else\r
-                {\r
-                    Local2 = Arg2\r
-                }\r
-\r
-                If (((Local1 + Local2) > SizeOf (TBUF)))\r
-                {\r
-                    Local2 = (SizeOf (TBUF) - Local1)\r
-                }\r
-\r
-                CreateField (TBUF, (0x08 * Local1), (0x08 * Local2), RBUF)\r
-                Return (RBUF) /* \_SB_.GPU0.PLGC.RBUF */\r
-            }\r
-\r
-            //\r
-            // HSIC method - HSIC settings\r
-            //\r
-            // Hue, Saturation, Intensity, Contrast levels, the first parameter enable/disable HSIC control,\r
-            // followed by HSIC level values, each level ranges from -100 to 100, represented by a 32-bit integer:\r
-            //\r
-            // +--4 bytes--+--4 bytes--+--4 bytes--+--4 bytes--+--4 bytes--++\r
-            // |  Enable   |    Hue    | Saturation| Intensity |  Contrast  |\r
-            // +-----------+-----------+-----------+-----------+-----------++\r
-            //\r
-            //\r
-            Method (HSIC, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.HSIC.RBUF */\r
-            }\r
-\r
-            //\r
-            // PGMT - panel gamut mapping table for HW which support 9x9x9 gamut mapping:\r
-            //\r
-            //   This method returns the gamut mapping table for a panel.\r
-            //\r
-            //   There are three components. Each component has 8 tables and a total of 729 entries. \r
-            //   Each value is represented by a 16-bit integer:\r
-            //\r
-            //   Table ID     Entries \r
-            //      0           125 \r
-            //      1           100\r
-            //      2            80\r
-            //      3           100\r
-            //      4           100\r
-            //      5            80\r
-            //      6            64\r
-            //      7            80   \r
-            //\r
-            // +----- 16 bits -----+----- 16 bits ------+----- 16 bits -----+-----------+----- 16 bits -------+\r
-            // | red_comp[0][0]    |   red_comp[0][1]   |  red_comp[0][2]   |    ...    |  red_comp[7][79]    |\r
-            // +-------------------+--------------------+-------------------+---------------------------------+\r
-            // | green_comp[0][0]  |  green_comp[0][1]  | green_comp[0][2]  |    ...    |  green_comp[7][79]  |\r
-            // +-------------------+--------------------+-------------------+---------------------------------+\r
-            // | blue_comp[0][0]   |  blue_comp[0][1]   | blue_comp[0][2]   |    ...    |  blue_comp[7][79]   |\r
-            // +-------------------+--------------------+-------------------+---------------------------------+\r
-            //\r
-            Method (PGMT, 2, NotSerialized)\r
-            {\r
-                Name (TBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                If ((Arg0 >= SizeOf (TBUF)))\r
-                {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
-                Else\r
-                {\r
-                    Local0 = Arg0\r
-                }\r
-\r
-                If ((Arg1 > 0x1000))\r
-                {\r
-                    Local1 = 0x1000\r
-                }\r
-                Else\r
-                {\r
-                    Local1 = Arg1\r
-                }\r
-\r
-                If (((Local0 + Local1) > SizeOf (TBUF)))\r
-                {\r
-                    Local1 = (SizeOf (TBUF) - Local0)\r
-                }\r
-\r
-                CreateField (TBUF, (0x08 * Local0), (0x08 * Local1), RBUF)\r
-                Return (RBUF) /* \_SB_.GPU0.PGMT.RBUF */\r
-            }\r
-\r
-            //\r
-            // PWGM - panel gamut mapping data for HW which support 17x17x17 gamut mapping\r
-            // \r
-            // This data's header which has two fields: \r
-            //      NumSamplesPerColorComponent:  Number samples per color component in gamut mapping table.\r
-            //      NumSegmentsPerColor        :  Number of segments per color component.\r
-            //                                    NumSegmentsPerColor must equal 0 or NumSamplesPerColorComponent -1.\r
-            //\r
-            // This data also can have two tables, one is 3d table, one is segment table.\r
-            // Segment table is only required if NumSegmentsPerColor != 0.\r
-            // \r
-            //   3d table:      There are three components. If number samples per component is N = NumSamplesPerColorComponent,\r
-            //                  total entries are NxNxN per component. Each value is represented by a 16-bit integer:\r
-            //   Segment table: There are three components, table entries are uNumSegmentsPerColor per component, \r
-            //                  each entry is 32 bit value. \r
-            // \r
-            // Table data header:\r
-            // +--------- 32 bits ----------+------- 32 bits -----+\r
-            // | NumSamplesPerColorComponent| NumSegmentsPerColor |\r
-            // +----------------------------+---------------------+                                                      8 bytes\r
-            //\r
-            // 3d table:\r
-            // +---- 16 bits ----+---- 16 bits ----+---- 16 bits ----+-------------+------- 16 bits -----------+  8\r
-            // |  red_comp[0]    |  red_comp[1]    |  red_comp[2]    |     ...     | red_comp[N x N x N - 1 ]  |\r
-            // +-----------------+-----------------+-----------------+-------------+---------------------------+  NxNxNx2 + 8\r
-            // |  green_comp[0]  |  green_comp[1]  |  green_comp[2]  |     ...     | green_comp[N x N x N - 1] |\r
-            // +-----------------+-----------------+-----------------+-------------+---------------------------+  2xNxNxNx2 + 8\r
-            // |  blue_comp[0]   |  blue_comp[1]   |  blue_comp[2]   |     ...     | blue_comp[N x N x N - 1]  |\r
-            // +-----------------+-----------------+-----------------+-------------+---------------------------+  3xNxNxNx2 + 8\r
-            //\r
-            // Segment table: ( if NumSegmentsPerColor = 0, there is no segment table).\r
-            // +----- 32 bits ------+----- 32 bits ------+------ 32 bits -----+-------------+-------- 32 bits -------+  3xNxNxNx2 + 8\r
-            // |  sg_red_comp[[0]   |  sg_red_comp[1]    |  sg_red_comp[2]    |     ...     |  sg_red_comp[N-2]      |\r
-            // +--------------------+--------------------+--------------------+-------------+------------------------+  (N-1)x4 + 3xNxNxNx2 + 8\r
-            // |  sg_green_comp[0]  |  sg_ green_comp[1] |  sg_ green_comp[2] |     ...     |  sg_green_comp[N-2]    |\r
-            // +--------------------+--------------------+--------------------+-------------+------------------------+  2x(N-1)x4 + 3xNxNxNx2 + 8\r
-            // |  sg_ blue_comp[0]  |  sg_  blue_comp[1] |  sg_ blue_comp[2]  |     ...     |  sg_ blue_comp[N-2]    |\r
-            // +--------------------+--------------------+------------------- +-------------+------------------------+  3x(N-1)x4 + 3xNxNxNx2 + 8\r
-            //\r
-            // Maximum size = 3 x(17 - 1) x 4 + 3 x 17 x 17 x 17 x 2 + 8 = 29678 bytes.\r
-            //\r
-            Method (PWGM, 2, NotSerialized)\r
-            {\r
-                Name (TBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                If ((Arg0 >= SizeOf (TBUF)))\r
-                {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
-                Else\r
-                {\r
-                    Local0 = Arg0\r
-                }\r
-\r
-                If ((Arg1 > 0x1000))\r
-                {\r
-                    Local1 = 0x1000\r
-                }\r
-                Else\r
-                {\r
-                    Local1 = Arg1\r
-                }\r
-\r
-                If (((Local0 + Local1) > SizeOf (TBUF)))\r
-                {\r
-                    Local1 = (SizeOf (TBUF) - Local0)\r
-                }\r
-\r
-                CreateField (TBUF, (0x08 * Local0), (0x08 * Local1), RBUF)\r
-                Return (RBUF) /* \_SB_.GPU0.PWGM.RBUF */\r
-            }\r
-\r
-            //\r
-            // PGRT - panel gamma response table\r
-            //\r
-            //   This method returns the Gamma response table for a panel.\r
-            //   The table is given in 2 arrays, one representing the x axis or grayscale and other \r
-            //   representing the y axis or luminance. \r
-            //\r
-            //   The table is given in a 256 entries array, where the first entry value represents\r
-            //   the luminance (Y) achieved when displaying black on the screen (shade value is 0\r
-            //   for all R, G and B) and the last entry represents the luminance (Y) achieved when \r
-            //   displaying white on the screen (shade value is 255 for all R, G and B).\r
-            // \r
-            //   The array must be 256 entries.\r
-            //\r
-            //   The range of each entry must be from 0 to 0xffff\r
-            //\r
-            //   Values are least significant byte first. E.g. {0x01, 0x00} represents 0x1 and\r
-            //   {0x02, 0x01} represents 0x0102\r
-            //\r
-            // +--- 2 bytes ---+--- 2 bytes ---+--- 2 bytes ---+-----------+--- 2 bytes ---+ \r
-            // |     Y[0]      |     Y[1]      |     Y[2]      |    ...    |     Y[255]    |\r
-            // +---------------+---------------+---------------+-----------+---------------+ \r
-            Method (PGRT, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.PGRT.RBUF */\r
-            }\r
-\r
-            //\r
-            // PBRT - panel backlight response table\r
-            //\r
-            //   This method returns the Backlight response table for a panel.\r
-            //   The table is given in a 256 entries array, where the first entry value represents\r
-            //   the backlight level (BL) to achieve 0 luminance and the last entry represents  \r
-            //   the highest backlight level to achieve the maximum desired luminance. \r
-            //   In other words, this array serves as a map from luminance to backlight levels,\r
-            //   where the index is the desired luminance level and the value (or output) is \r
-            //   the backlight level to be sent to the hardware (backlight controller).\r
-            // \r
-            //   The array must be 256 entries.\r
-            //\r
-            //   The range of each entry must be from 0 to 0xffff\r
-            //\r
-            //   Values are least significant byte first. E.g. {0x01, 0x00} represents 0x1 and\r
-            //   {0x02, 0x01} represents 0x0102\r
-            //\r
-            // +--- 2 bytes ---+--- 2 bytes ---+--- 2 bytes ---+-----------+--- 2 bytes ---+ \r
-            // |    BL[0]      |    BL[1]      |    BL[2]      |    ...    |    BL[255]    |\r
-            // +---------------+---------------+---------------+-----------+---------------+ \r
-            Method (PBRT, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.PBRT.RBUF */\r
-            }\r
-\r
-            Method (PBRC, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (0x02)\r
-                {\r
-                     0x00, 0x00                                       // ..\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.PBRC.RBUF */\r
-            }\r
-\r
-            //\r
-            // DITH method - Dithering settings\r
-            //\r
-            // Dithering matrix could have following two formats:\r
-            //\r
-            // Format 1:\r
-            // +--1 byte--------+--1 byte--------+--1 byte--------+--1 byte--------+\r
-            // |  Element[0,0]  |  Element[0,1]  |  Element[0,2]  |  Element[0,3]  |\r
-            // |  Element[1,0]  |  Element[1,1]  |  Element[1,2]  |  Element[1,3]  |\r
-            // |  Element[2,0]  |  Element[2,1]  |  Element[2,2]  |  Element[2,3]  |\r
-            // |  Element[3,0]  |  Element[3,1]  |  Element[3,2]  |  Element[3,3]  |\r
-            // |  Bit Depth C0  |  Bit Depth C1  |  Bit Depth C2  |  Reserved(0x0) |\r
-            // +----------------+----------------+----------------+----------------+\r
-            // | Dithering mode (4 bytes) (0: not supported, 1:Spatial, 2:Temporal)|\r
-            // +----------------+----------------+----------------+----------------+\r
-            //\r
-            // There is dithering mode in Format 1.\r
-            //\r
-            // Format 2: \r
-            //\r
-            // +--1 byte--------+--1 byte--------+--1 byte--------+--1 byte--------++\r
-            // |  Element[0,0]  |  Element[0,1]  |  Element[0,2]  |  Element[0,3]  |\r
-            // |  Element[1,0]  |  Element[1,1]  |  Element[1,2]  |  Element[1,3]  |\r
-            // |  Element[2,0]  |  Element[2,1]  |  Element[2,2]  |  Element[2,3]  |\r
-            // |  Element[3,0]  |  Element[3,1]  |  Element[3,2]  |  Element[3,3]  |\r
-            // |  Bit Depth C2  |  Bit Depth C1  |  Bit Depth C0  |  Reserved(0x0) |\r
-            // +----------------+----------------+----------------+----------------+\r
-            //\r
-            // There is no dithering mode in Format 2. Default dither mode: spatial.\r
-            //\r
-            Method (DITH, 2, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                Return (RBUF) /* \_SB_.GPU0.DITH.RBUF */\r
-            }\r
-\r
-            ///\r
-            // BLCP Method - Backlight control packet method, returns a \r
-            //               command buffer for a specific backlight level\r
-            //\r
-            // Input Parameters\r
-            //    Backlight level - Integer from 0% to 100%\r
-            //\r
-            // Output Parameters\r
-            //\r
-            // Packet format:\r
-            //   +--32bits--+-----variable (8bit alignment)--+\r
-            //   |  Header  |       Packet payload           |\r
-            //   +----------+--------------------------------+\r
-            //\r
-            //  For DSI Command packets, payload data must be in this format\r
-            //\r
-            //  +-- 8 bits-+----variable (8bit alignment)----+\r
-            //  | Cmd Type |           Packet Data           |\r
-            //  +----------+---------------------------------+\r
-            //\r
-            //  For I2C Command packets, payload data must be in this format\r
-            //\r
-            //  +-- 16 bits-+----variable (8bit alignment)----+\r
-            //  |  Address  |         Command Data            |\r
-            //  +-----------+---------------------------------+\r
-            //\r
-            //  All packets must follow with a DWORD header with 0x0\r
-            //\r
-            Method (BLCP, 1, Serialized)\r
-            {\r
-                Name(RBUF, Buffer(0x100){})\r
-                Store(0x0, LOCAL0)\r
-                \r
-                CreateField(RBUF, Multiply(LOCAL0, 8), 32, PKHR)\r
-                Add(LOCAL0, 4, LOCAL0)\r
-                \r
-                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKCM)\r
-                Add(LOCAL0, 1, LOCAL0)\r
-                \r
-                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKDS)\r
-                Add(LOCAL0, 1, LOCAL0)\r
-                \r
-                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKUB)\r
-                Add(LOCAL0, 1, LOCAL0)\r
-                \r
-                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKLB)\r
-                Add(LOCAL0, 1, LOCAL0)\r
-                \r
-                               // Add additonal ON command\r
-                               Name (BON, // Backlight on\r
-                               Buffer() {0x39, // Command 39\r
-                               0x53, 0x24}) // Manual backlight control\r
-                               // Create the packet header field\r
-                               CreateField(RBUF, Multiply(LOCAL0, 8), 32, PKH2) // Create the packet header\r
-                               Add(LOCAL0, 4, LOCAL0) // Increment the data pointer\r
-                               // Create the packet payload field\r
-                               CreateField(RBUF, Multiply(LOCAL0, 8), 32, PKP2) // Create the packet payload\r
-                               Store(Sizeof(BON), PKH2) // Store the size of the buffer in the header \r
-                               Store(BON, PKP2) // Store the packet payload\r
-                               Add(LOCAL0, Sizeof(BON), LOCAL0) // Increment the offset by the packet size\r
-                \r
-                CreateDWordField(RBUF, Multiply(LOCAL0, 8), EOF)\r
-                \r
-                /*LOCAL1 = Arg0 * 10 // to map to 1024\r
-                LOCAL2 = LOCAL1 >> 8\r
-                LOCAL1 &= 0xFF*/\r
-                \r
-                LOCAL1 = Arg0 * 1023\r
-                LOCAL1 /= 0xFF\r
-                \r
-                LOCAL2 = Arg0 * 1023\r
-                LOCAL2 /= 0xFF00\r
-                LOCAL2 &= 3\r
-                \r
-                PKHR = 4\r
-                PKCM = 0x39\r
-                PKDS = 0x51\r
-                //PKUB = 0x00\r
-                //PKLB = 0x10\r
-                PKUB = LOCAL2\r
-                PKLB = LOCAL1\r
-                \r
-                EOF = 0x0\r
-                \r
-                Return(RBUF)\r
-            }\r
-\r
-            Method (ROM2, 3, NotSerialized)\r
-            {\r
-                Name (PCFG, Buffer (One)\r
-                {\r
-                     0x00                                             // .\r
-                })\r
-                While (One)\r
-                {\r
-                    If (One)\r
-                    {\r
-                        Local2 = PCFG /* \_SB_.GPU0.ROM2.PCFG */\r
-                    }\r
-\r
-                    Break\r
-                }\r
-\r
+                CreateField(RBUF, Multiply(LOCAL0, 8), 32, PKHR)\r
+                Add(LOCAL0, 4, LOCAL0)\r
+                \r
+                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKCM)\r
+                Add(LOCAL0, 1, LOCAL0)\r
+                \r
+                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKDS)\r
+                Add(LOCAL0, 1, LOCAL0)\r
+                \r
+                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKUB)\r
+                Add(LOCAL0, 1, LOCAL0)\r
+                \r
+                CreateField(RBUF, Multiply(LOCAL0, 8), 8, PKLB)\r
+                Add(LOCAL0, 1, LOCAL0)\r
+                \r
+                               // Add additonal ON command\r
+                               Name (BON, // Backlight on\r
+                               Buffer() {0x39, // Command 39\r
+                               0x53, 0x24}) // Manual backlight control\r
+                               // Create the packet header field\r
+                               CreateField(RBUF, Multiply(LOCAL0, 8), 32, PKH2) // Create the packet header\r
+                               Add(LOCAL0, 4, LOCAL0) // Increment the data pointer\r
+                               // Create the packet payload field\r
+                               CreateField(RBUF, Multiply(LOCAL0, 8), 32, PKP2) // Create the packet payload\r
+                               Store(Sizeof(BON), PKH2) // Store the size of the buffer in the header \r
+                               Store(BON, PKP2) // Store the packet payload\r
+                               Add(LOCAL0, Sizeof(BON), LOCAL0) // Increment the offset by the packet size\r
+                \r
+                CreateDWordField(RBUF, Multiply(LOCAL0, 8), EOF)\r
+                \r
+                /*LOCAL1 = Arg0 * 10 // to map to 1024\r
+                LOCAL2 = LOCAL1 >> 8\r
+                LOCAL1 &= 0xFF*/\r
+                \r
+                LOCAL1 = Arg0 * 1023\r
+                LOCAL1 /= 0xFF\r
+                \r
+                LOCAL2 = Arg0 * 1023\r
+                LOCAL2 /= 0xFF00\r
+                LOCAL2 &= 3\r
+                \r
+                PKHR = 4\r
+                PKCM = 0x39\r
+                PKDS = 0x51\r
+                //PKUB = 0x00\r
+                //PKLB = 0x10\r
+                PKUB = LOCAL2\r
+                PKLB = LOCAL1\r
+                \r
+                EOF = 0x0\r
+                \r
+                Return(RBUF)\r
+            }\r
+\r
+            Method (ROM2, 3, NotSerialized)\r
+            {\r
+                Name (PCFG, Buffer (One)\r
+                {\r
+                     0x00                                             // .\r
+                })\r
+                While (One)\r
+                {\r
+                    If (One)\r
+                    {\r
+                        Local2 = PCFG /* \_SB_.GPU0.ROM2.PCFG */\r
+                    }\r
+\r
+                    Break\r
+                }\r
+\r
                 If ((Arg0 >= SizeOf (Local2)))\r
                 {\r
                     Return (Buffer (One)\r
@@ -59321,53 +57572,25 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 0x00024321\r
             })\r
 \r
-            // Enumeration and device info for the AVStream child driver\r
-            //\r
-            Device (AVS0)\r
-            {\r
-                // The address for this device (Same as in _DOD, above)\r
-                //\r
-                Name (_ADR, 0x00024321)  // _ADR: Address\r
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-                {\r
-                    Name (RBUF, Buffer (0x02)\r
-                    {\r
-                         0x79, 0x00                                       // y.\r
-                    })\r
-                    Return (RBUF) /* \_SB_.GPU0.AVS0._CRS.RBUF */\r
-                }\r
-\r
-                Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
-                {\r
-                    \_SB.MMU0, \r
-                    \_SB.IMM0, \r
-                    \_SB.VFE0\r
-                })\r
-            }\r
 \r
             Method (_STA, 0, NotSerialized)  // _STA: Status\r
             {\r
                 Return (0x0F)\r
             }\r
 \r
-            //------------------------------------------------------------------------------\r
-            // Child Device Info\r
-            // This method includes information for child devices\r
-            //------------------------------------------------------------------------------\r
-            //\r
             Method (CHDV, 0, NotSerialized)\r
             {\r
                 Name (CHIF, Package (0x02)\r
                 {\r
-                    One,    // Number of Child devices\r
+                    One, \r
                     Package (0x07)\r
                     {\r
                         "CHILDDEV", \r
-                        Zero,                                   // Child ID\r
-                        0x00024321,                             // ACPI UID\r
-                        "QCOM_AVStream_850",                    // Hardware ID\r
-                        Zero,                                   // Instance ID\r
-                        "Qualcomm Camera AVStream Mini Driver", // Device Text\r
+                        Zero, \r
+                        0x00024321, \r
+                        "QCOM_AVStream_850", \r
+                        Zero, \r
+                        "Qualcomm Camera AVStream Mini Driver", \r
                         Package (0x04)\r
                         {\r
                             "COMPATIBLEIDS", \r
@@ -59724,18 +57947,15 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                         Package (0x02)\r
                         {\r
                             "DisableExternal", \r
-                            Zero\r
+                            3\r
                         }\r
                     }\r
                 })\r
                 Return (RBUF) /* \_SB_.GPU0.REGR.RBUF */\r
             }\r
         }\r
-//#endif\r
 \r
-        // \r
-        // Secure Channel Manager (SCM) Driver\r
-        //\r
+\r
         Device (SCM0)\r
         {\r
             Name (_HID, "QCOM0214")  // _HID: Hardware ID\r
@@ -59743,9 +57963,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_UID, Zero)  // _UID: Unique ID\r
         }\r
 \r
-        //\r
-        // TrEE Driver\r
-        //\r
         Device (TREE)\r
         {\r
             Name (_HID, "QCOM02BB")  // _HID: Hardware ID\r
@@ -59753,7 +57970,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Name (_UID, Zero)  // _UID: Unique ID\r
             Method (MCGT, 0, NotSerialized)\r
             {\r
-                Name (TPKG, Package (0x01)\r
+                Name (TPKG, Package (One)\r
                 {\r
                     Package (0x02)\r
                     {\r
@@ -59767,9 +57984,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        //SPMI driver.\r
-        //\r
         Device (SPMI)\r
         {\r
             Name (_HID, "QCOM0216")  // _HID: Hardware ID\r
@@ -59802,14 +58016,26 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        // TLMM controller.\r
-        //\r
         Device (GIO0)\r
         {\r
             Name (_HID, "QCOM0217")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, Zero)  // _UID: Unique ID\r
+                       Name (HPD1, ResourceTemplate ()\r
+            {\r
+                GpioIo (Shared, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
+                    "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
+                    )\r
+                    {   // Pin list\r
+                        0x0071\r
+                    }\r
+            })\r
+                       OperationRegion (HPD2, GeneralPurposeIo, Zero, One)\r
+            Field (HPD2, ByteAcc, NoLock, Preserve)\r
+            {\r
+                Connection (\_SB.GIO0.HPD1), \r
+                ESTA,   1\r
+            }\r
             OperationRegion (GPOR, GeneralPurposeIo, Zero, One)\r
             Field (\_SB.GIO0.GPOR, ByteAcc, NoLock, Preserve)\r
             {\r
@@ -59819,7 +58045,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
-                    // TLMM register address space\r
                     Memory32Fixed (ReadWrite,\r
                         0x03400000,         // Address Base\r
                         0x00C00000,         // Address Length\r
@@ -59872,13 +58097,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (RBUF) /* \_SB_.GIO0._CRS.RBUF */\r
             }\r
 \r
-            // ACPI method to return Num pins\r
             Method (OFNI, 0, NotSerialized)\r
             {\r
                 Name (RBUF, Buffer (0x02)\r
                 {\r
-                     0x96,  // 0: TOTAL_GPIO_PINS\r
-                     0x00   // 1: TOTAL_GPIO_PINS                                // ..\r
+                     0x96, 0x00                                       // ..\r
                 })\r
                 Return (RBUF) /* \_SB_.GIO0.OFNI.RBUF */\r
             }\r
@@ -59898,7 +58121,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
         }\r
 \r
-        //PCIE asl\r
         OperationRegion (CP00, SystemMemory, 0x13000000, 0x24)\r
         Field (CP00, DWordAcc, NoLock, Preserve)\r
         {\r
@@ -60366,542 +58588,9 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
         }\r
 \r
         Name (G0D3, Zero)\r
-        PowerResource (P0ON, 0x05, 0x0000)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.GIO0\r
-            })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_ON, 0, NotSerialized)  // _ON_: Power On\r
-            {\r
-                If (G0D3)\r
-                {\r
-                    GP0B = One\r
-                    Sleep (One)\r
-                    GP0B = Zero\r
-                    If ((\_SB.GIO0.GABL == One))\r
-                    {\r
-                        \_SB.PCI0.MOD1 = One\r
-                        Sleep (0x05)\r
-                        \_SB.PCI0.MOD2 = Zero\r
-                    }\r
-\r
-                    G0D3 = Zero\r
-                    If (\_SB.PPU0 ())\r
-                    {\r
-                        Debug = "PHY Init failed for Port 0"\r
-                        While (One){}\r
-                    }\r
-\r
-                    Sleep (0x05)\r
-                    If ((\_SB.GIO0.GABL == One))\r
-                    {\r
-                        \_SB.PCI0.MOD2 = One\r
-                    }\r
-\r
-                    If (\_SB.LTS0 ())\r
-                    {\r
-                        \_SB.E0LT = 0x601FFFFF\r
-                    }\r
-                    Else\r
-                    {\r
-                        \_SB.E0LT = 0x600FFFFF\r
-                    }\r
-\r
-                    \_SB.IAT0 ()\r
-                    \_SB.MSC0 ()\r
-                }\r
-            }\r
-\r
-            Method (_OFF, 0, NotSerialized)  // _OFF: Power Off\r
-            {\r
-                If ((G0D3 == Zero))\r
-                {\r
-                    BreakPoint\r
-                    Name (PTO0, Zero)\r
-                    G0D3 = One\r
-                    Local0 = PSC0 /* \_SB_.PSC0 */\r
-                    Local0 |= 0x10\r
-                    PSC0 = Local0\r
-                    Local0 = ESC0 /* \_SB_.ESC0 */\r
-                    Local0 |= 0x10\r
-                    ESC0 = Local0\r
-                    Local0 = PPS0 /* \_SB_.PPS0 */\r
-                    While ((Local0 &= 0x20 != 0x20))\r
-                    {\r
-                        Sleep (0x0A)\r
-                        PTO0 += One\r
-                        If ((PTO0 == 0x0A))\r
-                        {\r
-                            Break\r
-                        }\r
-\r
-                        Local0 = PPS0 /* \_SB_.PPS0 */\r
-                    }\r
-\r
-                    If ((\_SB.GIO0.GABL == One))\r
-                    {\r
-                        \_SB.PCI0.MOD2 = Zero\r
-                    }\r
-\r
-                    PPDC = Zero\r
-                    PCST = Zero\r
-                }\r
-            }\r
-        }\r
-\r
-        PowerResource (P0OF, 0x05, 0x0000)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.GIO0\r
-            })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }\r
 \r
-            Method (_ON, 0, NotSerialized)  // _ON_: Power On\r
-            {\r
-            }\r
 \r
-            Method (_OFF, 0, NotSerialized)  // _OFF: Power Off\r
-            {\r
-            }\r
 \r
-            Method (_RST, 0, NotSerialized)  // _RST: Device Reset\r
-            {\r
-                GP0B = One\r
-                Sleep (One)\r
-                GP0B = Zero\r
-                If ((\_SB.GIO0.GABL == One))\r
-                {\r
-                    \_SB.PCI0.MOD1 = Zero\r
-                    Sleep (One)\r
-                    \_SB.PCI0.MOD1 = One\r
-                    Sleep (0x05)\r
-                    \_SB.PCI0.MOD2 = Zero\r
-                }\r
-\r
-                G0D3 = Zero\r
-                If (\_SB.PPU0 ())\r
-                {\r
-                    Debug = "PHY Init failed for Port 0"\r
-                    While (One){}\r
-                }\r
-\r
-                Sleep (0x05)\r
-                If ((\_SB.GIO0.GABL == One))\r
-                {\r
-                    \_SB.PCI0.MOD2 = One\r
-                }\r
-\r
-                If (\_SB.LTS0 ())\r
-                {\r
-                    \_SB.E0LT = 0x601FFFFF\r
-                }\r
-                Else\r
-                {\r
-                    \_SB.E0LT = 0x600FFFFF\r
-                }\r
-\r
-                \_SB.IAT0 ()\r
-                \_SB.MSC0 ()\r
-            }\r
-        }\r
-\r
-        Device (PCI0)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0\r
-            })\r
-            Name (_HID, EisaId ("PNP0A08") /* PCI Express Bus */)  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_CID, EisaId ("PNP0A03") /* PCI Bus */)  // _CID: Compatible ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_SEG, Zero)  // _SEG: PCI Segment\r
-            Name (_BBN, Zero)  // _BBN: BIOS Bus Number\r
-            Name (_PRT, Package (0x04)  // _PRT: PCI Routing Table\r
-            {\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    Zero, \r
-                    Zero, \r
-                    0xB5\r
-                }, \r
-\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    One, \r
-                    Zero, \r
-                    0xB6\r
-                }, \r
-\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    0x02, \r
-                    Zero, \r
-                    0xB7\r
-                }, \r
-\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    0x03, \r
-                    Zero, \r
-                    0xB8\r
-                }\r
-            })\r
-            Method (_CCA, 0, NotSerialized)  // _CCA: Cache Coherency Attribute\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_PSC, 0, NotSerialized)  // _PSC: Power State Current\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x60200000,         // Address Base\r
-                        0x00DF0000,         // Address Length\r
-                        )\r
-                    WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,\r
-                        0x0000,             // Granularity\r
-                        0x0000,             // Range Minimum\r
-                        0x0001,             // Range Maximum\r
-                        0x0000,             // Translation Offset\r
-                        0x0002,             // Length\r
-                        ,, )\r
-                })\r
-                Return (RBUF) /* \_SB_.PCI0._CRS.RBUF */\r
-            }\r
-\r
-            Name (SUPP, Zero)\r
-            Name (CTRL, Zero)\r
-            Method (_DSW, 3, NotSerialized)  // _DSW: Device Sleep Wake\r
-            {\r
-            }\r
-\r
-            Method (_OSC, 4, NotSerialized)  // _OSC: Operating System Capabilities\r
-            {\r
-                If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))\r
-                {\r
-                    CreateDWordField (Arg3, Zero, CDW1)\r
-                    CreateDWordField (Arg3, 0x04, CDW2)\r
-                    CreateDWordField (Arg3, 0x08, CDW3)\r
-                    SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */\r
-                    CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */\r
-                    If (((SUPP & 0x16) != 0x16))\r
-                    {\r
-                        CTRL &= 0x1E\r
-                    }\r
-\r
-                    CTRL &= 0x15\r
-                    If ((Arg1 != One))\r
-                    {\r
-                        CDW1 |= 0x08\r
-                    }\r
-\r
-                    If ((CDW3 != CTRL))\r
-                    {\r
-                        CDW1 |= 0x10\r
-                    }\r
-\r
-                    CDW3 = CTRL /* \_SB_.PCI0.CTRL */\r
-                    Return (Arg3)\r
-                }\r
-                Else\r
-                {\r
-                    CDW1 |= 0x04\r
-                    Return (Arg3)\r
-                }\r
-            }\r
-\r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
-            {\r
-                If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))\r
-                {\r
-                    While (One)\r
-                    {\r
-                        Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                        _T_0 = ToInteger (Arg2)\r
-                        If ((_T_0 == Zero))\r
-                        {\r
-                            Return (Buffer (0x02)\r
-                            {\r
-                                 0xFF, 0x03                                       // ..\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == One))\r
-                        {\r
-                            Return (Package (0x02)\r
-                            {\r
-                                Package (One)\r
-                                {\r
-                                    One\r
-                                }, \r
-\r
-                                Package (0x03)\r
-                                {\r
-                                    Zero, \r
-                                    One, \r
-                                    One\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x02))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                Package (0x04)\r
-                                {\r
-                                    One, \r
-                                    0x03, \r
-                                    Zero, \r
-                                    0x07\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x03))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                Zero\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x04))\r
-                        {\r
-                            Return (Package (0x02)\r
-                            {\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (0x04)\r
-                                {\r
-                                    One, \r
-                                    0x03, \r
-                                    Zero, \r
-                                    0x07\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x05))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                One\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x06))\r
-                        {\r
-                            Return (Package (0x04)\r
-                            {\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x07))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                One\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x08))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                One\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x09))\r
-                        {\r
-                            Return (Package (0x05)\r
-                            {\r
-                                0xFFFFFFFF, \r
-                                0xFFFFFFFF, \r
-                                0xFFFFFFFF, \r
-                                Zero, \r
-                                0xFFFFFFFF\r
-                            })\r
-                        }\r
-                        Else\r
-                        {\r
-                        }\r
-\r
-                        Break\r
-                    }\r
-                }\r
-            }\r
-\r
-            Name (_S0W, 0x04)  // _S0W: S0 Device Wake State\r
-            Name (GWLE, ResourceTemplate ()\r
-            {\r
-                GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                    "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                    )\r
-                    {   // Pin list\r
-                        0x0027\r
-                    }\r
-            })\r
-            Name (GWLP, ResourceTemplate ()\r
-            {\r
-                GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                    "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                    )\r
-                    {   // Pin list\r
-                        0x0023\r
-                    }\r
-            })\r
-            Scope (\_SB.GIO0)\r
-            {\r
-                OperationRegion (WLEN, GeneralPurposeIo, Zero, One)\r
-                OperationRegion (WLPR, GeneralPurposeIo, Zero, One)\r
-            }\r
-\r
-            Field (\_SB.GIO0.WLEN, ByteAcc, NoLock, Preserve)\r
-            {\r
-                Connection (\_SB.PCI0.GWLE), \r
-                MOD1,   1\r
-            }\r
-\r
-            Field (\_SB.GIO0.WLPR, ByteAcc, NoLock, Preserve)\r
-            {\r
-                Connection (\_SB.PCI0.GWLP), \r
-                MOD2,   1\r
-            }\r
-\r
-            Name (_PR0, Package (0x01)  // _PR0: Power Resources for D0\r
-            {\r
-                \_SB.P0ON\r
-            })\r
-            Name (_PR3, Package (0x01)  // _PR3: Power Resources for D3hot\r
-            {\r
-                \_SB.P0ON\r
-            })\r
-            Device (RP1)\r
-            {\r
-                Name (_ADR, Zero)  // _ADR: Address\r
-                Name (_PR0, Package (0x01)  // _PR0: Power Resources for D0\r
-                {\r
-                    \_SB.P0OF\r
-                })\r
-                Name (_PR3, Package (0x01)  // _PR3: Power Resources for D3hot\r
-                {\r
-                    \_SB.P0OF\r
-                })\r
-                Name (_PRR, Package (0x01)  // _PRR: Power Resource for Reset\r
-                {\r
-                    \_SB.P0OF\r
-                })\r
-                Name (_S0W, 0x04)  // _S0W: S0 Device Wake State\r
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-                {\r
-                    Name (RBUF, ResourceTemplate ()\r
-                    {\r
-                        GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullUp, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0025\r
-                            }\r
-                    })\r
-                    Return (RBUF) /* \_SB_.PCI0.RP1_._CRS.RBUF */\r
-                }\r
-\r
-                Name (_DSD, Package (0x02)  // _DSD: Device-Specific Data\r
-                {\r
-                    ToUUID ("6211e2c0-58a3-4af3-90e1-927a4e0c55a4"), \r
-                    Package (0x01)\r
-                    {\r
-                        Package (0x02)\r
-                        {\r
-                            "HotPlugSupportInD3", \r
-                            One\r
-                        }\r
-                    }\r
-                })\r
-                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
-                {\r
-                    If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_0 = ToInteger (Arg2)\r
-                            If ((_T_0 == Zero))\r
-                            {\r
-                                Return (Buffer (0x02)\r
-                                {\r
-                                     0x01, 0x03                                       // ..\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x08))\r
-                            {\r
-                                Return (Package (One)\r
-                                {\r
-                                    One\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x09))\r
-                            {\r
-                                Return (Package (0x05)\r
-                                {\r
-                                    0xFFFFFFFF, \r
-                                    0xFFFFFFFF, \r
-                                    0xFFFFFFFF, \r
-                                    Zero, \r
-                                    0xFFFFFFFF\r
-                                })\r
-                            }\r
-                            Else\r
-                            {\r
-                            }\r
-\r
-                            Break\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
 \r
         OperationRegion (CP08, SystemMemory, 0x01C08000, 0x1004)\r
         Field (CP08, DWordAcc, NoLock, Preserve)\r
@@ -61590,562 +59279,29 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
         }\r
 \r
         Name (G1D3, Zero)\r
-        PowerResource (P1ON, 0x05, 0x0000)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.GIO0\r
-            })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_ON, 0, NotSerialized)  // _ON_: Power On\r
-            {\r
-                If (G1D3)\r
-                {\r
-                    G1D3 = Zero\r
-                    GP1B = One\r
-                    Sleep (One)\r
-                    GP1B = Zero\r
-                    G1PB = One\r
-                    Sleep (One)\r
-                    G1PB = Zero\r
-                    If (\_SB.PPU1 ())\r
-                    {\r
-                        Debug = "PHY Init Failed for Port 1"\r
-                        While (One){}\r
-                    }\r
-\r
-                    If ((\_SB.GIO0.GABL == One))\r
-                    {\r
-                        \_SB.PCI1.MOD2 = Zero\r
-                    }\r
-\r
-                    Sleep (0x0A)\r
-                    If ((\_SB.GIO0.GABL == One))\r
-                    {\r
-                        \_SB.PCI1.MOD2 = One\r
-                    }\r
-\r
-                    If (\_SB.LTS1 ())\r
-                    {\r
-                        \_SB.E1LT = 0x401FFFFF\r
-                    }\r
-                    Else\r
-                    {\r
-                        \_SB.E1LT = 0x400FFFFF\r
-                    }\r
-\r
-                    \_SB.IAT1 ()\r
-                    \_SB.MSC1 ()\r
-                }\r
-            }\r
-\r
-            Method (_OFF, 0, NotSerialized)  // _OFF: Power Off\r
-            {\r
-                If ((G1D3 == Zero))\r
-                {\r
-                    BreakPoint\r
-                    Name (PTO0, Zero)\r
-                    G1D3 = One\r
-                    Local0 = PSC1 /* \_SB_.PSC1 */\r
-                    Local0 |= 0x10\r
-                    PSC1 = Local0\r
-                    Local0 = ESC1 /* \_SB_.ESC1 */\r
-                    Local0 |= 0x10\r
-                    ESC1 = Local0\r
-                    Local0 = PPS1 /* \_SB_.PPS1 */\r
-                    While ((Local0 &= 0x20 != 0x20))\r
-                    {\r
-                        Sleep (0x0A)\r
-                        PTO0 += One\r
-                        If ((PTO0 == 0x0A))\r
-                        {\r
-                            Break\r
-                        }\r
-\r
-                        Local0 = PPS1 /* \_SB_.PPS1 */\r
-                    }\r
-\r
-                    If ((\_SB.GIO0.GABL == One))\r
-                    {\r
-                        \_SB.PCI1.MOD2 = Zero\r
-                    }\r
-\r
-                    HPSR = Zero\r
-                    L0ST = Zero\r
-                    L1ST = Zero\r
-                    HSTC = Zero\r
-                }\r
-            }\r
-        }\r
-\r
-        PowerResource (P1OF, 0x05, 0x0000)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.GIO0\r
-            })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_ON, 0, NotSerialized)  // _ON_: Power On\r
-            {\r
-            }\r
-\r
-            Method (_OFF, 0, NotSerialized)  // _OFF: Power Off\r
-            {\r
-            }\r
-\r
-            Method (_RST, 0, Serialized)  // _RST: Device Reset\r
-            {\r
-                GP1B = One\r
-                Sleep (One)\r
-                GP1B = Zero\r
-                G1PB = One\r
-                Sleep (One)\r
-                G1PB = Zero\r
-                If (\_SB.PPU1 ())\r
-                {\r
-                    Debug = "PHY Init Failed for Port 1"\r
-                    While (One){}\r
-                }\r
-\r
-                If ((\_SB.GIO0.GABL == One))\r
-                {\r
-                    \_SB.PCI1.MOD2 = Zero\r
-                }\r
-\r
-                Sleep (0x0A)\r
-                If ((\_SB.GIO0.GABL == One))\r
-                {\r
-                    \_SB.PCI1.MOD2 = One\r
-                }\r
-\r
-                If (\_SB.LTS1 ())\r
-                {\r
-                    \_SB.E1LT = 0x401FFFFF\r
-                }\r
-                Else\r
-                {\r
-                    \_SB.E1LT = 0x400FFFFF\r
-                }\r
-\r
-                \_SB.IAT1 ()\r
-                \_SB.MSC1 ()\r
-            }\r
-        }\r
-\r
-        Device (PCI1)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0\r
-            })\r
-            Name (_HID, EisaId ("PNP0A08") /* PCI Express Bus */)  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_CID, EisaId ("PNP0A03") /* PCI Bus */)  // _CID: Compatible ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_SEG, One)  // _SEG: PCI Segment\r
-            Name (_BBN, Zero)  // _BBN: BIOS Bus Number\r
-            Name (_PRT, Package (0x04)  // _PRT: PCI Routing Table\r
-            {\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    Zero, \r
-                    Zero, \r
-                    0x01D2\r
-                }, \r
-\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    One, \r
-                    Zero, \r
-                    0x01D3\r
-                }, \r
-\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    0x02, \r
-                    Zero, \r
-                    0x01D6\r
-                }, \r
-\r
-                Package (0x04)\r
-                {\r
-                    0xFFFF, \r
-                    0x03, \r
-                    Zero, \r
-                    0x01D7\r
-                }\r
-            })\r
-            Method (_CCA, 0, NotSerialized)  // _CCA: Cache Coherency Attribute\r
-            {\r
-                Return (One)\r
-            }\r
-\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_PSC, 0, NotSerialized)  // _PSC: Power State Current\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x40200000,         // Address Base\r
-                        0x01FDF000,         // Address Length\r
-                        )\r
-                    WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,\r
-                        0x0000,             // Granularity\r
-                        0x0000,             // Range Minimum\r
-                        0x0001,             // Range Maximum\r
-                        0x0000,             // Translation Offset\r
-                        0x0002,             // Length\r
-                        ,, )\r
-                })\r
-                Return (RBUF) /* \_SB_.PCI1._CRS.RBUF */\r
-            }\r
-\r
-            Name (SUPP, Zero)\r
-            Name (CTRL, Zero)\r
-            Method (_DSW, 3, NotSerialized)  // _DSW: Device Sleep Wake\r
-            {\r
-            }\r
-\r
-            Method (_OSC, 4, NotSerialized)  // _OSC: Operating System Capabilities\r
-            {\r
-                If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */))\r
-                {\r
-                    CreateDWordField (Arg3, Zero, CDW1)\r
-                    CreateDWordField (Arg3, 0x04, CDW2)\r
-                    CreateDWordField (Arg3, 0x08, CDW3)\r
-                    SUPP = CDW2 /* \_SB_.PCI1._OSC.CDW2 */\r
-                    CTRL = CDW3 /* \_SB_.PCI1._OSC.CDW3 */\r
-                    If (((SUPP & 0x16) != 0x16))\r
-                    {\r
-                        CTRL &= 0x1E\r
-                    }\r
-\r
-                    CTRL &= 0x15\r
-                    If ((Arg1 != One))\r
-                    {\r
-                        CDW1 |= 0x08\r
-                    }\r
-\r
-                    If ((CDW3 != CTRL))\r
-                    {\r
-                        CDW1 |= 0x10\r
-                    }\r
-\r
-                    CDW3 = CTRL /* \_SB_.PCI1.CTRL */\r
-                    Return (Arg3)\r
-                }\r
-                Else\r
-                {\r
-                    CDW1 |= 0x04\r
-                    Return (Arg3)\r
-                }\r
-            }\r
-\r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
-            {\r
-                If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))\r
-                {\r
-                    While (One)\r
-                    {\r
-                        Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                        _T_0 = ToInteger (Arg2)\r
-                        If ((_T_0 == Zero))\r
-                        {\r
-                            Return (Buffer (0x02)\r
-                            {\r
-                                 0xFF, 0x03                                       // ..\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == One))\r
-                        {\r
-                            Return (Package (0x02)\r
-                            {\r
-                                Package (One)\r
-                                {\r
-                                    One\r
-                                }, \r
-\r
-                                Package (0x03)\r
-                                {\r
-                                    Zero, \r
-                                    One, \r
-                                    One\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x02))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                Package (0x04)\r
-                                {\r
-                                    One, \r
-                                    0x03, \r
-                                    Zero, \r
-                                    0x07\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x03))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                Zero\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x04))\r
-                        {\r
-                            Return (Package (0x02)\r
-                            {\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (0x04)\r
-                                {\r
-                                    One, \r
-                                    0x03, \r
-                                    Zero, \r
-                                    0x07\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x05))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                One\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x06))\r
-                        {\r
-                            Return (Package (0x04)\r
-                            {\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }, \r
-\r
-                                Package (One)\r
-                                {\r
-                                    Zero\r
-                                }\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x07))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                0x02\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x08))\r
-                        {\r
-                            Return (Package (One)\r
-                            {\r
-                                One\r
-                            })\r
-                        }\r
-                        ElseIf ((_T_0 == 0x09))\r
-                        {\r
-                            Return (Package (0x05)\r
-                            {\r
-                                0xFFFFFFFF, \r
-                                0xFFFFFFFF, \r
-                                0xFFFFFFFF, \r
-                                Zero, \r
-                                0xFFFFFFFF\r
-                            })\r
-                        }\r
-                        Else\r
-                        {\r
-                        }\r
-\r
-                        Break\r
-                    }\r
-                }\r
-            }\r
-\r
-            Name (_S0W, 0x04)  // _S0W: S0 Device Wake State\r
-            Name (RST1, ResourceTemplate ()\r
-            {\r
-                GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                    "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                    )\r
-                    {   // Pin list\r
-                        0x0066\r
-                    }\r
-            })\r
-            Scope (\_SB.GIO0)\r
-            {\r
-                OperationRegion (P1PR, GeneralPurposeIo, Zero, One)\r
-            }\r
-\r
-            Field (\_SB.GIO0.P1PR, ByteAcc, NoLock, Preserve)\r
-            {\r
-                Connection (\_SB.PCI1.RST1), \r
-                MOD2,   1\r
-            }\r
-\r
-            Name (_PR0, Package (0x01)  // _PR0: Power Resources for D0\r
-            {\r
-                \_SB.P1ON\r
-            })\r
-            Name (_PR3, Package (0x01)  // _PR3: Power Resources for D3hot\r
-            {\r
-                \_SB.P1ON\r
-            })\r
-            Device (RP1)\r
-            {\r
-                Name (_ADR, Zero)  // _ADR: Address\r
-                Name (_PR0, Package (0x01)  // _PR0: Power Resources for D0\r
-                {\r
-                    \_SB.P1OF\r
-                })\r
-                Name (_PR3, Package (0x01)  // _PR3: Power Resources for D3hot\r
-                {\r
-                    \_SB.P1OF\r
-                })\r
-                Name (_PRR, Package (0x01)  // _PRR: Power Resource for Reset\r
-                {\r
-                    \_SB.P1OF\r
-                })\r
-                Name (_DSD, Package (0x02)  // _DSD: Device-Specific Data\r
-                {\r
-                    ToUUID ("6211e2c0-58a3-4af3-90e1-927a4e0c55a4"), \r
-                    Package (0x01)\r
-                    {\r
-                        Package (0x02)\r
-                        {\r
-                            "HotPlugSupportInD3", \r
-                            One\r
-                        }\r
-                    }\r
-                })\r
-                Name (_S0W, 0x04)  // _S0W: S0 Device Wake State\r
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-                {\r
-                    Name (RBUF, ResourceTemplate ()\r
-                    {\r
-                        GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullUp, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0068\r
-                            }\r
-                        GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullUp, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0071\r
-                            }\r
-                    })\r
-                    Return (RBUF) /* \_SB_.PCI1.RP1_._CRS.RBUF */\r
-                }\r
-\r
-                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
-                {\r
-                    If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_0 = ToInteger (Arg2)\r
-                            If ((_T_0 == Zero))\r
-                            {\r
-                                Return (Buffer (0x02)\r
-                                {\r
-                                     0x01, 0x03                                       // ..\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x08))\r
-                            {\r
-                                Return (Package (One)\r
-                                {\r
-                                    One\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x09))\r
-                            {\r
-                                Return (Package (0x05)\r
-                                {\r
-                                    0xFFFFFFFF, \r
-                                    0xFFFFFFFF, \r
-                                    0xFFFFFFFF, \r
-                                    Zero, \r
-                                    0xFFFFFFFF\r
-                                })\r
-                            }\r
-                            Else\r
-                            {\r
-                            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
 \r
 \r
-        //\r
-        // IPC Router\r
-        //\r
         Device (IPC0)\r
         {\r
-//#if 0\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.GLNK\r
             })\r
-//#endif\r
             Name (_HID, "QCOM021C")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
         }\r
 \r
         Device (GLNK)\r
         {\r
-//#if 0\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.RPEN\r
             })\r
-//#endif\r
             Name (_HID, "QCOM02F9")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, Zero)  // _UID: Unique ID\r
-            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings\r
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
@@ -62186,8 +59342,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //     ADSP RPC Driver\r
-        //\r
         Device (ARPC)\r
         {\r
             Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
@@ -62211,48 +59365,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Alias (\_SB.PSUB, _SUB)\r
         }\r
 \r
-        //\r
-        // RemoteFS\r
-        // \r
-        Device(RFS0)\r
-        {\r
-            Name(_DEP, Package(0x2)\r
-            {\r
-                IPC0,\r
-                UFS0\r
-            })\r
-            Name(_HID, "QCOM0235")\r
-            Alias(PSUB, _SUB)\r
-            Method(_CRS, 0x0, NotSerialized)\r
-            {\r
-                Name(RBUF, Buffer(0x26)\r
-                {\r
-       0x86, 0x09, 0x00, 0x01, 0x88, 0x88, 0x88, 0x88, 0x99, 0x99, 0x99, 0x99,\r
-       0x86, 0x09, 0x00, 0x01, 0x11, 0x11, 0x11, 0x11, 0x22, 0x22, 0x22, 0x22,\r
-       0x86, 0x09, 0x00, 0x01, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44,\r
-       0x79, 0x00\r
-                })\r
-                CreateDWordField(RBUF, 0x4, RMTA)\r
-                CreateDWordField(RBUF, 0x8, RMTL)\r
-                CreateDWordField(RBUF, 0x10, RFMA)\r
-                CreateDWordField(RBUF, 0x14, RFML)\r
-                CreateDWordField(RBUF, 0x1c, RFAA)\r
-                CreateDWordField(RBUF, 0x20, RFAL)\r
-                Store(RMTB, RMTA)\r
-                Store(RMTX, RMTL)\r
-                Store(RFMB, RFMA)\r
-                Store(RFMS, RFML)\r
-                Store(RFAB, RFAA)\r
-                Store(RFAS, RFAL)\r
-                Return(RBUF)\r
-            }\r
-            Method(_STA, 0x0, NotSerialized)\r
-            {\r
-                Return(0xb)\r
-            }\r
-        }\r
-\r
-#if 0\r
         Device (RFS0)\r
         {\r
             Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
@@ -62299,7 +59411,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 Return (0x0B)\r
             }\r
         }\r
-#endif\r
 \r
         Device (IPA)\r
         {\r
@@ -62333,7 +59444,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Device (GSI)\r
         {\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
                 \_SB.PEP0\r
             })\r
@@ -62357,9 +59468,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        //Qualcomm DIAG Service\r
-        //\r
         Device (QDIG)\r
         {\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
@@ -62370,9 +59478,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             Alias (\_SB.PSUB, _SUB)\r
         }\r
 \r
-        //\r
-        // Qualcomm DIAG Bridge\r
-        //\r
         Device (QCDB)\r
         {\r
             Name (_HID, "QCOM0298")  // _HID: Hardware ID\r
@@ -62381,7 +59486,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Device (SYSM)\r
         {\r
-            Name (_HID, "MEOW0010" /* Processor Container Device */)  // _HID: Hardware ID\r
+            Name (_HID, "ACPI0010" /* Processor Container Device */)  // _HID: Hardware ID\r
             Name (_UID, 0x00100000)  // _UID: Unique ID\r
             Name (_LPI, Package (0x05)  // _LPI: Low Power Idle States\r
             {\r
@@ -62450,7 +59555,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             })\r
             Device (CLUS)\r
             {\r
-                Name (_HID, "MEOW0010" /* Processor Container Device */)  // _HID: Hardware ID\r
+                Name (_HID, "ACPI0010" /* Processor Container Device */)  // _HID: Hardware ID\r
                 Name (_UID, 0x10)  // _UID: Unique ID\r
                 Name (_LPI, Package (0x05)  // _LPI: Low Power Idle States\r
                 {\r
@@ -62519,7 +59624,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 })\r
                 Device (CPU0)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, Zero)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -62691,7 +59796,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Device (CPU1)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, One)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -62863,7 +59968,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Device (CPU2)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, 0x02)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -63035,7 +60140,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Device (CPU3)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, 0x03)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -63207,7 +60312,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Device (CPU4)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, 0x04)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -63379,7 +60484,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Device (CPU5)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, 0x05)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -63551,7 +60656,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Device (CPU6)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, 0x06)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -63723,7 +60828,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
                 Device (CPU7)\r
                 {\r
-                    Name (_HID, "MEOW0007" /* Processor Device */)  // _HID: Hardware ID\r
+                    Name (_HID, "ACPI0007" /* Processor Device */)  // _HID: Hardware ID\r
                     Name (_UID, 0x07)  // _UID: Unique ID\r
                     Method (_STA, 0, NotSerialized)  // _STA: Status\r
                     {\r
@@ -63916,9 +61021,6 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        // Qualcomm GPS driver\r
-        //\r
         Device (GPS)\r
         {\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
@@ -63933,7 +61035,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Device (QGP0)\r
         {\r
-            Name (_HID, "NOPE02F4")  // _HID: Hardware ID\r
+            Name (_HID, "QCOM02F4")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, Zero)  // _UID: Unique ID\r
             Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
@@ -63980,7 +61082,7 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 \r
         Device (QGP1)\r
         {\r
-            Name (_HID, "NOPE02F4")  // _HID: Hardware ID\r
+            Name (_HID, "QCOM02F4")  // _HID: Hardware ID\r
             Alias (\_SB.PSUB, _SUB)\r
             Name (_UID, One)  // _UID: Unique ID\r
             Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
@@ -64024,27 +61126,11 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
                 })\r
             }\r
         }\r
-        \r
-        Scope (\_SB)\r
-        {\r
-            OperationRegion (XACA, SystemMemory, 0x146BFA94, 0x64)\r
-            Field (XACA, AnyAcc, Lock, Preserve)\r
-            {\r
-                HBID,   8, \r
-                BWDS,   8, \r
-                PRP1,   8, \r
-                PVCS,   8, \r
-                BATP,   8, \r
-                VMXC,   8, \r
-                VMXN,   8, \r
-                VMXD,   8\r
-            }\r
-        }\r
 \r
         Device (SARM)\r
         {\r
             Name (_HID, "QCOM0301")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
+                       Alias (\_SB.PSUB, _SUB)\r
         }\r
 \r
         Scope (\_SB)\r
@@ -64092,6781 +61178,4250 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
             }\r
         }\r
 \r
-        //\r
-        //CAMERA PLATFORM\r
-        //\r
-        Device (CAMP)\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+        Scope (\_SB)\r
         {\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0, \r
-                \_SB.PMIC\r
-            })\r
-            Name (_HID, "QCOM026F")  // _HID: Hardware ID\r
-            Name (_UID, 0x1B)  // _UID: Unique ID\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Name (GRST, Zero)\r
+        }\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+        Device (LID0)\r
+        {\r
+            Name (_HID, "PNP0C0D" /* Lid Device */)  // _HID: Hardware ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+            Name (LIDB, One)\r
+            Method (_LID, 0, NotSerialized)  // _LID: Lid Status\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC40000,         // Address Base\r
-                        0x0000006C,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC42000,         // Address Base\r
-                        0x00004E8C,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC4A000,         // Address Base\r
-                        0x00000C1C,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001EC,\r
-                    }\r
-                })\r
-                Return (RBUF) /* \_SB_.CAMP._CRS.RBUF */\r
+                Return (LIDB) /* \_SB_.LID0.LIDB */\r
             }\r
+        }\r
 \r
-            Name (PLED, Zero)\r
-            Method (PPUT, 1, NotSerialized)\r
+        Method (ADDR, 0, NotSerialized)\r
+        {\r
+            If ((\_SB.SVMJ == One))\r
             {\r
-                PLED = Arg0\r
-                If ((PLED == Zero))\r
-                {\r
-                    \_SB.LED1.RLED (0x0100, Zero)\r
-                }\r
+                Return (0x0390B000)\r
+            }\r
+            ElseIf ((\_SB.SVMJ == 0x02))\r
+            {\r
+                Return (0x0350B000)\r
+            }\r
+        }\r
+\r
+        OperationRegion (NM11, SystemMemory, ADDR (), 0x14)\r
+        Field (NM11, DWordAcc, NoLock, Preserve)\r
+        {\r
+            PI1C,   32, \r
+            PIN1,   32, \r
+            PI1N,   32, \r
+            PI1S,   32, \r
+            PI1L,   32\r
+        }\r
+\r
+        Method (_MID, 0, Serialized)\r
+        {\r
+            Name (NMID, Zero)\r
+            NMID = PIN1 /* \_SB_.PIN1 */\r
+            Return (NMID) /* \_SB_._MID.NMID */\r
+        }\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
 \r
-                If ((PLED == One))\r
-                {\r
-                    \_SB.LED1.RLED (0x0100, One)\r
-                }\r
 \r
-                Return (PLED) /* \_SB_.CAMP.PLED */\r
-            }\r
 \r
-            Method (PGET, 0, NotSerialized)\r
+\r
+        Scope (\_SB)\r
+        {\r
+            Device (AGNT)\r
             {\r
-                Return (PLED) /* \_SB_.CAMP.PLED */\r
+                Name (_ADR, Zero)  // _ADR: Address\r
+                Name (_HID, "SAM0603")  // _HID: Hardware ID\r
+                Name (_CID, "SAM0603")  // _CID: Compatible ID\r
+                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
+                Name (_UID, One)  // _UID: Unique ID\r
+                Name (_STA, 0x0F)  // _STA: Status\r
             }\r
+        }\r
+\r
+        Method (ADBG, 1, Serialized)\r
+        {\r
+            \r
+        }\r
 \r
-            Method (PCFG, 0, Serialized)\r
+               Device (UCP0)\r
+        {\r
+            Name (_HID, "QCOM02D0")  // _HID: Hardware ID\r
+            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
+            {\r
+                \_SB.PEP0, \r
+                \_SB.PTCC, \r
+                \_SB.URS0\r
+            })\r
+            Device (CON0)\r
             {\r
-                Return (Package (0x01)\r
+                Name (_ADR, Zero)  // _ADR: Address\r
+                Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device\r
+                {\r
+                    ToPLD (\r
+                        PLD_Revision           = 0x2,\r
+                        PLD_IgnoreColor        = 0x1,\r
+                        PLD_Red                = 0x0,\r
+                        PLD_Green              = 0x0,\r
+                        PLD_Blue               = 0x0,\r
+                        PLD_Width              = 0x0,\r
+                        PLD_Height             = 0x0,\r
+                        PLD_UserVisible        = 0x1,\r
+                        PLD_Dock               = 0x0,\r
+                        PLD_Lid                = 0x0,\r
+                        PLD_Panel              = "BACK",\r
+                        PLD_VerticalPosition   = "CENTER",\r
+                        PLD_HorizontalPosition = "LEFT",\r
+                        PLD_Shape              = "VERTICALRECTANGLE",\r
+                        PLD_GroupOrientation   = 0x0,\r
+                        PLD_GroupToken         = 0x0,\r
+                        PLD_GroupPosition      = 0x1,\r
+                        PLD_Bay                = 0x0,\r
+                        PLD_Ejectable          = 0x0,\r
+                        PLD_EjectRequired      = 0x0,\r
+                        PLD_CabinetNumber      = 0x0,\r
+                        PLD_CardCageNumber     = 0x0,\r
+                        PLD_Reference          = 0x0,\r
+                        PLD_Rotation           = 0x0,\r
+                        PLD_Order              = 0x0,\r
+                        PLD_VerticalOffset     = 0xFFFF,\r
+                        PLD_HorizontalOffset   = 0xFFFF)\r
+\r
+                })\r
+                Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities\r
                 {\r
-                    Package (0x09)\r
-                    {\r
-                        0x03, \r
-                        Zero, \r
-                        0x00210010, \r
-                        Zero, \r
-                        Zero, \r
-                        Zero, \r
-                        Zero, \r
-                        Zero, \r
-                        Zero\r
-                    }\r
+                    One, \r
+                    0x09, \r
+                    Zero, \r
+                    Zero\r
                 })\r
-            }\r
-\r
-            Method (PERF, 0, NotSerialized)\r
-            {\r
-                Name (EBUF, Package (0x02)\r
+                Name (_DSD, Package (0x02)  // _DSD: Device-Specific Data\r
                 {\r
-                    Package (0x05)\r
+                    ToUUID ("6b856e62-40f4-4688-bd46-5e888a2260de"), \r
+                    Package (0x0A)\r
                     {\r
-                        "COMPONENT", \r
-                        Zero, \r
-                        Package (0x05)\r
+                        Package (0x02)\r
                         {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "CAMP_CLK", \r
-                            Package (0x04)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x023C3460, \r
-                                0x0124F800\r
-                            }\r
+                            One, \r
+                            0x04\r
                         }, \r
 \r
-                        Package (0x05)\r
+                        Package (0x02)\r
                         {\r
-                            "PSTATE_SET", \r
-                            One, \r
-                            One, \r
-                            "NRT_UNCOMP_BANDWIDTH", \r
-                            Package (0x28)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x00000002CB417800, \r
-                                0x00000002AD741300, \r
-                                0x000000028FA6AE00, \r
-                                0x0000000271D94900, \r
-                                0x00000002540BE400, \r
-                                0x00000002363E7F00, \r
-                                0x0000000218711A00, \r
-                                0x00000001FAA3B500, \r
-                                0x00000001DCD65000, \r
-                                0x00000001BF08EB00, \r
-                                0x00000001A13B8600, \r
-                                0x00000001836E2100, \r
-                                0x0000000165A0BC00, \r
-                                0x0000000147D35700, \r
-                                0x000000012A05F200, \r
-                                0x000000010C388D00, \r
-                                0xEE6B2800, \r
-                                0xD09DC300, \r
-                                0xC4B20100, \r
-                                0xB8C63F00, \r
-                                0xACDA7D00, \r
-                                0xA0EEBB00, \r
-                                0x9502F900, \r
-                                0x89173700, \r
-                                0x7D2B7500, \r
-                                0x713FB300, \r
-                                0x6553F100, \r
-                                0x59682F00, \r
-                                0x4D7C6D00, \r
-                                0x4190AB00, \r
-                                0x35A4E900, \r
-                                0x29B92700, \r
-                                0x1DCD6500, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
-                            }\r
+                            0x02, \r
+                            0x03\r
                         }, \r
 \r
-                        Package (0x05)\r
+                        Package (0x02)\r
                         {\r
-                            "PSTATE_SET", \r
-                            0x02, \r
-                            One, \r
-                            "NRT_BANDWIDTH", \r
-                            Package (0x28)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x00000002CB417800, \r
-                                0x00000002AD741300, \r
-                                0x000000028FA6AE00, \r
-                                0x0000000271D94900, \r
-                                0x00000002540BE400, \r
-                                0x00000002363E7F00, \r
-                                0x0000000218711A00, \r
-                                0x00000001FAA3B500, \r
-                                0x00000001DCD65000, \r
-                                0x00000001BF08EB00, \r
-                                0x00000001A13B8600, \r
-                                0x00000001836E2100, \r
-                                0x0000000165A0BC00, \r
-                                0x0000000147D35700, \r
-                                0x000000012A05F200, \r
-                                0x000000010C388D00, \r
-                                0xEE6B2800, \r
-                                0xD09DC300, \r
-                                0xC4B20100, \r
-                                0xB8C63F00, \r
-                                0xACDA7D00, \r
-                                0xA0EEBB00, \r
-                                0x9502F900, \r
-                                0x89173700, \r
-                                0x7D2B7500, \r
-                                0x713FB300, \r
-                                0x6553F100, \r
-                                0x59682F00, \r
-                                0x4D7C6D00, \r
-                                0x4190AB00, \r
-                                0x35A4E900, \r
-                                0x29B92700, \r
-                                0x1DCD6500, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
+                            0x03, \r
+                            Zero\r
+                        }, \r
 \r
-                    Package (0x06)\r
-                    {\r
-                        "COMPONENT", \r
-                        One, \r
-                        Package (0x05)\r
+                        Package (0x02)\r
                         {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            One, \r
-                            "HF0_UNCOMP_BANDWIDTH", \r
-                            Package (0x08)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x4190AB00, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
-                            }\r
+                            0x04, \r
+                            One\r
                         }, \r
 \r
-                        Package (0x05)\r
+                        Package (0x02)\r
                         {\r
-                            "PSTATE_SET", \r
-                            One, \r
-                            One, \r
-                            "HF0_BANDWIDTH", \r
-                            Package (0x08)\r
+                            0x05, \r
+                            0x03\r
+                        }, \r
+\r
+                        Package (0x02)\r
+                        {\r
+                            0x06, \r
+                            Package (0x01)\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x4190AB00, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
+                                0x0001905A\r
                             }\r
                         }, \r
 \r
-                        Package (0x05)\r
+                        Package (0x02)\r
                         {\r
-                            "PSTATE_SET", \r
-                            0x02, \r
-                            One, \r
-                            "NRT_UNCOMP_BANDWIDTH", \r
-                            Package (0x08)\r
+                            0x07, \r
+                            Package (0x02)\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x4190AB00, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
+                                0x0001912C, \r
+                                0x0002D0C8\r
                             }\r
                         }, \r
 \r
-                        Package (0x05)\r
+                        Package (0x02)\r
                         {\r
-                            "PSTATE_SET", \r
-                            0x03, \r
-                            One, \r
-                            "NRT_BANDWIDTH", \r
-                            Package (0x08)\r
+                            0x08, \r
+                            Package (0x02)\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x4190AB00, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
+                                0xFF01, \r
+                                0x3C86\r
                             }\r
+                        }, \r
+\r
+                        Package (0x02)\r
+                        {\r
+                            0x09, \r
+                            One\r
+                        }, \r
+\r
+                        Package (0x02)\r
+                        {\r
+                            0x0A, \r
+                            One\r
                         }\r
                     }\r
                 })\r
-                Return (EBUF) /* \_SB_.CAMP.PERF.EBUF */\r
-            }\r
-        }\r
-\r
-        //\r
-        // CAMERA SENSOR\r
-        //\r
-        Device (CAMS)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.MPCS\r
-            })\r
-            Name (_HID, "QCOM0245")  // _HID: Hardware ID\r
-            Name (_UID, 0x15)  // _UID: Unique ID\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (0x0F)\r
             }\r
 \r
-            Method (SCFG, 0, Serialized)\r
+            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
             {\r
-                Return (Package (0x01)\r
+                While (One)\r
                 {\r
-                    Package (0x05)\r
+                    Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r
                     {\r
-                        "com.qti.sensormodule.powerlogics_s5k4h5yc.bin", \r
-                        "com.qti.tuned.powerlogics_s5k4h5yc.bin", \r
-                        0x0015006E, \r
-                        0x485B0000, \r
-                        Zero\r
-                    }\r
-                })\r
-            }\r
+                         0x00                                             // .\r
+                    })\r
+                    CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.UCP0._DSM._T_0 */\r
+                    If ((_T_0 == ToUUID ("18de299f-9476-4fc9-b43b-8aeb713ed751")))\r
+                    {\r
+                        While (One)\r
+                        {\r
+                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                            _T_1 = ToInteger (Arg2)\r
+                            If ((_T_1 == Zero))\r
+                            {\r
+                                While (One)\r
+                                {\r
+                                    Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                    _T_2 = ToInteger (Arg1)\r
+                                    If ((_T_2 == Zero))\r
+                                    {\r
+                                        Return (Buffer (One)\r
+                                        {\r
+                                             0x01                                             // .\r
+                                        })\r
+                                        Break\r
+                                    }\r
+                                    Else\r
+                                    {\r
+                                        Return (Buffer (One)\r
+                                        {\r
+                                             0x01                                             // .\r
+                                        })\r
+                                        Break\r
+                                    }\r
 \r
-            Name (PGID, Buffer (0x0A)\r
-            {\r
-                "\\_SB.CAMS"\r
-            })\r
-            Name (DBUF, Buffer (DBFL){})\r
-            CreateByteField (DBUF, Zero, STAT)\r
-            CreateByteField (DBUF, 0x02, DVAL)\r
-            CreateField (DBUF, 0x18, 0xA0, DEID)\r
-            Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                                    Break\r
+                                }\r
 \r
-            Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                                Return (Buffer (One)\r
+                                {\r
+                                     0x00                                             // .\r
+                                })\r
+                                Break\r
+                            }\r
+                            ElseIf ((_T_1 == One))\r
+                            {\r
+                                While (One)\r
+                                {\r
+                                    Name (_T_3, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                    _T_3 = ToInteger (Arg3)\r
+                                    If ((_T_3 == Zero))\r
+                                    {\r
+                                        Return (Package (0x01)\r
+                                        {\r
+                                            0x36019050\r
+                                        })\r
+                                        Break\r
+                                    }\r
+                                    ElseIf ((_T_3 == One))\r
+                                    {\r
+                                        Return (Package (0x01)\r
+                                        {\r
+                                            0x3601912C\r
+                                        })\r
+                                        Break\r
+                                    }\r
+                                    Else\r
+                                    {\r
+                                        Return (Package (0x01)\r
+                                        {\r
+                                            Zero\r
+                                        })\r
+                                        Break\r
+                                    }\r
 \r
-            Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                                    Break\r
+                                }\r
+                            }\r
+                            Else\r
+                            {\r
+                                Return (Buffer (One)\r
+                                {\r
+                                     0x00                                             // .\r
+                                })\r
+                                Break\r
+                            }\r
 \r
-            Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = Zero\r
-                DEID = PGID /* \_SB_.CAMS.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.CAMS.DBUF */\r
+                            Break\r
+                        }\r
+                    }\r
+                    Else\r
+                    {\r
+                        Return (Buffer (One)\r
+                        {\r
+                             0x00                                             // .\r
+                        })\r
+                        Break\r
+                    }\r
+\r
+                    Break\r
                 }\r
             }\r
 \r
-            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3\r
+            Method (CCOT, 2, NotSerialized)\r
             {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = 0x03\r
-                DEID = PGID /* \_SB_.CAMS.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.CAMS.DBUF */\r
-                }\r
+                \_SB.CCST = Arg0\r
+                \_SB.HSFL = Arg1\r
             }\r
-        }\r
 \r
-        Device (CAMF)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.MPCS\r
-            })\r
-            Name (_HID, "QCOM024A")  // _HID: Hardware ID\r
-            Name (_UID, 0x1A)  // _UID: Unique ID\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Method (CCVL, 0, NotSerialized)\r
             {\r
-                Return (0x0F)\r
+                Return (\_SB.CCST)\r
             }\r
 \r
-            Method (SCFG, 0, Serialized)\r
+            Method (HPDS, 0, NotSerialized)\r
             {\r
-                Return (Package (0x01)\r
-                {\r
-                    Package (0x05)\r
-                    {\r
-                        "com.qti.sensormodule.hnt_s5k5e3yx.bin", \r
-                        "com.qti.tuned.hnt_s5k5e3yx.bin", \r
-                        0x00150020, \r
-                        0x5E300000, \r
-                        Zero\r
-                    }\r
-                })\r
+                Notify (\_SB.GPU0, 0x94) // Device-Specific\r
             }\r
 \r
-            Name (PGID, Buffer (0x0A)\r
-            {\r
-                "\\_SB.CAMF"\r
-            })\r
-            Name (DBUF, Buffer (DBFL){})\r
-            CreateByteField (DBUF, Zero, STAT)\r
-            CreateByteField (DBUF, 0x02, DVAL)\r
-            CreateField (DBUF, 0x18, 0xA0, DEID)\r
-            Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State\r
+            Method (HPDF, 2, NotSerialized)\r
             {\r
-                Return (0x03)\r
+                \_SB.HPDB = Arg0\r
+                \_SB.PINA = Arg1\r
+                Notify (\_SB.GPU0, \_SB.HPDB)\r
             }\r
 \r
-            Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State\r
+            Method (HPDV, 0, NotSerialized)\r
             {\r
-                Return (0x03)\r
+                Return (\_SB.HPDB)\r
             }\r
 \r
-            Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State\r
+            Method (PINV, 0, NotSerialized)\r
             {\r
-                Return (0x03)\r
+                Return (\_SB.PINA)\r
             }\r
+        }\r
 \r
-            Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0\r
+\r
+        Name (QUFN, Zero)\r
+        Name (DPP0, Buffer (One)\r
+        {\r
+             0x00                                             // .\r
+        })\r
+\r
+\r
+        Device (URS0)\r
+        {\r
+            Method (URSI, 0, NotSerialized)\r
             {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = Zero\r
-                DEID = PGID /* \_SB_.CAMF.PGID */\r
-                If (\_SB.ABD.AVBL)\r
+                If ((\_SB.QUFN == Zero))\r
                 {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.CAMF.DBUF */\r
+                    Return ("QCOM0304")\r
+                    //Return ("QCOM0305")\r
                 }\r
-            }\r
-\r
-            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = 0x03\r
-                DEID = PGID /* \_SB_.CAMF.PGID */\r
-                If (\_SB.ABD.AVBL)\r
+                Else\r
                 {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.CAMF.DBUF */\r
+                    Return ("QCOM0305")\r
                 }\r
             }\r
-        }\r
 \r
-        Device (CAMI)\r
-        {\r
+            Alias (URSI, _HID)\r
+            Name (_CID, "PNP0CA1")  // _CID: Compatible ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r
             Name (_DEP, Package (One)  // _DEP: Dependencies\r
             {\r
-                \_SB.MPCS\r
+                \_SB.PEP0\r
             })\r
-            Name (_HID, "QCOM0247")  // _HID: Hardware ID\r
-            Name (_UID, 0x1C)  // _UID: Unique ID\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings\r
             {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (SCFG, 0, Serialized)\r
+                Memory32Fixed (ReadWrite,\r
+                    0x0A600000,         // Address Base\r
+                    0x000FFFFF,         // Address Length\r
+                    )\r
+            })\r
+            Device (USB0)\r
             {\r
-                Return (Package (0x01)\r
-                {\r
-                    Package (0x05)\r
-                    {\r
-                        "com.qti.sensormodule.tfc_ov7251.bin", \r
-                        "com.qti.tuned.liteon_ov7251.bin", \r
-                        0x001500C0, \r
-                        0x7750300A, \r
-                        Zero\r
-                    }\r
-                })\r
-            }\r
+                Name (_ADR, Zero)  // _ADR: Address\r
+                Name (_S0W, 0x03)  // _S0W: S0 Device Wake State\r
+                Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device\r
+                {\r
+                    ToPLD (\r
+                        PLD_Revision           = 0x2,\r
+                        PLD_IgnoreColor        = 0x1,\r
+                        PLD_Red                = 0x0,\r
+                        PLD_Green              = 0x0,\r
+                        PLD_Blue               = 0x0,\r
+                        PLD_Width              = 0x0,\r
+                        PLD_Height             = 0x0,\r
+                        PLD_UserVisible        = 0x1,\r
+                        PLD_Dock               = 0x0,\r
+                        PLD_Lid                = 0x0,\r
+                        PLD_Panel              = "BACK",\r
+                        PLD_VerticalPosition   = "CENTER",\r
+                        PLD_HorizontalPosition = "LEFT",\r
+                        PLD_Shape              = "VERTICALRECTANGLE",\r
+                        PLD_GroupOrientation   = 0x0,\r
+                        PLD_GroupToken         = 0x0,\r
+                        PLD_GroupPosition      = 0x1,\r
+                        PLD_Bay                = 0x0,\r
+                        PLD_Ejectable          = 0x0,\r
+                        PLD_EjectRequired      = 0x0,\r
+                        PLD_CabinetNumber      = 0x0,\r
+                        PLD_CardCageNumber     = 0x0,\r
+                        PLD_Reference          = 0x0,\r
+                        PLD_Rotation           = 0x0,\r
+                        PLD_Order              = 0x0,\r
+                        PLD_VerticalOffset     = 0xFFFF,\r
+                        PLD_HorizontalOffset   = 0xFFFF)\r
 \r
-            Name (PGID, Buffer (0x0A)\r
-            {\r
-                "\\_SB.CAMI"\r
-            })\r
-            Name (DBUF, Buffer (DBFL){})\r
-            CreateByteField (DBUF, Zero, STAT)\r
-            CreateByteField (DBUF, 0x02, DVAL)\r
-            CreateField (DBUF, 0x18, 0xA0, DEID)\r
-            Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
-\r
-            Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
-\r
-            Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
-\r
-            Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = Zero\r
-                DEID = PGID /* \_SB_.CAMI.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.CAMI.DBUF */\r
-                }\r
-            }\r
-\r
-            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = 0x03\r
-                DEID = PGID /* \_SB_.CAMI.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.CAMI.DBUF */\r
-                }\r
-            }\r
-        }\r
-\r
-        Device (FLSH)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.CAMP\r
-            })\r
-            Name (_HID, "QCOM025C")  // _HID: Hardware ID\r
-            Name (_UID, 0x19)  // _UID: Unique ID\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (Zero)\r
-            }\r
-\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, Buffer (0x02)\r
+                })\r
+                Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities\r
                 {\r
-                     0x79, 0x00                                       // y.\r
+                    One, \r
+                    0x09, \r
+                    Zero, \r
+                    Zero\r
                 })\r
-                Return (RBUF) /* \_SB_.FLSH._CRS.RBUF */\r
-            }\r
-        }\r
-\r
-        Device (MPCS)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.CAMP\r
-            })\r
-            Name (_HID, "QCOM02E8")  // _HID: Hardware ID\r
-            Name (_UID, 0x18)  // _UID: Unique ID\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings\r
                 {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC65000,         // Address Base\r
-                        0x00000900,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC66000,         // Address Base\r
-                        0x00000900,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC67000,         // Address Base\r
-                        0x00000900,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r
                     {\r
-                        0x000001FD,\r
+                        0x000000A5,\r
                     }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, SharedAndWake, ,, )\r
                     {\r
-                        0x000001FE,\r
+                        0x0000017A,\r
                     }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, SharedAndWake, ,, )\r
                     {\r
-                        0x000001FF,\r
+                        0x00000206,\r
                     }\r
-                })\r
-                Return (RBUF) /* \_SB_.MPCS._CRS.RBUF */\r
-            }\r
-        }\r
-\r
-        //\r
-        // Hardware JPEG Encoder\r
-        //\r
-        Device (JPGE)\r
-        {\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.CAMP, \r
-                \_SB.MMU0\r
-            })\r
-            Name (_HID, "QCOM0276")  // _HID: Hardware ID\r
-            Name (_UID, 0x17)  // _UID: Unique ID\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC4E000,         // Address Base\r
-                        0x00000340,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC52000,         // Address Base\r
-                        0x000001B4,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
+                    Interrupt (ResourceConsumer, Edge, ActiveHigh, SharedAndWake, ,, )\r
                     {\r
-                        0x000001FA,\r
+                        0x00000208,\r
                     }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
+                    Interrupt (ResourceConsumer, Edge, ActiveHigh, SharedAndWake, ,, )\r
                     {\r
-                        0x000001FB,\r
+                        0x00000209,\r
                     }\r
                 })\r
-                Return (RBUF) /* \_SB_.JPGE._CRS.RBUF */\r
-            }\r
+                Method (_STA, 0, NotSerialized)  // _STA: Status\r
+                {\r
+                    Return (0x0F)\r
+                }\r
 \r
-            Method (PERF, 0, NotSerialized)\r
-            {\r
-                Name (EBUF, Package (0x02)\r
+                Method (DPM0, 1, NotSerialized)\r
                 {\r
-                    Package (0x03)\r
+                    \_SB.DPP0 = Arg0\r
+                    Notify (\_SB.PEP0, 0xA0) // Device-Specific\r
+                }\r
+\r
+                Method (CCVL, 0, NotSerialized)\r
+                {\r
+                    Return (\_SB.CCST)\r
+                }\r
+\r
+                Method (HSEN, 0, NotSerialized)\r
+                {\r
+                    Return (\_SB.HSFL)\r
+                }\r
+\r
+                Name (HSEI, ResourceTemplate ()\r
+                {\r
+                    GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
+                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x002B\r
+                        }\r
+                })\r
+                Scope (\_SB.GIO0)\r
+                {\r
+                    OperationRegion (HLEN, GeneralPurposeIo, Zero, One)\r
+                }\r
+\r
+                Field (\_SB.GIO0.HLEN, ByteAcc, NoLock, Preserve)\r
+                {\r
+                    Connection (\_SB.URS0.USB0.HSEI), \r
+                    MOD1,   1\r
+                }\r
+\r
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
+                {\r
+                    While (One)\r
                     {\r
-                        "COMPONENT", \r
-                        Zero, \r
-                        Package (0x05)\r
+                        Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r
                         {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "JPEG0_CLK", \r
-                            Package (0x06)\r
+                             0x00                                             // .\r
+                        })\r
+                        CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.URS0.USB0._DSM._T_0 */\r
+                        If ((_T_0 == ToUUID ("ce2ee385-00e6-48cb-9f05-2edb927c4899") /* USB Controller */))\r
+                        {\r
+                            While (One)\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x23C34600, \r
-                                0x18148D00, \r
-                                0x0BEBC200\r
+                                Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                _T_1 = ToInteger (Arg2)\r
+                                If ((_T_1 == Zero))\r
+                                {\r
+                                    While (One)\r
+                                    {\r
+                                        Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                        _T_2 = ToInteger (Arg1)\r
+                                        If ((_T_2 == Zero))\r
+                                        {\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x1D                                             // .\r
+                                            })\r
+                                            Break\r
+                                        }\r
+                                        Else\r
+                                        {\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x01                                             // .\r
+                                            })\r
+                                            Break\r
+                                        }\r
+\r
+                                        Break\r
+                                    }\r
+\r
+                                    Return (Buffer (One)\r
+                                    {\r
+                                         0x00                                             // .\r
+                                    })\r
+                                    Break\r
+                                }\r
+                                ElseIf ((_T_1 == 0x02))\r
+                                {\r
+                                    Return (Zero)\r
+                                    Break\r
+                                }\r
+                                ElseIf ((_T_1 == 0x03))\r
+                                {\r
+                                    Return (One)\r
+                                    Break\r
+                                }\r
+                                ElseIf ((_T_1 == 0x04))\r
+                                {\r
+                                    Return (0x02)\r
+                                    Break\r
+                                }\r
+                                Else\r
+                                {\r
+                                    Return (Buffer (One)\r
+                                    {\r
+                                         0x00                                             // .\r
+                                    })\r
+                                    Break\r
+                                }\r
+\r
+                                Break\r
                             }\r
                         }\r
-                    }, \r
+                        ElseIf ((_T_0 == ToUUID ("a9a82a56-95a1-4b4a-b014-3be47df1b7d5")))\r
+                        {\r
+                            While (One)\r
+                            {\r
+                                Name (_T_3, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                _T_3 = ToInteger (Arg1)\r
+                                If ((_T_3 == One))\r
+                                {\r
+                                    While (One)\r
+                                    {\r
+                                        Name (_T_4, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                        _T_4 = ToInteger (Arg2)\r
+                                        If ((_T_4 == One))\r
+                                        {\r
+                                            ADBG ("MOD1+")\r
+                                            \_SB.URS0.USB0.MOD1 = One\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x01                                             // .\r
+                                            })\r
+                                        }\r
+                                        ElseIf ((_T_4 == Zero))\r
+                                        {\r
+                                            ADBG ("MOD1-")\r
+                                            \_SB.URS0.USB0.MOD1 = Zero\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x01                                             // .\r
+                                            })\r
+                                        }\r
+                                        Else\r
+                                        {\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x00                                             // .\r
+                                            })\r
+                                        }\r
 \r
-                    Package (0x03)\r
+                                        Break\r
+                                    }\r
+                                }\r
+                                Else\r
+                                {\r
+                                    Return (Buffer (One)\r
+                                    {\r
+                                         0x00                                             // .\r
+                                    })\r
+                                }\r
+\r
+                                Break\r
+                            }\r
+                        }\r
+                        Else\r
+                        {\r
+                            Return (Buffer (One)\r
+                            {\r
+                                 0x00                                             // .\r
+                            })\r
+                            Break\r
+                        }\r
+\r
+                        Break\r
+                    }\r
+                }\r
+\r
+                Method (PHYC, 0, NotSerialized)\r
+                {\r
+                    Name (CFG0, Package (0x01)\r
                     {\r
-                        "COMPONENT", \r
-                        One, \r
-                        Package (0x05)\r
+                        Package (0x03)\r
                         {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
                             Zero, \r
-                            "DMA_CLK", \r
-                            Package (0x05)\r
+                            0x088E2198, \r
+                            0x20\r
+                        }\r
+                    })\r
+                    Return (CFG0) /* \_SB_.URS0.USB0.PHYC.CFG0 */\r
+                }\r
+\r
+                Device (RHUB)\r
+                {\r
+                    Name (_ADR, Zero)  // _ADR: Address\r
+                    Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
+                    {\r
+                        While (One)\r
+                        {\r
+                            Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x23C34600, \r
-                                0x0BEBC200\r
+                                 0x00                                             // .\r
+                            })\r
+                            CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.URS0.USB0.RHUB._DSM._T_0 */\r
+                            If ((_T_0 == ToUUID ("a9a82a56-95a1-4b4a-b014-3be47df1b7d5")))\r
+                            {\r
+                                While (One)\r
+                                {\r
+                                    Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                    _T_1 = ToInteger (Arg1)\r
+                                    If ((_T_1 == One))\r
+                                    {\r
+                                        While (One)\r
+                                        {\r
+                                            Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                            _T_2 = ToInteger (Arg2)\r
+                                            If ((_T_2 == One))\r
+                                            {\r
+                                                ADBG ("MOD1++")\r
+                                                \_SB.URS0.USB0.MOD1 = One\r
+                                                Return (Buffer (One)\r
+                                                {\r
+                                                     0x01                                             // .\r
+                                                })\r
+                                            }\r
+                                            ElseIf ((_T_2 == Zero))\r
+                                            {\r
+                                                ADBG ("MOD1--")\r
+                                                \_SB.URS0.USB0.MOD1 = Zero\r
+                                                Return (Buffer (One)\r
+                                                {\r
+                                                     0x01                                             // .\r
+                                                })\r
+                                            }\r
+                                            Else\r
+                                            {\r
+                                                Return (Buffer (One)\r
+                                                {\r
+                                                     0x00                                             // .\r
+                                                })\r
+                                            }\r
+\r
+                                            Break\r
+                                        }\r
+                                    }\r
+                                    Else\r
+                                    {\r
+                                        Return (Buffer (One)\r
+                                        {\r
+                                             0x00                                             // .\r
+                                        })\r
+                                    }\r
+\r
+                                    Break\r
+                                }\r
+                            }\r
+                            Else\r
+                            {\r
+                                Return (Buffer (One)\r
+                                {\r
+                                     0x00                                             // .\r
+                                })\r
+                                Break\r
                             }\r
+\r
+                            Break\r
                         }\r
                     }\r
-                })\r
-                Return (EBUF) /* \_SB_.JPGE.PERF.EBUF */\r
+                }\r
             }\r
-        }\r
 \r
-        Device (VFE0)\r
-        {\r
-            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
-            {\r
-                \_SB.MMU0, \r
-                \_SB.PEP0, \r
-                \_SB.CAMP\r
-            })\r
-            Name (_HID, "QCOM0243")  // _HID: Hardware ID\r
-            Name (_UID, 0x16)  // _UID: Unique ID\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Device (UFN0)\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Name (_ADR, One)  // _ADR: Address\r
+                Name (_S0W, 0x03)  // _S0W: S0 Device Wake State\r
+                Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device\r
+                {\r
+                    ToPLD (\r
+                        PLD_Revision           = 0x2,\r
+                        PLD_IgnoreColor        = 0x1,\r
+                        PLD_Red                = 0x0,\r
+                        PLD_Green              = 0x0,\r
+                        PLD_Blue               = 0x0,\r
+                        PLD_Width              = 0x0,\r
+                        PLD_Height             = 0x0,\r
+                        PLD_UserVisible        = 0x1,\r
+                        PLD_Dock               = 0x0,\r
+                        PLD_Lid                = 0x0,\r
+                        PLD_Panel              = "BACK",\r
+                        PLD_VerticalPosition   = "CENTER",\r
+                        PLD_HorizontalPosition = "LEFT",\r
+                        PLD_Shape              = "VERTICALRECTANGLE",\r
+                        PLD_GroupOrientation   = 0x0,\r
+                        PLD_GroupToken         = 0x0,\r
+                        PLD_GroupPosition      = 0x1,\r
+                        PLD_Bay                = 0x0,\r
+                        PLD_Ejectable          = 0x0,\r
+                        PLD_EjectRequired      = 0x0,\r
+                        PLD_CabinetNumber      = 0x0,\r
+                        PLD_CardCageNumber     = 0x0,\r
+                        PLD_Reference          = 0x0,\r
+                        PLD_Rotation           = 0x0,\r
+                        PLD_Order              = 0x0,\r
+                        PLD_VerticalOffset     = 0xFFFF,\r
+                        PLD_HorizontalOffset   = 0xFFFF)\r
+\r
+                })\r
+                Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities\r
                 {\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC00000,         // Address Base\r
-                        0x00020000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC48000,         // Address Base\r
-                        0x00001000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC5A000,         // Address Base\r
-                        0x00004000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0AC6B000,         // Address Base\r
-                        0x00001000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadOnly,\r
-                        0x0AC6F000,         // Address Base\r
-                        0x00008000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadOnly,\r
-                        0x0AC87000,         // Address Base\r
-                        0x0000A000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadOnly,\r
-                        0x0AC91000,         // Address Base\r
-                        0x0000A000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0ACAF000,         // Address Base\r
-                        0x00005000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0ACB6000,         // Address Base\r
-                        0x00005000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x0ACC4000,         // Address Base\r
-                        0x00005000,         // Address Length\r
-                        )\r
-                    Memory32Fixed (ReadWrite,\r
-                        0x8BF00000,         // Address Base\r
-                        0x00500000,         // Address Length\r
-                        )\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001ED,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001EF,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001F1,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001F3,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001F5,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001EE,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
-                    {\r
-                        0x000001F0,\r
-                    }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
+                    One, \r
+                    0x09, \r
+                    Zero, \r
+                    Zero\r
+                })\r
+                Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings\r
+                {\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r
                     {\r
-                        0x000001F2,\r
+                        0x000000A5,\r
                     }\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, )\r
+                    Interrupt (ResourceConsumer, Level, ActiveHigh, SharedAndWake, ,, )\r
                     {\r
-                        0x000001F4,\r
+                        0x000000A2,\r
                     }\r
                 })\r
-                Return (RBUF) /* \_SB_.VFE0._CRS.RBUF */\r
-            }\r
+                Method (CCVL, 0, NotSerialized)\r
+                {\r
+                    Return (\_SB.CCST)\r
+                }\r
 \r
-            Method (PERF, 0, NotSerialized)\r
-            {\r
-                Name (EBUF, Package (0x08)\r
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
                 {\r
-                    Package (0x05)\r
+                    While (One)\r
                     {\r
-                        "COMPONENT", \r
-                        Zero, \r
-                        Package (0x05)\r
+                        Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r
                         {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "IFE0_CLK", \r
-                            Package (0x06)\r
+                             0x00                                             // .\r
+                        })\r
+                        CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.URS0.UFN0._DSM._T_0 */\r
+                        If ((_T_0 == ToUUID ("fe56cfeb-49d5-4378-a8a2-2978dbe54ad2")))\r
+                        {\r
+                            While (One)\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x1C9C3800, \r
-                                0x18148D00, \r
-                                Zero\r
-                            }\r
-                        }, \r
+                                Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                _T_1 = ToInteger (Arg2)\r
+                                If ((_T_1 == Zero))\r
+                                {\r
+                                    While (One)\r
+                                    {\r
+                                        Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                        _T_2 = ToInteger (Arg1)\r
+                                        If ((_T_2 == Zero))\r
+                                        {\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x03                                             // .\r
+                                            })\r
+                                            Break\r
+                                        }\r
+                                        Else\r
+                                        {\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x01                                             // .\r
+                                            })\r
+                                            Break\r
+                                        }\r
 \r
-                        Package (0x05)\r
+                                        Break\r
+                                    }\r
+\r
+                                    Return (Buffer (One)\r
+                                    {\r
+                                         0x00                                             // .\r
+                                    })\r
+                                    Break\r
+                                }\r
+                                ElseIf ((_T_1 == One))\r
+                                {\r
+                                    Return (0x20)\r
+                                    Break\r
+                                }\r
+                                Else\r
+                                {\r
+                                    Return (Buffer (One)\r
+                                    {\r
+                                         0x00                                             // .\r
+                                    })\r
+                                    Break\r
+                                }\r
+\r
+                                Break\r
+                            }\r
+                        }\r
+                        ElseIf ((_T_0 == ToUUID ("18de299f-9476-4fc9-b43b-8aeb713ed751")))\r
                         {\r
-                            "PSTATE_SET", \r
-                            One, \r
-                            One, \r
-                            "HF0_UNCOMP_BANDWIDTH", \r
-                            Package (0x20)\r
+                            While (One)\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x00000008D8F9FC00, \r
-                                0x0000000826299E00, \r
-                                0x0000000684EE1800, \r
-                                0x000000055AE82600, \r
-                                0x00000004A817C800, \r
-                                0x00000003B9ACA000, \r
-                                0x0000000342770C00, \r
-                                0x00000002CB417800, \r
-                                0xEE6B2800, \r
-                                0xD09DC300, \r
-                                0xC4B20100, \r
-                                0xB8C63F00, \r
-                                0xACDA7D00, \r
-                                0xA0EEBB00, \r
-                                0x9502F900, \r
-                                0x89173700, \r
-                                0x7D2B7500, \r
-                                0x713FB300, \r
-                                0x6553F100, \r
-                                0x59682F00, \r
-                                0x4D7C6D00, \r
-                                0x4190AB00, \r
-                                0x35A4E900, \r
-                                0x29B92700, \r
-                                0x1DCD6500, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
-                            }\r
-                        }, \r
+                                Name (_T_3, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                _T_3 = ToInteger (Arg2)\r
+                                If ((_T_3 == Zero))\r
+                                {\r
+                                    While (One)\r
+                                    {\r
+                                        Name (_T_4, 0x00)  // _T_x: Emitted by ASL Compiler\r
+                                        _T_4 = ToInteger (Arg1)\r
+                                        If ((_T_4 == Zero))\r
+                                        {\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x03                                             // .\r
+                                            })\r
+                                            Break\r
+                                        }\r
+                                        Else\r
+                                        {\r
+                                            Return (Buffer (One)\r
+                                            {\r
+                                                 0x01                                             // .\r
+                                            })\r
+                                            Break\r
+                                        }\r
 \r
-                        Package (0x05)\r
+                                        Break\r
+                                    }\r
+\r
+                                    Return (Buffer (One)\r
+                                    {\r
+                                         0x00                                             // .\r
+                                    })\r
+                                    Break\r
+                                }\r
+                                ElseIf ((_T_3 == One))\r
+                                {\r
+                                    Return (0x39)\r
+                                    Break\r
+                                }\r
+                                Else\r
+                                {\r
+                                    Return (Buffer (One)\r
+                                    {\r
+                                         0x00                                             // .\r
+                                    })\r
+                                    Break\r
+                                }\r
+\r
+                                Break\r
+                            }\r
+                        }\r
+                        Else\r
                         {\r
-                            "PSTATE_SET", \r
-                            0x02, \r
-                            One, \r
-                            "HF0_BANDWIDTH", \r
-                            Package (0x20)\r
+                            Return (Buffer (One)\r
                             {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x00000008D8F9FC00, \r
-                                0x0000000826299E00, \r
-                                0x0000000684EE1800, \r
-                                0x000000055AE82600, \r
-                                0x00000004A817C800, \r
-                                0x00000003B9ACA000, \r
-                                0x0000000342770C00, \r
-                                0x00000002CB417800, \r
-                                0xEE6B2800, \r
-                                0xD09DC300, \r
-                                0xC4B20100, \r
-                                0xB8C63F00, \r
-                                0xACDA7D00, \r
-                                0xA0EEBB00, \r
-                                0x9502F900, \r
-                                0x89173700, \r
-                                0x7D2B7500, \r
-                                0x713FB300, \r
-                                0x6553F100, \r
-                                0x59682F00, \r
-                                0x4D7C6D00, \r
-                                0x4190AB00, \r
-                                0x35A4E900, \r
-                                0x29B92700, \r
-                                0x1DCD6500, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
-                            }\r
+                                 0x00                                             // .\r
+                            })\r
+                            Break\r
                         }\r
-                    }, \r
 \r
-                    Package (0x05)\r
+                        Break\r
+                    }\r
+                }\r
+\r
+                Method (PHYC, 0, NotSerialized)\r
+                {\r
+                    Name (CFG0, Package (0x12)\r
                     {\r
-                        "COMPONENT", \r
-                        One, \r
-                        Package (0x05)\r
+                        /*Package (0x03)\r
                         {\r
-                            "PSTATE_SET", \r
                             Zero, \r
-                            Zero, \r
-                            "IFE1_CLK", \r
-                            Package (0x06)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x1C9C3800, \r
-                                0x18148D00, \r
-                                Zero\r
-                            }\r
-                        }, \r
+                            0x088E2198, \r
+                            0x20\r
+                        }*/\r
+                        \r
+                                               Package (0x03) { Zero, 0x088E2210, 0x23 },\r
+                                               Package (0x03) { Zero, 0x088E2004, 0x03 },\r
+                                               Package (0x03) { Zero, 0x088E218c, 0x7c },\r
+                                               Package (0x03) { Zero, 0x088E202c, 0x80 },\r
+                                               Package (0x03) { Zero, 0x088E2184, 0x0a },\r
+                                               Package (0x03) { Zero, 0x088E20b4, 0x19 },\r
+                                               Package (0x03) { Zero, 0x088E2194, 0x40 },\r
+                                               Package (0x03) { Zero, 0x088E2198, 0x28 },\r
+                                               Package (0x03) { Zero, 0x088E2214, 0x21 },\r
+                                               Package (0x03) { Zero, 0x088E2220, 0x00 },\r
+                                               Package (0x03) { Zero, 0x088E2224, 0x58 },\r
+                                               Package (0x03) { Zero, 0x088E2240, 0x35 },\r
+                                               Package (0x03) { Zero, 0x088E2244, 0x29 },\r
+                                               Package (0x03) { Zero, 0x088E2248, 0xca },\r
+                                               Package (0x03) { Zero, 0x088E224c, 0x04 },\r
+                                               Package (0x03) { Zero, 0x088E2250, 0x03 },\r
+                                               Package (0x03) { Zero, 0x088E223c, 0x00 },\r
+                                               Package (0x03) { Zero, 0x088E2210, 0x22 }\r
+                    })\r
+                    Return (CFG0) /* \_SB_.URS0.UFN0.PHYC.CFG0 */\r
+                }\r
+            }\r
+        }\r
 \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            One, \r
-                            One, \r
-                            "HF1_UNCOMP_BANDWIDTH", \r
-                            Package (0x20)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x00000008D8F9FC00, \r
-                                0x0000000826299E00, \r
-                                0x0000000684EE1800, \r
-                                0x000000055AE82600, \r
-                                0x00000004A817C800, \r
-                                0x00000003B9ACA000, \r
-                                0x0000000342770C00, \r
-                                0x00000002CB417800, \r
-                                0xEE6B2800, \r
-                                0xD09DC300, \r
-                                0xC4B20100, \r
-                                0xB8C63F00, \r
-                                0xACDA7D00, \r
-                                0xA0EEBB00, \r
-                                0x9502F900, \r
-                                0x89173700, \r
-                                0x7D2B7500, \r
-                                0x713FB300, \r
-                                0x6553F100, \r
-                                0x59682F00, \r
-                                0x4D7C6D00, \r
-                                0x4190AB00, \r
-                                0x35A4E900, \r
-                                0x29B92700, \r
-                                0x1DCD6500, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
-                            }\r
-                        }, \r
 \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            0x02, \r
-                            One, \r
-                            "HF1_BANDWIDTH", \r
-                            Package (0x20)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x00000008D8F9FC00, \r
-                                0x0000000826299E00, \r
-                                0x0000000684EE1800, \r
-                                0x000000055AE82600, \r
-                                0x00000004A817C800, \r
-                                0x00000003B9ACA000, \r
-                                0x0000000342770C00, \r
-                                0x00000002CB417800, \r
-                                0xEE6B2800, \r
-                                0xD09DC300, \r
-                                0xC4B20100, \r
-                                0xB8C63F00, \r
-                                0xACDA7D00, \r
-                                0xA0EEBB00, \r
-                                0x9502F900, \r
-                                0x89173700, \r
-                                0x7D2B7500, \r
-                                0x713FB300, \r
-                                0x6553F100, \r
-                                0x59682F00, \r
-                                0x4D7C6D00, \r
-                                0x4190AB00, \r
-                                0x35A4E900, \r
-                                0x29B92700, \r
-                                0x1DCD6500, \r
-                                0x17D78400, \r
-                                0x11E1A300, \r
-                                0x0BEBC200, \r
-                                0x05F5E100, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
 \r
-                    Package (0x03)\r
-                    {\r
-                        "COMPONENT", \r
-                        0x02, \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "IFE_LITE_CLK", \r
-                            Package (0x06)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x1C9C3800, \r
-                                0x18148D00, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
+        Name (HPDB, Zero)\r
+        Name (PINA, Zero)\r
+        Name (CCST, Buffer (One)\r
+        {\r
+             0x02                                             // .\r
+        })\r
+        Name (HSFL, Buffer (One)\r
+        {\r
+             0x00                                             // .\r
+        })\r
+        Name (HPDS, Zero)\r
+        Name (USBC, Buffer (One)\r
+        {\r
+             0x0B                                             // .\r
+        })\r
 \r
-                    Package (0x03)\r
-                    {\r
-                        "COMPONENT", \r
-                        0x03, \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "ICP_CLK", \r
-                            Package (0x05)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x17D78400, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
+               Name (DPPN, 0x0D)\r
+        Name (MUXC, Buffer (One)\r
+        {\r
+             0x00                                             // .\r
+        })\r
 \r
-                    Package (0x04)\r
-                    {\r
-                        "COMPONENT", \r
-                        0x04, \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "IPE0_CLK", \r
-                            Package (0x06)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x1C9C3800, \r
-                                0x18148D00, \r
-                                Zero\r
-                            }\r
-                        }, \r
 \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            One, \r
-                            Zero, \r
-                            "IPE1_CLK", \r
-                            Package (0x06)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x1C9C3800, \r
-                                0x18148D00, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
 \r
-                    Package (0x03)\r
-                    {\r
-                        "COMPONENT", \r
-                        0x05, \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "BPS_CLK", \r
-                            Package (0x06)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x1C9C3800, \r
-                                0x18148D00, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
+        Name (DPP1, Buffer (One)\r
+        {\r
+             0x00                                             // .\r
+        })\r
+        Name (SKYD, Buffer (One)\r
+        {\r
+             0x01                                             // .\r
+        })\r
 \r
-                    Package (0x03)\r
-                    {\r
-                        "COMPONENT", \r
-                        0x06, \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "LRME_CLK", \r
-                            Package (0x06)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x17D78400, \r
-                                0x1312D000, \r
-                                0x10089D40, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }, \r
 \r
-                    Package (0x03)\r
-                    {\r
-                        "COMPONENT", \r
-                        0x07, \r
-                        Package (0x05)\r
-                        {\r
-                            "PSTATE_SET", \r
-                            Zero, \r
-                            Zero, \r
-                            "FD_CLK", \r
-                            Package (0x06)\r
-                            {\r
-                                "PSTATE", \r
-                                Zero, \r
-                                0x23C34600, \r
-                                0x20113A80, \r
-                                0x17D78400, \r
-                                Zero\r
-                            }\r
-                        }\r
-                    }\r
+\r
+\r
+        Device (AGR0)\r
+        {\r
+            Name (_HID, "ACPI000C" /* Processor Aggregator Device */)  // _HID: Hardware ID\r
+            Name (_PUR, Package (0x02)  // _PUR: Processor Utilization Request\r
+            {\r
+                One, \r
+                Zero\r
+            })\r
+            Method (_OST, 3, NotSerialized)  // _OST: OSPM Status Indication\r
+            {\r
+                \_SB.PEP0.ROST = Arg2\r
+            }\r
+        }\r
+\r
+        ThermalZone (TZ0)\r
+        {\r
+            Name (_HID, "QCOM02B0")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x04)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.SYSM.CLUS.CPU0, \r
+                \_SB.SYSM.CLUS.CPU1, \r
+                \_SB.SYSM.CLUS.CPU2, \r
+                \_SB.SYSM.CLUS.CPU3\r
+            })\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
+                {\r
+                    \_SB.PEP0\r
                 })\r
-                Return (EBUF) /* \_SB_.VFE0.PERF.EBUF */\r
             }\r
         }\r
 \r
-        Scope (\_SB)\r
+        ThermalZone (TZ1)\r
         {\r
-            Name (GRST, Zero)\r
+            Name (_HID, "QCOM02B0")  // _HID: Hardware ID\r
+            Name (_UID, One)  // _UID: Unique ID\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.PEP0\r
+            })\r
+            Name (TPSV, 0x0EF6)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ1.TPSV)\r
+            }\r
+\r
+            Name (_MTL, 0x14)  // _MTL: Minimum Throttle Limit\r
+            Name (TTC1, Zero)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ1.TTC1)\r
+            }\r
+\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ1.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ1.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
+                {\r
+                    \_SB.PEP0\r
+                })\r
+            }\r
         }\r
 \r
-        // Qualcomm Sensor Collection\r
-        Device (SEN2)\r
+        ThermalZone (TZ2)\r
         {\r
-            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
+            Name (_HID, "QCOM02B1")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x04)  // _TZD: Thermal Zone Devices\r
             {\r
-                \_SB.IPC0, \r
-                \_SB.SCSS, \r
-                \_SB.ARPC\r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7\r
             })\r
-            Name (_HID, "QCOM0308")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_CID, "QCOM02A2")  // _CID: Compatible ID\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
+                {\r
+                    \_SB.PEP0\r
+                })\r
+            }\r
         }\r
 \r
-        Device (ALS1)\r
+        ThermalZone (TZ3)\r
         {\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_HID, "SAM0204")  // _HID: Hardware ID\r
+            Name (_HID, "QCOM02B1")  // _HID: Hardware ID\r
             Name (_UID, One)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
             {\r
-                \_SB.I2C3\r
+                \_SB.PEP0\r
             })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Name (TPSV, 0x0EF6)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
             {\r
-                Return (0x0F)\r
+                Return (\_SB.TZ3.TPSV)\r
             }\r
 \r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Name (TTC1, Zero)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Return (\_SB.TZ3.TTC1)\r
+            }\r
+\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ3.TTC2)\r
+            }\r
+\r
+            Name (TTSP, One)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ3.TTSP)\r
+            }\r
+\r
+            Name (_MTL, 0x14)  // _MTL: Minimum Throttle Limit\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
                 {\r
-                    I2cSerialBusV2 (0x0029, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.I2C3",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
+                    \_SB.PEP0\r
                 })\r
-                Return (RBUF) /* \_SB_.ALS1._CRS.RBUF */\r
             }\r
+        }\r
 \r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
+        ThermalZone (TZ20)\r
+        {\r
+            Name (_HID, "QCOM02AB")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.GPU0\r
+            })\r
+            Name (TPSV, 0x0E60)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ20.TPSV)\r
+            }\r
+\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ20.TTC1)\r
+            }\r
+\r
+            Name (TTC2, 0x02)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
             {\r
-                If ((Arg0 == ToUUID ("518808e9-2eb8-42d3-b5e3-b135f94343c9")))\r
+                Return (\_SB.TZ20.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x02)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ20.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
                 {\r
-                    If ((Arg2 == Zero))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x03                                             // .\r
-                        })\r
-                    }\r
+                    \_SB.PEP0\r
+                })\r
+            }\r
+        }\r
 \r
-                    If ((Arg2 == One))\r
-                    {\r
-                        Return (Buffer (0xEC)\r
-                        {\r
-                            /* 0000 */  0x80, 0x13, 0x81, 0xDA, 0x82, 0x00, 0x83, 0x00,  // ........\r
-                            /* 0008 */  0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x02,  // ........\r
-                            /* 0010 */  0xFF, 0xFF, 0xFF, 0xFF, 0x05, 0x00, 0x00, 0x00,  // ........\r
-                            /* 0018 */  0x01, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00,  // ........\r
-                            /* 0020 */  0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,  // .... ...\r
-                            /* 0028 */  0x06, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00,  // ....(...\r
-                            /* 0030 */  0x0A, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00,  // ....2...\r
-                            /* 0038 */  0x13, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00,  // ....<...\r
-                            /* 0040 */  0x25, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00,  // %...F...\r
-                            /* 0048 */  0x47, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00,  // G...P...\r
-                            /* 0050 */  0x88, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00,  // ....Z...\r
-                            /* 0058 */  0x04, 0x01, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00,  // ....d...\r
-                            /* 0060 */  0xF4, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0068 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0070 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xA9, 0xF1, 0x3E,  // .......>\r
-                            /* 0078 */  0x7B, 0x14, 0xA2, 0x40, 0x52, 0xB8, 0x02, 0x41,  // {..@R..A\r
-                            /* 0080 */  0x52, 0xB8, 0x3E, 0x3F, 0x17, 0xD9, 0x16, 0x40,  // R.>?...@\r
-                            /* 0088 */  0x1F, 0x85, 0x1B, 0x40, 0x21, 0xB0, 0x82, 0x3F,  // ...@!..?\r
-                            /* 0090 */  0xB0, 0x72, 0xB8, 0x3F, 0x5E, 0xBA, 0x99, 0x3F,  // .r.?^..?\r
-                            /* 0098 */  0x00, 0x00, 0x60, 0x40, 0x08, 0xAC, 0x9C, 0x3E,  // ..`@...>\r
-                            /* 00A0 */  0x0E, 0x2D, 0xB2, 0x3D, 0xFF, 0xFF, 0xFF, 0xFF,  // .-.=....\r
-                            /* 00A8 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00B0 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00B8 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00C0 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00C8 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00D0 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00D8 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00E0 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 00E8 */  0xFF, 0xFF, 0xFF, 0xFF                           // ....\r
-                        })\r
-                    }\r
-                }\r
-                Else\r
+        ThermalZone (TZ21)\r
+        {\r
+            Name (_HID, "QCOM02AC")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.GPU0\r
+            })\r
+            Name (TPSV, 0x0E60)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ21.TPSV)\r
+            }\r
+\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ21.TTC1)\r
+            }\r
+\r
+            Name (TTC2, 0x02)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ21.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x02)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ21.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
                 {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
+                    \_SB.PEP0\r
+                })\r
             }\r
         }\r
 \r
-        Device (SAR1)\r
+\r
+\r
+        ThermalZone (TZ33)\r
         {\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_HID, "SAM0207")  // _HID: Hardware ID\r
+            Name (_HID, "QCOM02CB")  // _HID: Hardware ID\r
             Name (_UID, One)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
             {\r
-                \_SB.I2C5\r
+                \_SB.AMSS\r
             })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Name (TPSV, 0x0E60)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
             {\r
-                Return (0x0F)\r
+                Return (\_SB.TZ33.TPSV)\r
             }\r
 \r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Return (\_SB.TZ33.TTC1)\r
+            }\r
+\r
+            Name (TTC2, 0x02)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ33.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x0A)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ33.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
                 {\r
-                    I2cSerialBusV2 (0x002C, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.I2C5",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
-                    GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0054\r
-                        }\r
+                    \_SB.PEP0\r
                 })\r
-                Return (RBUF) /* \_SB_.SAR1._CRS.RBUF */\r
             }\r
+        }\r
 \r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
+        ThermalZone (TZ36)\r
+        {\r
+            Name (_HID, "QCOM029E")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x09)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.SYSM.CLUS.CPU0, \r
+                \_SB.SYSM.CLUS.CPU1, \r
+                \_SB.SYSM.CLUS.CPU2, \r
+                \_SB.SYSM.CLUS.CPU3, \r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7, \r
+                \_SB.PMBM\r
+            })\r
+            Name (TPSV, 0x0EC4)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ36.TPSV)\r
+            }\r
+\r
+            Name (TTC1, 0x04)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ36.TTC1)\r
+            }\r
+\r
+            Name (TTC2, 0x03)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ36.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ36.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
             {\r
-                If ((Arg0 == ToUUID ("37305404-87d8-4117-b665-c877ec1ce7db")))\r
+                Return (Package (0x02)\r
                 {\r
-                    If ((Arg2 == Zero))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x3F                                             // ?\r
-                        })\r
-                    }\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
+            }\r
+        }\r
 \r
-                    If ((Arg2 == One))\r
-                    {\r
-                        Return (Buffer (0x40)\r
-                        {\r
-                            /* 0000 */  0x10, 0x0F, 0x05, 0x60, 0x11, 0x28, 0x27, 0x07,  // ...`.('.\r
-                            /* 0008 */  0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, 0x04,  // (.).*.+.\r
-                            /* 0010 */  0x31, 0x09, 0x33, 0x20, 0x35, 0x14, 0x36, 0x08,  // 1.3 5.6.\r
-                            /* 0018 */  0x37, 0x1A, 0x4A, 0x40, 0x4D, 0x04, 0x06, 0x00,  // 7.J@M...\r
-                            /* 0020 */  0x07, 0x80, 0x2D, 0x08, 0xFF, 0xFF, 0xFF, 0xFF,  // ..-.....\r
-                            /* 0028 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0030 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0038 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF   // ........\r
-                        })\r
-                    }\r
+        ThermalZone (TZ37)\r
+        {\r
+            Name (_HID, "QCOM029E")  // _HID: Hardware ID\r
+            Name (_UID, One)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x02)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.PEP0, \r
+                \_SB.PMBM\r
+            })\r
+            Name (TPSV, 0x0F8C)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ37.TPSV)\r
+            }\r
 \r
-                    If ((Arg2 == 0x02))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x01                                             // .\r
-                        })\r
-                    }\r
+            Name (TCRT, 0x1054)\r
+            Method (_CRT, 0, NotSerialized)  // _CRT: Critical Temperature\r
+            {\r
+                Return (\_SB.TZ37.TCRT)\r
+            }\r
 \r
-                    If ((Arg2 == 0x03))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_0 = ToInteger (\_SB.GRST)\r
-                            If ((_T_0 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Name (TTC1, 0x04)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ37.TTC1)\r
+            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+            Name (TTC2, 0x03)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ37.TTC2)\r
+            }\r
 \r
-                    If ((Arg2 == 0x04))\r
-                    {\r
-                        ADBG ("Grip1 WORKING!")\r
-                        \_SB.GRST |= One\r
-                        While (One)\r
-                        {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_1 = ToInteger (\_SB.GRST)\r
-                            If ((_T_1 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ37.TTSP)\r
+            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
+                {\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
+            }\r
+        }\r
 \r
-                    If ((Arg2 == 0x05))\r
-                    {\r
-                        ADBG ("Grip1 RELEASE!")\r
-                        \_SB.GRST &= ~One\r
-                        While (One)\r
-                        {\r
-                            Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_2 = ToInteger (\_SB.GRST)\r
-                            If ((_T_2 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+        ThermalZone (TZ38)\r
+        {\r
+            Name (_HID, "QCOM029E")  // _HID: Hardware ID\r
+            Name (_UID, 0x02)  // _UID: Unique ID\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.PEP0\r
+            })\r
+            Method (INVT, 0, NotSerialized)\r
+            {\r
+                Return (One)\r
+            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+            Method (_MTL, 0, NotSerialized)  // _MTL: Minimum Throttle Limit\r
+            {\r
+                Return (0x3C)\r
+            }\r
 \r
-                    If ((Arg2 == 0x06))\r
-                    {\r
-                        ADBG ("Disp ON by Grip1")\r
-                        ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                        If ((\_SB.GRST == Zero))\r
-                        {\r
-                            ADBG ("GRST is Already 0")\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x00                                             // .\r
-                            })\r
-                        }\r
-                        Else\r
-                        {\r
-                            \_SB.GRST = Zero\r
-                            ADBG ("Set GRST to 0")\r
-                            ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                            ADBG ("LID Close noti")\r
-                            \_SB.LID0.LIDB = Zero\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            ADBG ("Grip1 Sleep 500")\r
-                            Sleep (0x01F4)\r
-                            ADBG ("LID Open noti")\r
-                            \_SB.LID0.LIDB = One\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x01                                             // .\r
-                            })\r
-                        }\r
-                    }\r
-                }\r
-                Else\r
+            Name (TPSV, 0x0B0E)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ38.TPSV)\r
+            }\r
+\r
+            Name (TTC1, 0x04)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ38.TTC1)\r
+            }\r
+\r
+            Name (TTC2, 0x03)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ38.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x0A)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ38.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
                 {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
             }\r
         }\r
 \r
-        Device (SAR2)\r
+        ThermalZone (TZ40)\r
         {\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_HID, "SAM0207")  // _HID: Hardware ID\r
-            Name (_UID, 0x02)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_HID, "QCOM02AF")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
             {\r
-                \_SB.IC11\r
+                \_SB.COEX\r
             })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Name (TPSV, 0x0DFC)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
             {\r
-                Return (0x0F)\r
+                Return (\_SB.TZ40.TPSV)\r
             }\r
 \r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Return (\_SB.TZ40.TTC1)\r
+            }\r
+\r
+            Name (TTC2, 0x05)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ40.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x1E)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ40.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
                 {\r
-                    I2cSerialBusV2 (0x0028, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.IC11",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
-                    GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x004F\r
-                        }\r
+                    \_SB.PEP0\r
                 })\r
-                Return (RBUF) /* \_SB_.SAR2._CRS.RBUF */\r
             }\r
+        }\r
 \r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
+        ThermalZone (TZ41)\r
+        {\r
+            Name (_HID, "QCOM0295")  // _HID: Hardware ID\r
+            Name (_UID, One)  // _UID: Unique ID\r
+            Name (_TSP, 0x32)  // _TSP: Thermal Sampling Period\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+        }\r
+\r
+        ThermalZone (TZ44)\r
+        {\r
+            Name (_HID, "QCOM02CC")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x04)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7\r
+            })\r
+            Name (TPSV, 0x0E60)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ44.TPSV)\r
+            }\r
+\r
+            Name (TTC1, Zero)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ44.TTC1)\r
+            }\r
+\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
             {\r
-                If ((Arg0 == ToUUID ("37305404-87d8-4117-b665-c877ec1ce7db")))\r
+                Return (\_SB.TZ44.TTC2)\r
+            }\r
+\r
+            Name (TTSP, One)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ44.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
                 {\r
-                    If ((Arg2 == Zero))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x3F                                             // ?\r
-                        })\r
-                    }\r
+                    \_SB.PEP0\r
+                })\r
+            }\r
+        }\r
 \r
-                    If ((Arg2 == One))\r
-                    {\r
-                        Return (Buffer (0x40)\r
-                        {\r
-                            /* 0000 */  0x10, 0x16, 0x05, 0x60, 0x11, 0x28, 0x27, 0x07,  // ...`.('.\r
-                            /* 0008 */  0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, 0x04,  // (.).*.+.\r
-                            /* 0010 */  0x33, 0x20, 0x35, 0x14, 0x36, 0x08, 0x37, 0x28,  // 3 5.6.7(\r
-                            /* 0018 */  0x4A, 0x40, 0x4D, 0x04, 0x06, 0x00, 0x07, 0x80,  // J@M.....\r
-                            /* 0020 */  0x2D, 0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // -.......\r
-                            /* 0028 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0030 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0038 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF   // ........\r
-                        })\r
-                    }\r
+        ThermalZone (TZ99)\r
+        {\r
+            Name (_HID, "QCOM02B2")  // _HID: Hardware ID\r
+            Name (_UID, 0x64)  // _UID: Unique ID\r
+            Name (TCRT, 0x0EF6)\r
+            Method (_CRT, 0, NotSerialized)  // _CRT: Critical Temperature\r
+            {\r
+                Return (\_SB.TZ99.TCRT)\r
+            }\r
 \r
-                    If ((Arg2 == 0x02))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x02                                             // .\r
-                        })\r
-                    }\r
+            Name (TTC1, 0x04)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ99.TTC1)\r
+            }\r
 \r
-                    If ((Arg2 == 0x03))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_0 = ToInteger (\_SB.GRST)\r
-                            If ((_T_0 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Name (TTC2, 0x03)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ99.TTC2)\r
+            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+            Name (TTSP, 0x0A)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ99.TTSP)\r
+            }\r
 \r
-                    If ((Arg2 == 0x04))\r
-                    {\r
-                        ADBG ("Grip2 WORKING!")\r
-                        \_SB.GRST |= 0x02\r
-                        While (One)\r
-                        {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_1 = ToInteger (\_SB.GRST)\r
-                            If ((_T_1 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (One)\r
+                {\r
+                    \_SB.PEP0\r
+                })\r
+            }\r
+        }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+        ThermalZone (TZ4)\r
+        {\r
+            Name (_HID, "QCOM0299")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x0A)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.SYSM.CLUS.CPU0, \r
+                \_SB.SYSM.CLUS.CPU1, \r
+                \_SB.SYSM.CLUS.CPU2, \r
+                \_SB.SYSM.CLUS.CPU3, \r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7, \r
+                \_SB.GPU0.MON0, \r
+                \_SB.GPU0\r
+            })\r
+            Name (TPSV, 0x0E92)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ4.TPSV)\r
+            }\r
 \r
-                    If ((Arg2 == 0x05))\r
-                    {\r
-                        ADBG ("Grip2 RELEASE!")\r
-                        \_SB.GRST &= ~0x02\r
-                        While (One)\r
-                        {\r
-                            Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_2 = ToInteger (\_SB.GRST)\r
-                            If ((_T_2 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ4.TTC1)\r
+            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ4.TTC2)\r
+            }\r
 \r
-                    If ((Arg2 == 0x06))\r
-                    {\r
-                        ADBG ("Disp ON by Grip2")\r
-                        ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                        If ((\_SB.GRST == Zero))\r
-                        {\r
-                            ADBG ("GRST is Already 0")\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x00                                             // .\r
-                            })\r
-                        }\r
-                        Else\r
-                        {\r
-                            \_SB.GRST = Zero\r
-                            ADBG ("Set GRST to 0")\r
-                            ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                            ADBG ("LID Close noti")\r
-                            \_SB.LID0.LIDB = Zero\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            ADBG ("Grip2 Sleep 500")\r
-                            Sleep (0x01F4)\r
-                            ADBG ("LID Open noti")\r
-                            \_SB.LID0.LIDB = One\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x01                                             // .\r
-                            })\r
-                        }\r
-                    }\r
-                }\r
-                Else\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ4.TTSP)\r
+            }\r
+\r
+            Name (_MTL, 0x19)  // _MTL: Minimum Throttle Limit\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
                 {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
             }\r
         }\r
 \r
-        Device (SAR3)\r
+        ThermalZone (TZ5)\r
         {\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_HID, "SAM0207")  // _HID: Hardware ID\r
-            Name (_UID, 0x03)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_HID, "QCOM029A")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x08)  // _TZD: Thermal Zone Devices\r
             {\r
-                \_SB.I2C5\r
+                \_SB.SYSM.CLUS.CPU0, \r
+                \_SB.SYSM.CLUS.CPU1, \r
+                \_SB.SYSM.CLUS.CPU2, \r
+                \_SB.SYSM.CLUS.CPU3, \r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7\r
             })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Name (TPSV, 0x0E92)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
             {\r
-                Return (0x0F)\r
+                Return (\_SB.TZ5.TPSV)\r
             }\r
 \r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Return (\_SB.TZ5.TTC1)\r
+            }\r
+\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ5.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ5.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
                 {\r
-                    I2cSerialBusV2 (0x0028, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.I2C5",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
-                    GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0073\r
-                        }\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
                 })\r
-                Return (RBUF) /* \_SB_.SAR3._CRS.RBUF */\r
             }\r
+        }\r
 \r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
+        ThermalZone (TZ6)\r
+        {\r
+            Name (_HID, "QCOM029B")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (One)  // _TZD: Thermal Zone Devices\r
             {\r
-                If ((Arg0 == ToUUID ("37305404-87d8-4117-b665-c877ec1ce7db")))\r
+                \_SB.COEX\r
+            })\r
+            Name (TPSV, 0x0E92)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ6.TPSV)\r
+            }\r
+\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ6.TTC1)\r
+            }\r
+\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ6.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ6.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
                 {\r
-                    If ((Arg2 == Zero))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x3F                                             // ?\r
-                        })\r
-                    }\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
+            }\r
+        }\r
 \r
-                    If ((Arg2 == One))\r
-                    {\r
-                        Return (Buffer (0x40)\r
-                        {\r
-                            /* 0000 */  0x10, 0x16, 0x05, 0x60, 0x11, 0x28, 0x27, 0x7F,  // ...`.('.\r
-                            /* 0008 */  0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, 0x04,  // (.).*.+.\r
-                            /* 0010 */  0x33, 0x20, 0x35, 0x14, 0x36, 0x08, 0x37, 0x1D,  // 3 5.6.7.\r
-                            /* 0018 */  0x4A, 0x40, 0x4D, 0x04, 0x06, 0x00, 0x07, 0x80,  // J@M.....\r
-                            /* 0020 */  0x2D, 0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // -.......\r
-                            /* 0028 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0030 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0038 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF   // ........\r
-                        })\r
-                    }\r
+        ThermalZone (TZ7)\r
+        {\r
+            Name (_HID, "QCOM029C")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x08)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.SYSM.CLUS.CPU0, \r
+                \_SB.SYSM.CLUS.CPU1, \r
+                \_SB.SYSM.CLUS.CPU2, \r
+                \_SB.SYSM.CLUS.CPU3, \r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7\r
+            })\r
+            Name (TCRT, 0x0DCA)\r
+            Method (_CRT, 0, NotSerialized)  // _CRT: Critical Temperature\r
+            {\r
+                Return (\_SB.TZ7.TCRT)\r
+            }\r
 \r
-                    If ((Arg2 == 0x02))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x03                                             // .\r
-                        })\r
-                    }\r
+            Name (TPSV, 0x0DC0)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ7.TPSV)\r
+            }\r
 \r
-                    If ((Arg2 == 0x03))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_0 = ToInteger (\_SB.GRST)\r
-                            If ((_T_0 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ7.TTC1)\r
+            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ7.TTC2)\r
+            }\r
 \r
-                    If ((Arg2 == 0x04))\r
-                    {\r
-                        ADBG ("Grip3 WORKING!")\r
-                        \_SB.GRST |= 0x04\r
-                        While (One)\r
-                        {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_1 = ToInteger (\_SB.GRST)\r
-                            If ((_T_1 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ7.TTSP)\r
+            }\r
 \r
-                            Break\r
-                        }\r
-                    }\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
+                {\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
+            }\r
+        }\r
 \r
-                    If ((Arg2 == 0x05))\r
-                    {\r
-                        ADBG ("Grip3 RELEASE!")\r
-                        \_SB.GRST &= ~0x04\r
-                        While (One)\r
-                        {\r
-                            Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_2 = ToInteger (\_SB.GRST)\r
-                            If ((_T_2 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+        ThermalZone (TZ8)\r
+        {\r
+            Name (_HID, "QCOM029D")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x0A)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.SYSM.CLUS.CPU0, \r
+                \_SB.SYSM.CLUS.CPU1, \r
+                \_SB.SYSM.CLUS.CPU2, \r
+                \_SB.SYSM.CLUS.CPU3, \r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7, \r
+                \_SB.GPU0.MON0, \r
+                \_SB.GPU0\r
+            })\r
+            Name (TPSV, 0x0E92)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ8.TPSV)\r
+            }\r
+\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ8.TTC1)\r
+            }\r
+\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ8.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ8.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Name (_MTL, 0x19)  // _MTL: Minimum Throttle Limit\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
+                {\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
+            }\r
+        }\r
+\r
+        ThermalZone (TZ9)\r
+        {\r
+            Name (_HID, "QCOM029F")  // _HID: Hardware ID\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Name (_TZD, Package (0x0A)  // _TZD: Thermal Zone Devices\r
+            {\r
+                \_SB.SYSM.CLUS.CPU0, \r
+                \_SB.SYSM.CLUS.CPU1, \r
+                \_SB.SYSM.CLUS.CPU2, \r
+                \_SB.SYSM.CLUS.CPU3, \r
+                \_SB.SYSM.CLUS.CPU4, \r
+                \_SB.SYSM.CLUS.CPU5, \r
+                \_SB.SYSM.CLUS.CPU6, \r
+                \_SB.SYSM.CLUS.CPU7, \r
+                \_SB.GPU0.MON0, \r
+                \_SB.GPU0\r
+            })\r
+            Name (TPSV, 0x0E92)\r
+            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
+            {\r
+                Return (\_SB.TZ9.TPSV)\r
+            }\r
+\r
+            Name (TTC1, One)\r
+            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
+            {\r
+                Return (\_SB.TZ9.TTC1)\r
+            }\r
+\r
+            Name (TTC2, One)\r
+            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
+            {\r
+                Return (\_SB.TZ9.TTC2)\r
+            }\r
+\r
+            Name (TTSP, 0x32)\r
+            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
+            {\r
+                Return (\_SB.TZ9.TTSP)\r
+            }\r
+\r
+            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
+            Name (_MTL, 0x19)  // _MTL: Minimum Throttle Limit\r
+            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
+            {\r
+                Return (Package (0x02)\r
+                {\r
+                    \_SB.PEP0, \r
+                    \_SB.ADC1\r
+                })\r
+            }\r
+        }\r
+\r
+        Name (HWNH, Zero)\r
+        Name (HWNL, Zero)\r
+        Device (HWN1)\r
+        {\r
+            Name (_HID, "QCOM02A9")  // _HID: Hardware ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            {\r
+                If ((\_SB.HWNH == Zero))\r
+                {\r
+                    Return (Zero)\r
+                }\r
+                Else\r
+                {\r
+                    Return (0x0F)\r
+                }\r
+            }\r
 \r
-                            Break\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
+            {\r
+                \_SB.PMIC\r
+            })\r
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            {\r
+                Name (RBUF, ResourceTemplate ()\r
+                {\r
+                    GpioInt (Level, ActiveHigh, Exclusive, PullNone, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x0190\r
                         }\r
-                    }\r
+                })\r
+                Return (RBUF) /* \_SB_.HWN1._CRS.RBUF */\r
+            }\r
 \r
-                    If ((Arg2 == 0x06))\r
-                    {\r
-                        ADBG ("Disp ON by Grip3")\r
-                        ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                        If ((\_SB.GRST == Zero))\r
-                        {\r
-                            ADBG ("GRST is Already 0")\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x00                                             // .\r
-                            })\r
-                        }\r
-                        Else\r
-                        {\r
-                            \_SB.GRST = Zero\r
-                            ADBG ("Set GRST to 0")\r
-                            ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                            ADBG ("LID Close noti")\r
-                            \_SB.LID0.LIDB = Zero\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            ADBG ("Grip3 Sleep 500")\r
-                            Sleep (0x01F4)\r
-                            ADBG ("LID Open noti")\r
-                            \_SB.LID0.LIDB = One\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x01                                             // .\r
-                            })\r
-                        }\r
-                    }\r
+            Method (HAPI, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x03)\r
+                {\r
+                    One, \r
+                    One, \r
+                    One\r
+                })\r
+                Return (CFG0) /* \_SB_.HWN1.HAPI.CFG0 */\r
+            }\r
+\r
+            Method (HAPC, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x16)\r
+                {\r
+                    Zero, \r
+                    0x0984, \r
+                    Zero, \r
+                    One, \r
+                    One, \r
+                    One, \r
+                    One, \r
+                    Zero, \r
+                    0x04, \r
+                    One, \r
+                    0x03, \r
+                    0x14, \r
+                    One, \r
+                    0x03, \r
+                    Zero, \r
+                    Zero, \r
+                    0x06, \r
+                    Zero, \r
+                    Zero, \r
+                    0x0535, \r
+                    0x03, \r
+                    One\r
+                })\r
+                Return (CFG0) /* \_SB_.HWN1.HAPC.CFG0 */\r
+            }\r
+        }\r
+\r
+        Device (HWN0)\r
+        {\r
+            Name (_HID, "QCOM02A8")  // _HID: Hardware ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            {\r
+                If ((\_SB.HWNL == Zero))\r
+                {\r
+                    Return (Zero)\r
                 }\r
                 Else\r
                 {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
+                    Return (0x0F)\r
                 }\r
             }\r
+\r
+            Method (HWNL, 0, NotSerialized)\r
+            {\r
+                Name (CFG0, Package (0x10)\r
+                {\r
+                    One, \r
+                    0x03, \r
+                    0x019B, \r
+                    0x14, \r
+                    0x20, \r
+                    0x02, \r
+                    0x40, \r
+                    0x03, \r
+                    0x80, \r
+                    0x04, \r
+                    One, \r
+                    One, \r
+                    One, \r
+                    0x03, \r
+                    One, \r
+                    One\r
+                })\r
+                Return (CFG0) /* \_SB_.HWN0.HWNL.CFG0 */\r
+            }\r
+        }\r
+\r
+        Device (CONT)\r
+        {\r
+            Name (_HID, "CONT1234")  // _HID: Hardware ID\r
+            Name (_CID, "PNP0C60" /* Display Sensor Device */)  // _CID: Compatible ID\r
         }\r
 \r
-        Device (SAR4)\r
+        Device (POWR)\r
         {\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_HID, "SAM0207")  // _HID: Hardware ID\r
-            Name (_UID, 0x04)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_HID, "POWR1234")  // _HID: Hardware ID\r
+            Name (_CID, "PNP0C40" /* Standard Button Controller */)  // _CID: Compatible ID\r
+        }\r
+\r
+        Device (SVBI)\r
+        {\r
+            Name (_HID, "SAMM0901")  // _HID: Hardware ID\r
+            Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
+        }\r
+\r
+        Device (TSC1)\r
+        {\r
+            Name (_HID, "MSHW1003")  // _HID: Hardware ID\r
+            Name (_UID, One)  // _UID: Unique ID\r
+            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
             {\r
-                \_SB.IC11\r
+                \_SB.PEP0,\r
+                \_SB.GIO0, \r
+                \_SB.IC13\r
             })\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                Return (0x0F)\r
-            }\r
-\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
                 Name (RBUF, ResourceTemplate ()\r
                 {\r
-                    I2cSerialBusV2 (0x002C, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.IC11",\r
+                    I2cSerialBusV2 (0x0020, ControllerInitiated, 0x00061A80,\r
+                        AddressingMode7Bit, "\\_SB.IC13",\r
                         0x00, ResourceConsumer, , Exclusive,\r
                         )\r
-                    GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
+                    GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullUp, 0x0000,\r
+                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x007D\r
+                        }\r
+                    GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
                         "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
                         )\r
                         {   // Pin list\r
-                            0x0079\r
+                            0x0063\r
                         }\r
                 })\r
-                Return (RBUF) /* \_SB_.SAR4._CRS.RBUF */\r
+                Return (RBUF) /* \_SB_.TSC1._CRS.RBUF */\r
             }\r
 \r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
+            /*Method (INFO, 0, NotSerialized)\r
             {\r
-                If ((Arg0 == ToUUID ("37305404-87d8-4117-b665-c877ec1ce7db")))\r
+                Name (RBUF, Buffer (0x04)\r
                 {\r
-                    If ((Arg2 == Zero))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x3F                                             // ?\r
-                        })\r
-                    }\r
+                     0x0F, 0x01, 0x00, 0x00                           // ....\r
+                })\r
+                Return (RBUF)\r
+            }*/\r
 \r
-                    If ((Arg2 == One))\r
-                    {\r
-                        Return (Buffer (0x40)\r
-                        {\r
-                            /* 0000 */  0x10, 0x0F, 0x05, 0x60, 0x11, 0x28, 0x27, 0x07,  // ...`.('.\r
-                            /* 0008 */  0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, 0x04,  // (.).*.+.\r
-                            /* 0010 */  0x33, 0x20, 0x35, 0x14, 0x36, 0x08, 0x37, 0x1A,  // 3 5.6.7.\r
-                            /* 0018 */  0x4A, 0x40, 0x4D, 0x04, 0x06, 0x00, 0x07, 0x80,  // J@M.....\r
-                            /* 0020 */  0x2D, 0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // -.......\r
-                            /* 0028 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0030 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,  // ........\r
-                            /* 0038 */  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF   // ........\r
-                        })\r
-                    }\r
+            Name (PGID, Buffer (0x0A)\r
+            {\r
+                "\\_SB.TSC1"\r
+            })\r
+            Name (DBUF, Buffer (DBFL){})\r
+            CreateByteField (DBUF, Zero, STAT)\r
+            CreateByteField (DBUF, 0x02, DVAL)\r
+            CreateField (DBUF, 0x18, 0xA0, DEID)\r
+            Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State\r
+            {\r
+                Return (0x03)\r
+            }\r
 \r
-                    If ((Arg2 == 0x02))\r
-                    {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x04                                             // .\r
-                        })\r
-                    }\r
+            Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State\r
+            {\r
+                Return (0x03)\r
+            }\r
 \r
-                    If ((Arg2 == 0x03))\r
-                    {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_0, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_0 = ToInteger (\_SB.GRST)\r
-                            If ((_T_0 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_0 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+            Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State\r
+            {\r
+                Return (0x03)\r
+            }\r
 \r
-                            Break\r
+            Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0\r
+            {\r
+                DEID = Buffer (ESNL){}\r
+                DVAL = Zero\r
+                DEID = PGID /* \_SB_.TSC1.PGID */\r
+                If (\_SB.ABD.AVBL)\r
+                {\r
+                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.TSC1.DBUF */\r
+                }\r
+            }\r
+\r
+            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3\r
+            {\r
+                DEID = Buffer (ESNL){}\r
+                DVAL = 0x03\r
+                DEID = PGID /* \_SB_.TSC1.PGID */\r
+                If (\_SB.ABD.AVBL)\r
+                {\r
+                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.TSC1.DBUF */\r
+                }\r
+            }\r
+        }\r
+\r
+\r
+\r
+        Device (BTNS)\r
+        {\r
+            Name (_HID, "ACPI0011" /* Generic Buttons Device */)  // _HID: Hardware ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            {\r
+                Name (RBUF, ResourceTemplate ()\r
+                {\r
+                    GpioInt (Edge, ActiveBoth, Exclusive, PullDown, 0x0010,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x0000\r
                         }\r
-                    }\r
+                    GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullUp, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x0085\r
+                        }\r
+                    GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullDown, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        )\r
+                        {   // Pin list\r
+                            0x0084\r
+                        }\r
+                })\r
+                Return (RBUF) /* \_SB_.BTNS._CRS.RBUF */\r
+            }\r
 \r
-                    If ((Arg2 == 0x04))\r
+            Name (_DSD, Package (0x02)  // _DSD: Device-Specific Data\r
+            {\r
+                ToUUID ("fa6bd625-9ce8-470d-a2c7-b3ca36c4282e"), \r
+                Package (0x06)\r
+                {\r
+                    Package (0x05)\r
                     {\r
-                        ADBG ("Grip4 WORKING!")\r
-                        \_SB.GRST |= 0x08\r
-                        While (One)\r
-                        {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_1 = ToInteger (\_SB.GRST)\r
-                            If ((_T_1 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_1 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+                        Zero, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        0x0D\r
+                    }, \r
 \r
-                            Break\r
-                        }\r
-                    }\r
+                    Package (0x05)\r
+                    {\r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        0x81\r
+                    }, \r
 \r
-                    If ((Arg2 == 0x05))\r
+                    Package (0x05)\r
                     {\r
-                        ADBG ("Grip4 RELEASE!")\r
-                        \_SB.GRST &= ~0x08\r
-                        While (One)\r
-                        {\r
-                            Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_2 = ToInteger (\_SB.GRST)\r
-                            If ((_T_2 == Zero))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x00                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == One))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x01                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x02))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x02                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x03))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x03                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x04))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x04                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x05))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x05                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x06))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x06                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x07))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x07                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x08))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x08                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x09))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x09                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0A))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0A                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0B))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0B                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0C))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0C                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0D))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0D                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0E))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0E                                             // .\r
-                                })\r
-                            }\r
-                            ElseIf ((_T_2 == 0x0F))\r
-                            {\r
-                                Return (Buffer (0x04)\r
-                                {\r
-                                     0x0F                                             // .\r
-                                })\r
-                            }\r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x0C, \r
+                        0xE9\r
+                    }, \r
 \r
-                            Break\r
-                        }\r
-                    }\r
+                    Package (0x05)\r
+                    {\r
+                        One, \r
+                        0x02, \r
+                        One, \r
+                        0x0C, \r
+                        0xEA\r
+                    }, \r
+\r
+                    Package (0x05)\r
+                    {\r
+                        One, \r
+                        0x03, \r
+                        One, \r
+                        0x90, \r
+                        0x20\r
+                    }, \r
 \r
-                    If ((Arg2 == 0x06))\r
+                    Package (0x05)\r
                     {\r
-                        ADBG ("Disp ON by Grip4")\r
-                        ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                        If ((\_SB.GRST == Zero))\r
-                        {\r
-                            ADBG ("GRST is Already 0")\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x00                                             // .\r
-                            })\r
-                        }\r
-                        Else\r
-                        {\r
-                            \_SB.GRST = Zero\r
-                            ADBG ("Set GRST to 0")\r
-                            ADBG (Concatenate ("GRST: ", ToHexString (\_SB.GRST)))\r
-                            ADBG ("LID Close noti")\r
-                            \_SB.LID0.LIDB = Zero\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            ADBG ("Grip4 Sleep 500")\r
-                            Sleep (0x01F4)\r
-                            ADBG ("LID Open noti")\r
-                            \_SB.LID0.LIDB = One\r
-                            Notify (\_SB.LID0, 0x80) // Status Change\r
-                            Return (Buffer (One)\r
-                            {\r
-                                 0x01                                             // .\r
-                            })\r
-                        }\r
+                        One, \r
+                        0x04, \r
+                        One, \r
+                        0x90, \r
+                        0x21\r
                     }\r
                 }\r
-                Else\r
-                {\r
-                    Return (Buffer (One)\r
-                    {\r
-                         0x00                                             // .\r
-                    })\r
-                }\r
-            }\r
+            })\r
         }\r
 \r
-        Device (LED1)\r
+        Device (QDCI)\r
         {\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_HID, "SAM0608")  // _HID: Hardware ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
+            Name (_DEP, Package (One)  // _DEP: Dependencies\r
+            {\r
+                \_SB.GLNK\r
+            })\r
+            Name (_HID, "QCOM0224")  // _HID: Hardware ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+        }\r
+\r
+        Device (BTH0)\r
+        {\r
+            Name (_HID, "QCOM02B5")  // _HID: Hardware ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
+            {\r
+                \_SB.PEP0, \r
+                \_SB.PMIC, \r
+                \_SB.UAR7\r
+            })\r
+            Name (_PRW, Package (0x02)  // _PRW: Power Resources for Wake\r
             {\r
-                \_SB.I2C3\r
+                Zero, \r
+                Zero\r
             })\r
+            Name (_S4W, 0x02)  // _S4W: S4 Device Wake State\r
+            Name (_S0W, 0x02)  // _S0W: S0 Device Wake State\r
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
+            {\r
+                Name(PBUF, Buffer(0x22)\r
+                {\r
+       0x8e, 0x1d, 0x00, 0x01, 0x00, 0x03, 0x02, 0x35, 0x00, 0x01, 0x0a, 0x00,\r
+       0x00, 0xc2, 0x01, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0xc0, 0x5c, 0x5f,\r
+       0x53, 0x42, 0x2e, 0x55, 0x41, 0x52, 0x37, 0x00, 0x79, 0x00\r
+                })\r
+                Return(PBUF)\r
+            }\r
+\r
             Method (_STA, 0, NotSerialized)  // _STA: Status\r
             {\r
                 Return (0x0F)\r
             }\r
+        }\r
 \r
+#if 0\r
+        Device (ADC1)\r
+        {\r
+            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
+            {\r
+                \_SB.SPMI, \r
+                \_SB.PMIC\r
+            })\r
+            //Name (_HID, "QCOM0221")  // _HID: Hardware ID\r
+            Name (_HID, "MEOW0221")  // _HID: Hardware ID\r
+            Alias (\_SB.PSUB, _SUB)\r
+            Name (_UID, Zero)  // _UID: Unique ID\r
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
             {\r
-                Name (RBUF, ResourceTemplate ()\r
+                Name (INTB, ResourceTemplate ()\r
                 {\r
-                    I2cSerialBusV2 (0x0030, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.I2C3",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
+                    GpioInt (Edge, ActiveHigh, ExclusiveAndWake, PullUp, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        RawDataBuffer (0x01)  // Vendor Data\r
+                        {\r
+                            0x02\r
+                        })\r
+                        {   // Pin list\r
+                            0x0020\r
+                        }\r
+                    GpioInt (Edge, ActiveHigh, ExclusiveAndWake, PullUp, 0x0000,\r
+                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
+                        RawDataBuffer (0x01)  // Vendor Data\r
+                        {\r
+                            0x02\r
+                        })\r
+                        {   // Pin list\r
+                            0x0028\r
+                        }\r
                 })\r
-                Return (RBUF) /* \_SB_.LED1._CRS.RBUF */\r
-            }\r
-\r
-            Name (LEDR, Zero)\r
-            Method (RLED, 2, Serialized)\r
-            {\r
-                If ((Arg1 == One))\r
+                Name (NAM, Buffer (0x0A)\r
                 {\r
-                    LEDR |= Arg0\r
-                }\r
-                Else\r
+                    "\\_SB.SPMI"\r
+                })\r
+                Name (VUSR, Buffer (0x0C)\r
                 {\r
-                    Local0 = ~Arg0\r
-                    LEDR &= Local0\r
-                }\r
-\r
-                ADBG (Concatenate ("LEDR=", ToHexString (LEDR)))\r
-                Notify (\_SB.LED1, 0x80) // Status Change\r
+                    /* 0000 */  0x8E, 0x13, 0x00, 0x01, 0x00, 0xC1, 0x02, 0x00,  // ........\r
+                    /* 0008 */  0x31, 0x01, 0x00, 0x00                           // 1...\r
+                })\r
+                Name (VBTM, Buffer (0x0C)\r
+                {\r
+                    /* 0000 */  0x8E, 0x13, 0x00, 0x01, 0x00, 0xC1, 0x02, 0x00,  // ........\r
+                    /* 0008 */  0x34, 0x01, 0x00, 0x00                           // 4...\r
+                })\r
+                Name(END, Buffer() {0x79, 0x00})\r
+                Concatenate (VUSR, NAM, Local1)\r
+                Concatenate (VBTM, NAM, Local2)\r
+                Concatenate (Local1, Local2, Local3)\r
+                Concatenate (Local3, INTB, Local0)\r
+                Return (Local0)\r
             }\r
 \r
-            Method (GLED, 0, NotSerialized)\r
+            Method (ADDV, 0, NotSerialized)\r
             {\r
-                Return (LEDR) /* \_SB_.LED1.LEDR */\r
+                Return (Package (0x03)\r
+                {\r
+                    One, \r
+                    One, \r
+                    Zero\r
+                })\r
             }\r
 \r
-            Method (SLED, 1, NotSerialized)\r
+            Method (GENP, 0, NotSerialized)\r
             {\r
-                LEDR = Arg0\r
-                Return (Zero)\r
+                Return (Package (0x0A)\r
+                {\r
+                    Zero, \r
+                    0x4000, \r
+                    0x001C9C38, \r
+                    0x0007A120, \r
+                    0x11, \r
+                    Zero, \r
+                    Zero, \r
+                    0x0300, \r
+                    0x0100, \r
+                    0x08\r
+                })\r
             }\r
 \r
-            Name (RGBC, Zero)\r
-            Method (GLCR, 0, NotSerialized)\r
+            Method (PTCF, 1, NotSerialized)\r
             {\r
-                RGBC |= 0x06\r
-                RGBC |= 0x0200\r
-                RGBC |= 0x00170000\r
-                Return (RGBC) /* \_SB_.LED1.RGBC */\r
+                Local0 = (Arg0 >> One)\r
+                Local0 -= 0x00042B08\r
+                Return (Local0)\r
             }\r
-        }\r
 \r
-        Device (LID0)\r
-        {\r
-            Name (_HID, "PNP0C0D" /* Lid Device */)  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (LIDB, One)\r
-            Method (_LID, 0, NotSerialized)  // _LID: Lid Status\r
+            Method (PTCI, 1, NotSerialized)\r
             {\r
-                Return (LIDB) /* \_SB_.LID0.LIDB */\r
+                Local0 = (Arg0 + 0x00042B08)\r
+                Local0 <<= One\r
+                Return (Local0)\r
             }\r
-        }\r
 \r
-        Method (ADDR, 0, NotSerialized)\r
-        {\r
-            If ((\_SB.SVMJ == One))\r
+            Method (VGIO, 0, NotSerialized)\r
             {\r
-                Return (0x0390B000)\r
+                Return (Package (0x08)\r
+                {\r
+                    Package (0x02)\r
+                    {\r
+                        0x08, \r
+                        Buffer (0x04)\r
+                        {\r
+                             0x12, 0x32, 0x52, 0x72                           // .2Rr\r
+                        }\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x09, \r
+                        Buffer (0x04)\r
+                        {\r
+                             0x13, 0x33, 0x53, 0x73                           // .3Ss\r
+                        }\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0A, \r
+                        Buffer (0x04)\r
+                        {\r
+                             0x14, 0x34, 0x54, 0x74                           // .4Tt\r
+                        }\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0B, \r
+                        Buffer (0x04)\r
+                        {\r
+                             0x15, 0x35, 0x55, 0x75                           // .5Uu\r
+                        }\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0C, \r
+                        Buffer (0x04)\r
+                        {\r
+                             0x16, 0x36, 0x56, 0x76                           // .6Vv\r
+                        }\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x15, \r
+                        Buffer (0x05)\r
+                        {\r
+                             0x17, 0x37, 0x57, 0x77, 0x97                     // .7Ww.\r
+                        }\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x16, \r
+                        Buffer (0x05)\r
+                        {\r
+                             0x18, 0x38, 0x58, 0x78, 0x98                     // .8Xx.\r
+                        }\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x17, \r
+                        Buffer (0x05)\r
+                        {\r
+                             0x19, 0x39, 0x59, 0x79, 0x99                     // .9Yy.\r
+                        }\r
+                    }\r
+                })\r
             }\r
-            ElseIf ((\_SB.SVMJ == 0x02))\r
+\r
+            Method (VTGN, 0, NotSerialized)\r
             {\r
-                Return (0x0350B000)\r
+                Return (Package (0x09)\r
+                {\r
+                    0x02, \r
+                    0x02, \r
+                    0x4000, \r
+                    0x001C9C38, \r
+                    Zero, \r
+                    Zero, \r
+                    0x0300, \r
+                    0x0100, \r
+                    0x08\r
+                })\r
             }\r
-        }\r
-\r
-        OperationRegion (NM11, SystemMemory, ADDR (), 0x14)\r
-        Field (NM11, DWordAcc, NoLock, Preserve)\r
-        {\r
-            PI1C,   32, \r
-            PIN1,   32, \r
-            PI1N,   32, \r
-            PI1S,   32, \r
-            PI1L,   32\r
-        }\r
-\r
-        Method (_MID, 0, Serialized)\r
-        {\r
-            Name (NMID, Zero)\r
-            NMID = PIN1 /* \_SB_.PIN1 */\r
-            Return (NMID) /* \_SB_._MID.NMID */\r
-        }\r
 \r
-        Scope (\_SB)\r
-        {\r
-            Device (SAMO)\r
+            Method (GENF, 0, NotSerialized)\r
             {\r
-                Name (_HID, "SAM0101")  // _HID: Hardware ID\r
-                Name (_CID, "SAM0101")  // _CID: Compatible ID\r
-                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                Name (_UID, Zero)  // _UID: Unique ID\r
-                Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
+                Return (Package (0x0D)\r
                 {\r
-                    \_SB.I2C4, \r
-                    \_SB.GIO0\r
+                    0xFFFFFFE2, \r
+                    0x61, \r
+                    0xFFFFFFCE, \r
+                    0xA0, \r
+                    0x03FF, \r
+                    0x002625A0, \r
+                    0x01F4, \r
+                    0x04, \r
+                    0x0334, \r
+                    0x004C4B40, \r
+                    0x02, \r
+                    One, \r
+                    0x0D\r
                 })\r
-                Name (AVBL, Zero)\r
-                Method (_REG, 2, NotSerialized)  // _REG: Region Availability\r
+            }\r
+\r
+            Method (FCHN, 0, NotSerialized)\r
+            {\r
+                Return (Package (0x0C)\r
                 {\r
-                    If ((Arg0 == 0x9A))\r
+                    Package (0x08)\r
+                    {\r
+                        "BATT_ID_OHMS", \r
+                        One, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "BATT_ID_OHMS_FRESH", \r
+                        0x02, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "BATT_THERM", \r
+                        0x06, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        0x03, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "AUX_THERM", \r
+                        0x07, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        0x03, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "SKIN_THERM", \r
+                        Zero, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        0x03, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "PMIC_TEMP2", \r
+                        0x0C, \r
+                        One, \r
+                        Zero, \r
+                        0x03, \r
+                        0x02, \r
+                        0x02, \r
+                        FGDT\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "CHG_TEMP", \r
+                        0x0D, \r
+                        One, \r
+                        Zero, \r
+                        0x03, \r
+                        0x02, \r
+                        0x02, \r
+                        FGCT\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "USB_IN", \r
+                        0x08, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        0x08, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "USB_IN_I", \r
+                        0x09, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        0x04, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "DC_IN", \r
+                        0x0A, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        0x08, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
+                    {\r
+                        "DC_IN_I", \r
+                        0x0B, \r
+                        One, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        0x04, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x08)\r
                     {\r
-                        ^AVBL = Arg1\r
+                        "FG_GPIO", \r
+                        0x0E, \r
+                        Zero, \r
+                        Zero, \r
+                        One, \r
+                        0x02, \r
+                        Zero, \r
+                        Zero\r
                     }\r
-                }\r
+                })\r
+            }\r
 \r
-                Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Method (FGDT, 0, NotSerialized)\r
+            {\r
+                Return (Package (0x02)\r
                 {\r
-                    Local0 = 0x0F\r
-                    Return (Local0)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x01C2, \r
+                        0xFFFF3CB0\r
+                    }, \r
 \r
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-                {\r
-                    Name (RBUF, ResourceTemplate ()\r
+                    Package (0x02)\r
                     {\r
-                        I2cSerialBusV2 (0x002C, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.I2C4",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        GpioInt (Edge, ActiveHigh, Exclusive, PullNone, 0x1388,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x001D\r
-                            }\r
-                    })\r
-                    Return (RBUF) /* \_SB_.SAMO._CRS.RBUF */\r
-                }\r
+                        0x0366, \r
+                        0x00027100\r
+                    }\r
+                })\r
             }\r
-        }\r
 \r
-        Scope (\_SB.SAMO)\r
-        {\r
-            OperationRegion (SMOP, 0x9A, Zero, One)\r
-            Field (SMOP, ByteAcc, Lock, Preserve)\r
+            Method (FGCT, 0, NotSerialized)\r
             {\r
-                BRLV,   8\r
+                Return (Package (0x02)\r
+                {\r
+                    Package (0x02)\r
+                    {\r
+                        0x0633, \r
+                        0xFFFF3CB0\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0318, \r
+                        0x00027100\r
+                    }\r
+                })\r
             }\r
         }\r
 \r
-#if 0\r
-        Scope (\_SB)\r
+        Scope (\_SB.ADC1)\r
         {\r
-            Device (SAFI)\r
+            Method (CHAN, 0, NotSerialized)\r
             {\r
-                Name (_HID, "SAM0701")  // _HID: Hardware ID\r
-                Name (_CID, "SAM0701")  // _CID: Compatible ID\r
-                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                Name (_DDN, "Samsung Firmware Interface")  // _DDN: DOS Device Name\r
-                Name (_UID, One)  // _UID: Unique ID\r
-                Name (AVBL, Zero)\r
-                Method (_REG, 2, NotSerialized)  // _REG: Region Availability\r
+                Return (Package (0x0C)\r
                 {\r
-                    If ((Arg0 == 0x9F))\r
+                    Package (0x0D)\r
                     {\r
-                        ^AVBL = Arg1\r
-                    }\r
-                }\r
-\r
-                Method (_STA, 0, NotSerialized)  // _STA: Status\r
-                {\r
-                    Local0 = 0x0F\r
-                    Return (Local0)\r
-                }\r
-\r
-                OperationRegion (ECM2, 0x9F, Zero, 0x38)\r
-                Field (ECM2, ByteAcc, Lock, Preserve)\r
-                {\r
-                    ELG0,   8, \r
-                    ELG1,   8, \r
-                    ELG2,   8, \r
-                    ELG3,   8, \r
-                    ELG4,   8, \r
-                    ELG5,   8, \r
-                    ELG6,   8, \r
-                    ELG7,   8, \r
-                    ELG8,   8, \r
-                    ELG9,   8, \r
-                    AAAA,   128, \r
-                    MADD,   32, \r
-                    MVAL,   32\r
-                }\r
+                        "VPH_PWR", \r
+                        0x83, \r
+                        Zero, \r
+                        Zero, \r
+                        0x02, \r
+                        0x02, \r
+                        One, \r
+                        0x03, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Method (OPID, 0, NotSerialized)\r
-                {\r
-                    Local0 = One\r
-                    Return (0x9F)\r
-                }\r
+                    Package (0x0D)\r
+                    {\r
+                        "VCOIN", \r
+                        0x85, \r
+                        Zero, \r
+                        Zero, \r
+                        0x02, \r
+                        0x02, \r
+                        One, \r
+                        0x03, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Method (GCAP, 0, NotSerialized)\r
-                {\r
-                    Local0 = Zero\r
-                    Return (Local0)\r
-                }\r
+                    Package (0x0D)\r
+                    {\r
+                        "PMIC_THERM", \r
+                        0x06, \r
+                        Zero, \r
+                        Zero, \r
+                        0x02, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0x02\r
+                    }, \r
 \r
-                Method (PCAP, 1, NotSerialized)\r
-                {\r
-                    Return (Zero)\r
-                }\r
+                    Package (0x0D)\r
+                    {\r
+                        "XO_THERM", \r
+                        0x4C, \r
+                        0x08, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        XTTB, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Method (PRNT, 1, Serialized)\r
-                {\r
-                    If ((\_SB.SAFI.AVBL == One))\r
+                    Package (0x0D)\r
                     {\r
-                        AAAA = Arg0\r
-                        Notify (\_SB.SAFI, 0x89) // Device-Specific\r
-                    }\r
-                }\r
+                        "XO_THERM_GPS", \r
+                        0x4C, \r
+                        0x08, \r
+                        0x02, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        XTTB, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Method (SABM, 0, Serialized)\r
-                {\r
-                    Return (Zero)\r
-                }\r
+                    Package (0x0D)\r
+                    {\r
+                        "SYS_THERM1", \r
+                        0x4D, \r
+                        One, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Event (DSEV)\r
-                Method (DSBB, 1, Serialized)\r
-                {\r
-                    Return (Zero)\r
-                }\r
+                    Package (0x0D)\r
+                    {\r
+                        "SYS_THERM2", \r
+                        0x50, \r
+                        One, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Method (DSBE, 0, Serialized)\r
-                {\r
-                    Return (Zero)\r
-                }\r
+                    Package (0x0D)\r
+                    {\r
+                        "PA_THERM", \r
+                        0x52, \r
+                        One, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Method (CHTY, 0, Serialized)\r
-                {\r
-                    Local0 = \_SB.EMEC.CHTY\r
-                    Return (Local0)\r
-                }\r
+                    Package (0x0D)\r
+                    {\r
+                        "PA_THERM1", \r
+                        0x56, \r
+                        One, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                Name (UCNP, Package (0x04)\r
-                {\r
-                    Zero, \r
-                    Zero, \r
-                    Zero, \r
-                    Zero\r
-                })\r
-                Method (TRSD, 1, NotSerialized)\r
-                {\r
-                    Name (RBUF, Package (0x04)\r
+                    Package (0x0D)\r
                     {\r
-                        0x70, \r
+                        "SYS_THERM3", \r
+                        0x55, \r
+                        One, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
                         Zero, \r
-                        0x70, \r
                         Zero\r
-                    })\r
-                    Return (RBUF) /* \_SB_.SAFI.TRSD.RBUF */\r
-                }\r
+                    }, \r
 \r
-                Method (GUCN, 1, Serialized)\r
-                {\r
-                    If ((\_SB.EMEC.AVBL == One))\r
+                    Package (0x0D)\r
                     {\r
-                        If ((Arg0 == One))\r
-                        {\r
-                            UCNP [Zero] = Zero\r
-                            UCNP [One] = \_SB.EMEC.CCST\r
-                            UCNP [0x02] = \_SB.EMEC.HPDS\r
-                            UCNP [0x03] = \_SB.EMEC.PINA\r
-                        }\r
+                        "RF_THERM", \r
+                        0x4F, \r
+                        One, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero\r
+                    }, \r
 \r
-                        If ((Arg0 == 0x02))\r
-                        {\r
-                            UCNP [Zero] = Zero\r
-                            UCNP [One] = \_SB.EMEC.CCS2\r
-                            UCNP [0x02] = \_SB.EMEC.HPD2\r
-                            UCNP [0x03] = \_SB.EMEC.PIN2\r
-                        }\r
-                    }\r
-                    Else\r
+                    Package (0x0D)\r
                     {\r
-                        ADBG ("EMECNotReady")\r
+                        "BAT_THERM", \r
+                        0x57, \r
+                        One, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero\r
                     }\r
-\r
-                    Return (UCNP) /* \_SB_.SAFI.UCNP */\r
-                }\r
-\r
-                Method (SLED, 1, Serialized)\r
-                {\r
-                    Local0 = 0x02\r
-                    \_SB.LED1.RLED (Local0, Arg0)\r
-                    Return (Zero)\r
-                }\r
+                })\r
             }\r
-        }\r
 \r
-        Scope (\_SB)\r
-        {\r
-            Device (SIC2)\r
+            Method (SYTB, 0, NotSerialized)\r
             {\r
-                Name (_HID, "SWI2CD1")  // _HID: Hardware ID\r
-                Name (_DDN, "SW I2C")  // _DDN: DOS Device Name\r
-                Name (_UID, 0x02)  // _UID: Unique ID\r
-                Method (_STA, 0, NotSerialized)  // _STA: Status\r
+                Return (Package (0x22)\r
                 {\r
-                    Local0 = Zero\r
-                    Return (Local0)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0040DD78, \r
+                        0xFFFFFFD8\r
+                    }, \r
 \r
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-                {\r
-                    Name (RBUF, ResourceTemplate ()\r
+                    Package (0x02)\r
                     {\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x005E\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x005D\r
-                            }\r
-                    })\r
-                    Return (RBUF) /* \_SB_.SIC2._CRS.RBUF */\r
-                }\r
+                        0x002DD9E4, \r
+                        0xFFFFFFDD\r
+                    }, \r
 \r
-                Method (SI2C, 0, NotSerialized)\r
-                {\r
-                    Name (CFG0, Package (0x0D)\r
-                    {\r
-                        0x03D5E004, \r
-                        0x03D5D004, \r
-                        0x03D5E004, \r
-                        0x03D5D004, \r
-                        0x03D5E000, \r
-                        0x03D5D000, \r
-                        0x03D5E000, \r
-                        0x03D5D000, \r
-                        0x0200, \r
-                        0x0200, \r
-                        Zero, \r
-                        0x04, \r
-                        0x02\r
-                    })\r
-                    Return (CFG0) /* \_SB_.SIC2.SI2C.CFG0 */\r
-                }\r
-            }\r
-        }\r
-#endif\r
+                    Package (0x02)\r
+                    {\r
+                        0x0020CA24, \r
+                        0xFFFFFFE2\r
+                    }, \r
 \r
-#if 0\r
-        Scope (\_SB)\r
-        {\r
-            Device (EMEC)\r
-            {\r
-                Name (_HID, "SAM0604")  // _HID: Hardware ID\r
-                Name (_UID, Zero)  // _UID: Unique ID\r
-                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                Name (_DEP, Package (0x06)  // _DEP: Dependencies\r
-                {\r
-                    \_SB.I2C1, \r
-                    \_SB.IC13, \r
-                    \_SB.IC15, \r
-                    \_SB.I2C8, \r
-                    \_SB.GIO0, \r
-                    \_SB.PM01\r
-                })\r
-                Name (AVBL, Zero)\r
-                Method (_REG, 2, NotSerialized)  // _REG: Region Availability\r
-                {\r
-                    If ((Arg0 == 0x9C))\r
+                    Package (0x02)\r
                     {\r
-                        AVBL = Arg1\r
-                    }\r
-                }\r
+                        0x0017B588, \r
+                        0xFFFFFFE7\r
+                    }, \r
 \r
-                Method (_STA, 0, NotSerialized)  // _STA: Status\r
-                {\r
-                    Return (0x0F)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x001152C4, \r
+                        0xFFFFFFEC\r
+                    }, \r
 \r
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-                {\r
-                    Name (RBF1, ResourceTemplate ()\r
+                    Package (0x02)\r
                     {\r
-                        I2cSerialBusV2 (0x0033, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.IC13",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x0025, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.IC15",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x0009, ControllerInitiated, 0x000186A0,\r
-                            AddressingMode7Bit, "\\_SB.I2C8",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x000B, ControllerInitiated, 0x000186A0,\r
-                            AddressingMode7Bit, "\\_SB.I2C8",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x001A, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.IC13",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x001A\r
-                            }\r
-                        GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x002C\r
-                            }\r
-                        GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x007A\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0026\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0050\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0067\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0080\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0084\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0018\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0068\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0024\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x008E\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0090\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x003D\r
-                            }\r
-                    })\r
-                    Name (RBF2, ResourceTemplate ()\r
+                        0x000CC8A8, \r
+                        0xFFFFFFF1\r
+                    }, \r
+\r
+                    Package (0x02)\r
                     {\r
-                        I2cSerialBusV2 (0x0033, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.IC13",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x0025, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.IC15",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x0009, ControllerInitiated, 0x000186A0,\r
-                            AddressingMode7Bit, "\\_SB.I2C8",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x000B, ControllerInitiated, 0x000186A0,\r
-                            AddressingMode7Bit, "\\_SB.I2C8",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x001A, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.IC13",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x0033, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.I2C1",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x0025, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.I2C1",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        I2cSerialBusV2 (0x0008, ControllerInitiated, 0x00061A80,\r
-                            AddressingMode7Bit, "\\_SB.IC15",\r
-                            0x00, ResourceConsumer, , Exclusive,\r
-                            )\r
-                        GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0140\r
-                            }\r
-                        GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x002C\r
-                            }\r
-                        GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x01C0\r
-                            }\r
-                        GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0200\r
-                            }\r
-                        GpioInt (Level, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0034\r
-                            }\r
-                        GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0033\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0026\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0050\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0067\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0080\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0084\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0018\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0068\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0024\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x008E\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0090\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x003D\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0007\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x004E\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0025\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x004D\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0086\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0083\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x000B\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0072\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x003F\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0045\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0053\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x005C\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0010\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionInputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0016\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0023\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0009\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0028\r
-                            }\r
-                        GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionOutputOnly,\r
-                            "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0002\r
-                            }\r
-                    })\r
-                    If ((BDRV == One))\r
+                        0x000985E4, \r
+                        0xFFFFFFF6\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0007286C, \r
+                        0xFFFFFFFB\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x00056D10, \r
+                        Zero\r
+                    }, \r
+\r
+                    Package (0x02)\r
                     {\r
-                        Return (RBF1) /* \_SB_.EMEC._CRS.RBF1 */\r
-                    }\r
-                    Else\r
+                        0x000425B8, \r
+                        0x05\r
+                    }, \r
+\r
+                    Package (0x02)\r
                     {\r
-                        Return (RBF2) /* \_SB_.EMEC._CRS.RBF2 */\r
-                    }\r
-                }\r
+                        0x000331F8, \r
+                        0x0A\r
+                    }, \r
 \r
-                Name (CVER, 0x03)\r
-                Method (GVER, 0, NotSerialized)\r
-                {\r
-                    Local0 = CVER /* \_SB_.EMEC.CVER */\r
-                    Return (Local0)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00027AC4, \r
+                        0x0F\r
+                    }, \r
 \r
-                Name (BDRV, 0x02)\r
-                Method (GBDR, 0, NotSerialized)\r
-                {\r
-                    Local0 = 0x05\r
-                    Return (Local0)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0001F018, \r
+                        0x14\r
+                    }, \r
 \r
-                Method (GBPV, 0, NotSerialized)\r
-                {\r
-                    Local0 = \_SB.MDID\r
-                    Return (Local0)\r
-                }\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x000186A0, \r
+                        0x19\r
+                    }, \r
 \r
-        Scope (\_SB.EMEC)\r
-        {\r
-            OperationRegion (EMOP, 0x9C, Zero, 0x0100)\r
-            Field (EMOP, DWordAcc, NoLock, Preserve)\r
-            {\r
-                DRL1,   8, \r
-                DRL2,   8, \r
-                Offset (0x04), \r
-                PRL1,   8, \r
-                PRL2,   8, \r
-                Offset (0x08), \r
-                CHST,   32, \r
-                SOC,    32, \r
-                VOLT,   32, \r
-                CHGC,   32, \r
-                CHTY,   32, \r
-                Offset (0x80), \r
-                CCST,   32, \r
-                HSFL,   32, \r
-                HPDS,   32, \r
-                PINA,   32, \r
-                HPDB,   32, \r
-                Offset (0xA0), \r
-                CCS2,   32, \r
-                HPD2,   32, \r
-                PIN2,   32\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00013560, \r
+                        0x1E\r
+                    }, \r
 \r
-            Method (CBLN, 1, NotSerialized)\r
-            {\r
-                If ((Arg0 == One))\r
-                {\r
-                    Notify (\_SB.UCME, 0x80) // Status Change\r
-                    Notify (\_SB.SAFI, 0xA4) // Device-Specific\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0xF6E0, \r
+                        0x23\r
+                    }, \r
 \r
-                If ((Arg0 == 0x02))\r
-                {\r
-                    Notify (\_SB.SAFI, 0xA4) // Device-Specific\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0xC60C, \r
+                        0x28\r
+                    }, \r
 \r
-                Return (Zero)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x9FC4, \r
+                        0x2D\r
+                    }, \r
 \r
-            Method (PCCD, 1, NotSerialized)\r
-            {\r
-                ADBG (Concatenate ("PCCD=", ToHexString (Arg0)))\r
-                If ((Arg0 == 0x02))\r
-                {\r
-                    Return (Zero)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x81B0, \r
+                        0x32\r
+                    }, \r
 \r
-                \_SB.CCST = \_SB.EMEC.CCST\r
-                \_SB.HSFL = \_SB.EMEC.HSFL\r
-                Return (Zero)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x69DC, \r
+                        0x37\r
+                    }, \r
 \r
-            Method (PHPD, 1, NotSerialized)\r
-            {\r
-                ADBG (Concatenate ("PHPD=", ToHexString (Arg0)))\r
-                If ((Arg0 == 0x02))\r
-                {\r
-                    Return (Zero)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x56B8, \r
+                        0x3C\r
+                    }, \r
 \r
-#if 0\r
-                \_SB.HPDS = \_SB.EMEC.HPDS\r
-                \_SB.PINA = \_SB.EMEC.PINA\r
-                \_SB.HPDB = \_SB.EMEC.HPDB\r
-                Notify (\_SB.GPU0, \_SB.HPDB)\r
-#endif\r
-                Return (Zero)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x477C, \r
+                        0x41\r
+                    }, \r
 \r
-            Method (HPDF, 3, NotSerialized)\r
-            {\r
-                \_SB.HPDS = Arg0\r
-                \_SB.PINA = Arg1\r
-                \_SB.HPDB = Arg2\r
-#if 0                \r
-                Notify (\_SB.GPU0, \_SB.HPDB)\r
-#endif\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3B60, \r
+                        0x46\r
+                    }, \r
 \r
-            Method (CCOT, 2, NotSerialized)\r
-            {\r
-                \_SB.CCST = Arg0\r
-                \_SB.HSFL = Arg1\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3138, \r
+                        0x4B\r
+                    }, \r
 \r
-            Method (PLDR, 1, NotSerialized)\r
-            {\r
-                Local0 = Zero\r
-                \_SB.LED1.RLED (0xF0, Zero)\r
-                If ((CHST == 0x05))\r
-                {\r
-                    Local0 |= 0x20\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x2968, \r
+                        0x50\r
+                    }, \r
 \r
-                If ((CHST == 0x11))\r
-                {\r
-                    Local0 |= 0x40\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x22BA, \r
+                        0x55\r
+                    }, \r
 \r
-                If ((CHST == 0x21))\r
-                {\r
-                    Local0 |= 0x10\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1D4C, \r
+                        0x5A\r
+                    }, \r
 \r
-                If ((CHST == 0x40))\r
-                {\r
-                    Local0 |= 0x80\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x18D8, \r
+                        0x5F\r
+                    }, \r
 \r
-                \_SB.LED1.RLED (Local0, Arg0)\r
-                Return (Zero)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1522, \r
+                        0x64\r
+                    }, \r
 \r
-            Method (PLID, 1, Serialized)\r
-            {\r
-                ADBG (Concatenate ("PLID=", ToHexString (Arg0)))\r
-                \_SB.LID0.LIDB = Arg0\r
-                Notify (\_SB.LID0, 0x80) // Status Change\r
-                Return (\_SB.LID0.LIDB)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x120C, \r
+                        0x69\r
+                    }, \r
 \r
-            Method (PHID, 1, Serialized)\r
-            {\r
-                ADBG (Concatenate ("PHID=", ToHexString (Arg0)))\r
-                Notify (\_SB.SVBI, Arg0)\r
-                Return (Zero)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0F82, \r
+                        0x6E\r
+                    }, \r
 \r
-            Method (PPGS, 1, Serialized)\r
-            {\r
-                ADBG (Concatenate ("PPGS=", ToHexString (Arg0)))\r
-                Notify (\_SB.SAFI, 0xA3) // Device-Specific\r
-                Return (Zero)\r
+                    Package (0x02)\r
+                    {\r
+                        0x0D5C, \r
+                        0x73\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0B86, \r
+                        0x78\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0A00, \r
+                        0x7D\r
+                    }\r
+                })\r
             }\r
-        }\r
 \r
-        Scope (\_SB)\r
-        {\r
-            Device (UCME)\r
+            Method (XTTB, 0, NotSerialized)\r
             {\r
-                Name (_HID, "SAM0605")  // _HID: Hardware ID\r
-                Name (_CID, "SAM0605")  // _CID: Compatible ID\r
-                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                Name (_DDN, "UCM Emulation")  // _DDN: DOS Device Name\r
-                Name (_UID, One)  // _UID: Unique ID\r
-                Name (AVBL, Zero)\r
-                Method (_REG, 2, NotSerialized)  // _REG: Region Availability\r
+                Return (Package (0xA8)\r
                 {\r
-                    If ((Arg0 == 0x9F))\r
+                    Package (0x02)\r
                     {\r
-                        ^AVBL = Arg1\r
-                    }\r
-                }\r
+                        0x0040DC21, \r
+                        0xFFFF6000\r
+                    }, \r
 \r
-                Method (_STA, 0, NotSerialized)  // _STA: Status\r
-                {\r
-                    Local0 = 0x0F\r
-                    Return (Local0)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x003C74E5, \r
+                        0xFFFF6400\r
+                    }, \r
 \r
-                Method (GDRO, 1, NotSerialized)\r
-                {\r
-                    If ((Arg0 == One))\r
+                    Package (0x02)\r
                     {\r
-                        Local0 = \_SB.EMEC.DRL1\r
-                    }\r
+                        0x0038611B, \r
+                        0xFFFF6800\r
+                    }, \r
 \r
-                    If ((Arg0 == 0x02))\r
+                    Package (0x02)\r
                     {\r
-                        Local0 = \_SB.EMEC.DRL2\r
-                    }\r
+                        0x00349A1A, \r
+                        0xFFFF6C00\r
+                    }, \r
 \r
-                    Return (Local0)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x003119CB, \r
+                        0xFFFF7000\r
+                    }, \r
 \r
-                Method (GPRO, 1, NotSerialized)\r
-                {\r
-                    If ((Arg0 == One))\r
+                    Package (0x02)\r
                     {\r
-                        Local0 = \_SB.EMEC.PRL1\r
-                    }\r
+                        0x002DDA9A, \r
+                        0xFFFF7400\r
+                    }, \r
 \r
-                    If ((Arg0 == 0x02))\r
+                    Package (0x02)\r
                     {\r
-                        Local0 = \_SB.EMEC.PRL2\r
-                    }\r
+                        0x002AD76C, \r
+                        0xFFFF7800\r
+                    }, \r
 \r
-                    Return (Local0)\r
-                }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00280B95, \r
+                        0xFFFF7C00\r
+                    }, \r
 \r
-                Device (POR0)\r
-                {\r
-                    Name (_ADR, Zero)  // _ADR: Address\r
-                    Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device\r
-                    {\r
-                        ToPLD (\r
-                            PLD_Revision           = 0x2,\r
-                            PLD_IgnoreColor        = 0x1,\r
-                            PLD_Red                = 0x0,\r
-                            PLD_Green              = 0x0,\r
-                            PLD_Blue               = 0x0,\r
-                            PLD_Width              = 0x0,\r
-                            PLD_Height             = 0x0,\r
-                            PLD_UserVisible        = 0x1,\r
-                            PLD_Dock               = 0x0,\r
-                            PLD_Lid                = 0x0,\r
-                            PLD_Panel              = "BACK",\r
-                            PLD_VerticalPosition   = "CENTER",\r
-                            PLD_HorizontalPosition = "LEFT",\r
-                            PLD_Shape              = "VERTICALRECTANGLE",\r
-                            PLD_GroupOrientation   = 0x0,\r
-                            PLD_GroupToken         = 0x0,\r
-                            PLD_GroupPosition      = 0x1,\r
-                            PLD_Bay                = 0x0,\r
-                            PLD_Ejectable          = 0x0,\r
-                            PLD_EjectRequired      = 0x0,\r
-                            PLD_CabinetNumber      = 0x0,\r
-                            PLD_CardCageNumber     = 0x0,\r
-                            PLD_Reference          = 0x0,\r
-                            PLD_Rotation           = 0x0,\r
-                            PLD_Order              = 0x0,\r
-                            PLD_VerticalOffset     = 0xFFFF,\r
-                            PLD_HorizontalOffset   = 0xFFFF)\r
+                    Package (0x02)\r
+                    {\r
+                        0x002572CA, \r
+                        0xFFFF8000\r
+                    }, \r
 \r
-                    })\r
-                    Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities\r
+                    Package (0x02)\r
                     {\r
-                        One, \r
-                        0x09, \r
-                        Zero, \r
-                        Zero\r
-                    })\r
-                }\r
-            }\r
-        }\r
+                        0x0023091E, \r
+                        0xFFFF8400\r
+                    }, \r
 \r
-        Scope (\_SB)\r
-        {\r
-            Device (MCTL)\r
-            {\r
-                Name (_HID, "SAM0602")  // _HID: Hardware ID\r
-                Name (_CID, "SAM0602")  // _CID: Compatible ID\r
-                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                Name (_DDN, "ModemCtrl")  // _DDN: DOS Device Name\r
-                Name (_UID, Zero)  // _UID: Unique ID\r
-                Name (_DEP, Package (0x01)  // _DEP: Dependencies\r
-                {\r
-                    \_SB.PM01\r
-                })\r
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-                {\r
-                    Name (RBUF, ResourceTemplate ()\r
+                    Package (0x02)\r
                     {\r
-                        GpioInt (Edge, ActiveHigh, SharedAndWake, PullNone, 0x0000,\r
-                            "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                            )\r
-                            {   // Pin list\r
-                                0x0061\r
-                            }\r
-                    })\r
-                    Return (RBUF) /* \_SB_.MCTL._CRS.RBUF */\r
-                }\r
+                        0x0020CAF4, \r
+                        0xFFFF8800\r
+                    }, \r
 \r
-                Method (_STA, 0, NotSerialized)  // _STA: Status\r
-                {\r
-                    Local0 = 0x0F\r
-                    Return (Local0)\r
-                }\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x001EB4FE, \r
+                        0xFFFF8C00\r
+                    }, \r
 \r
-        Scope (\_SB)\r
-        {\r
-            Device (AGNT)\r
-            {\r
-                Name (_ADR, Zero)  // _ADR: Address\r
-                Name (_HID, "SAM0603")  // _HID: Hardware ID\r
-                Name (_CID, "SAM0603")  // _CID: Compatible ID\r
-                Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-                Name (_UID, One)  // _UID: Unique ID\r
-                Name (_STA, 0x0F)  // _STA: Status\r
-            }\r
-        }\r
-#endif\r
+                    Package (0x02)\r
+                    {\r
+                        0x001CC430, \r
+                        0xFFFF9000\r
+                    }, \r
 \r
+                    Package (0x02)\r
+                    {\r
+                        0x001AF5BE, \r
+                        0xFFFF9400\r
+                    }, \r
 \r
+                    Package (0x02)\r
+                    {\r
+                        0x00194716, \r
+                        0xFFFF9800\r
+                    }, \r
 \r
-        Method (ADBG, 1, Serialized)\r
-        {\r
-            \r
-        }\r
-        \r
-        Name (HPDB, Zero)\r
-        Name (PINA, Zero)\r
-        Name (CCST, Buffer (One)\r
-        {\r
-             0x02                                             // .\r
-        })\r
-        Name (HSFL, Buffer (One)\r
-        {\r
-             0x00                                             // .\r
-        })\r
-        Name (USBC, Buffer (One)\r
-        {\r
-             0x0B                                             // .\r
-        })\r
+                    Package (0x02)\r
+                    {\r
+                        0x0017B5DC, \r
+                        0xFFFF9C00\r
+                    }, \r
 \r
-        //Name (QUFN, Zero)\r
-        Name (QUFN, One)\r
-        Name (DPP0, Buffer (One)\r
-        {\r
-             0x00                                             // .\r
-        })\r
-               \r
-\r\r
-        Device (UCP0)\r\r
-        {\r\r
-            Name (_HID, "QCOM02D0")  // _HID: Hardware ID\r\r
-            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r\r
-            {\r\r
-                \_SB.PEP0, \r\r
-                \_SB.PTCC, \r\r
-                \_SB.URS0\r\r
-            })\r\r
-            Device (CON0)\r\r
-            {\r\r
-                Name (_ADR, Zero)  // _ADR: Address\r\r
-                Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device\r\r
-                {\r\r
-                    ToPLD (\r\r
-                        PLD_Revision           = 0x2,\r\r
-                        PLD_IgnoreColor        = 0x1,\r\r
-                        PLD_Red                = 0x0,\r\r
-                        PLD_Green              = 0x0,\r\r
-                        PLD_Blue               = 0x0,\r\r
-                        PLD_Width              = 0x0,\r\r
-                        PLD_Height             = 0x0,\r\r
-                        PLD_UserVisible        = 0x1,\r\r
-                        PLD_Dock               = 0x0,\r\r
-                        PLD_Lid                = 0x0,\r\r
-                        PLD_Panel              = "BACK",\r\r
-                        PLD_VerticalPosition   = "CENTER",\r\r
-                        PLD_HorizontalPosition = "LEFT",\r\r
-                        PLD_Shape              = "VERTICALRECTANGLE",\r\r
-                        PLD_GroupOrientation   = 0x0,\r\r
-                        PLD_GroupToken         = 0x0,\r\r
-                        PLD_GroupPosition      = 0x1,\r\r
-                        PLD_Bay                = 0x0,\r\r
-                        PLD_Ejectable          = 0x0,\r\r
-                        PLD_EjectRequired      = 0x0,\r\r
-                        PLD_CabinetNumber      = 0x0,\r\r
-                        PLD_CardCageNumber     = 0x0,\r\r
-                        PLD_Reference          = 0x0,\r\r
-                        PLD_Rotation           = 0x0,\r\r
-                        PLD_Order              = 0x0,\r\r
-                        PLD_VerticalOffset     = 0xFFFF,\r\r
-                        PLD_HorizontalOffset   = 0xFFFF)\r\r
-\r\r
-                })\r\r
-                Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities\r\r
-                {\r\r
-                    One, \r\r
-                    0x08, \r\r
-                    Zero, \r\r
-                    Zero\r\r
-                })\r\r
-                Name (_DSD, Package (0x02)  // _DSD: Device-Specific Data\r\r
-                {\r\r
-                    ToUUID ("6b856e62-40f4-4688-bd46-5e888a2260de"), \r\r
-                    Package (0x0A)\r\r
-                    {\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            One, \r\r
-                            0x04\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x02, \r\r
-                            0x03\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x03, \r\r
-                            Zero\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x04, \r\r
-                            One\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x05, \r\r
-                            0x03\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x06, \r\r
-                            Package (0x01)\r\r
-                            {\r\r
-                                0x0001905A\r\r
-                            }\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x07, \r\r
-                            Package (0x02)\r\r
-                            {\r\r
-                                0x0001912C, \r\r
-                                0x0002D0C8\r\r
-                            }\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x08, \r\r
-                            Package (0x02)\r\r
-                            {\r\r
-                                0xFF01, \r\r
-                                0x3C86\r\r
-                            }\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x09, \r\r
-                            One\r\r
-                        }, \r\r
-\r\r
-                        Package (0x02)\r\r
-                        {\r\r
-                            0x0A, \r\r
-                            One\r\r
-                        }\r\r
-                    }\r\r
-                })\r\r
-            }\r\r
-\r\r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r\r
-            {\r\r
-                While (One)\r\r
-                {\r\r
-                    Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r\r
-                    {\r\r
-                         0x00                                             // .\r\r
-                    })\r\r
-                    CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.UCP0._DSM._T_0 */\r\r
-                    If ((_T_0 == ToUUID ("18de299f-9476-4fc9-b43b-8aeb713ed751")))\r\r
-                    {\r\r
-                        While (One)\r\r
-                        {\r\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r\r
-                            _T_1 = ToInteger (Arg2)\r\r
-                            If ((_T_1 == Zero))\r\r
-                            {\r\r
-                                While (One)\r\r
-                                {\r\r
-                                    Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r\r
-                                    _T_2 = ToInteger (Arg1)\r\r
-                                    If ((_T_2 == Zero))\r\r
-                                    {\r\r
-                                        Return (Buffer (One)\r\r
-                                        {\r\r
-                                             0x01                                             // .\r\r
-                                        })\r\r
-                                        Break\r\r
-                                    }\r\r
-                                    Else\r\r
-                                    {\r\r
-                                        Return (Buffer (One)\r\r
-                                        {\r\r
-                                             0x01                                             // .\r\r
-                                        })\r\r
-                                        Break\r\r
-                                    }\r\r
-\r\r
-                                    Break\r\r
-                                }\r\r
-\r\r
-                                Return (Buffer (One)\r\r
-                                {\r\r
-                                     0x00                                             // .\r\r
-                                })\r\r
-                                Break\r\r
-                            }\r\r
-                            ElseIf ((_T_1 == One))\r\r
-                            {\r\r
-                                While (One)\r\r
-                                {\r\r
-                                    Name (_T_3, 0x00)  // _T_x: Emitted by ASL Compiler\r\r
-                                    _T_3 = ToInteger (Arg3)\r\r
-                                    If ((_T_3 == Zero))\r\r
-                                    {\r\r
-                                        Return (Package (0x01)\r\r
-                                        {\r\r
-                                            0x36019050\r\r
-                                        })\r\r
-                                        Break\r\r
-                                    }\r\r
-                                    ElseIf ((_T_3 == One))\r\r
-                                    {\r\r
-                                        Return (Package (0x01)\r\r
-                                        {\r\r
-                                            0x3601912C\r\r
-                                        })\r\r
-                                        Break\r\r
-                                    }\r\r
-                                    Else\r\r
-                                    {\r\r
-                                        Return (Package (0x01)\r\r
-                                        {\r\r
-                                            Zero\r\r
-                                        })\r\r
-                                        Break\r\r
-                                    }\r\r
-\r\r
-                                    Break\r\r
-                                }\r\r
-                            }\r\r
-                            Else\r\r
-                            {\r\r
-                                Return (Buffer (One)\r\r
-                                {\r\r
-                                     0x00                                             // .\r\r
-                                })\r\r
-                                Break\r\r
-                            }\r\r
-\r\r
-                            Break\r\r
-                        }\r\r
-                    }\r\r
-                    Else\r\r
-                    {\r\r
-                        Return (Buffer (One)\r\r
-                        {\r\r
-                             0x00                                             // .\r\r
-                        })\r\r
-                        Break\r\r
-                    }\r\r
-\r\r
-                    Break\r\r
-                }\r\r
-            }\r\r
-\r\r
-            Method (CCOT, 2, NotSerialized)\r\r
-            {\r\r
-                \_SB.CCST = Arg0\r\r
-                \_SB.HSFL = Arg1\r\r
-            }\r\r
-\r\r
-            Method (CCVL, 0, NotSerialized)\r\r
-            {\r\r
-                Return (\_SB.CCST)\r\r
-            }\r\r
-\r\r
-            Method (HPDS, 0, NotSerialized)\r\r
-            {\r\r
-                Notify (\_SB.GPU0, 0x94) // Device-Specific\r\r
-            }\r\r
-\r\r
-            Method (HPDF, 2, NotSerialized)\r\r
-            {\r\r
-                \_SB.HPDB = Arg0\r\r
-                \_SB.PINA = Arg1\r\r
-                Notify (\_SB.GPU0, \_SB.HPDB)\r\r
-            }\r\r
-\r\r
-            Method (HPDV, 0, NotSerialized)\r\r
-            {\r\r
-                Return (\_SB.HPDB)\r\r
-            }\r\r
-\r\r
-            Method (PINV, 0, NotSerialized)\r\r
-            {\r\r
-                Return (\_SB.PINA)\r\r
-            }\r\r
-        }\r\r
-               \r\r
-        Device (URS0)\r\r
-        {\r\r
-            Method (URSI, 0, NotSerialized)\r\r
-            {\r\r
-                If ((QUFN == Zero))\r\r
-                {\r\r
-                    Return ("QCOM0304")\r\r
-                }\r\r
-                Else\r\r
-                {\r\r
-                    Return ("QCOM0305")\r\r
-                }\r\r
-            }\r\r
-\r\r
-            Alias (URSI, _HID)\r\r
-            Name (_CID, "PNP0CA1")  // _CID: Compatible ID\r\r
-            Alias (PSUB, _SUB)\r\r
-            Name (_UID, Zero)  // _UID: Unique ID\r\r
-            Name (_CCA, Zero)  // _CCA: Cache Coherency Attribute\r\r
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies\r\r
-            {\r\r
-                PEP0\r\r
-            })\r\r
-            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings\r\r
-            {\r\r
-                Memory32Fixed (ReadWrite,\r\r
-                    0x0A600000,         // Address Base\r\r
-                    0x000FFFFF,         // Address Length\r\r
-                    )\r\r
-            })\r\r
-            Device (USB0)\r\r
-            {\r\r
-                Name (_ADR, Zero)  // _ADR: Address\r\r
-                Name (_S0W, 0x03)  // _S0W: S0 Device Wake State\r\r
-                Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device\r\r
-                {\r\r
-                    ToPLD (\r\r
-                        PLD_Revision           = 0x2,\r\r
-                        PLD_IgnoreColor        = 0x1,\r\r
-                        PLD_Red                = 0x0,\r\r
-                        PLD_Green              = 0x0,\r\r
-                        PLD_Blue               = 0x0,\r\r
-                        PLD_Width              = 0x0,\r\r
-                        PLD_Height             = 0x0,\r\r
-                        PLD_UserVisible        = 0x1,\r\r
-                        PLD_Dock               = 0x0,\r\r
-                        PLD_Lid                = 0x0,\r\r
-                        PLD_Panel              = "BACK",\r\r
-                        PLD_VerticalPosition   = "CENTER",\r\r
-                        PLD_HorizontalPosition = "LEFT",\r\r
-                        PLD_Shape              = "VERTICALRECTANGLE",\r\r
-                        PLD_GroupOrientation   = 0x0,\r\r
-                        PLD_GroupToken         = 0x0,\r\r
-                        PLD_GroupPosition      = 0x1,\r\r
-                        PLD_Bay                = 0x0,\r\r
-                        PLD_Ejectable          = 0x0,\r\r
-                        PLD_EjectRequired      = 0x0,\r\r
-                        PLD_CabinetNumber      = 0x0,\r\r
-                        PLD_CardCageNumber     = 0x0,\r\r
-                        PLD_Reference          = 0x0,\r\r
-                        PLD_Rotation           = 0x0,\r\r
-                        PLD_Order              = 0x0,\r\r
-                        PLD_VerticalOffset     = 0xFFFF,\r\r
-                        PLD_HorizontalOffset   = 0xFFFF)\r\r
-\r\r
-                })\r\r
-                Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities\r\r
-                {\r\r
-                    One, \r\r
-                    0x09, \r\r
-                    Zero, \r\r
-                    Zero\r\r
-                })\r\r
-                Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings\r\r
-                {\r\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r\r
-                    {\r\r
-                        0x000000A5,\r\r
-                    }\r\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, SharedAndWake, ,, )\r\r
-                    {\r\r
-                        0x0000017A,\r\r
-                    }\r\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, SharedAndWake, ,, )\r\r
-                    {\r\r
-                        0x00000206,\r\r
-                    }\r\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, SharedAndWake, ,, )\r\r
-                    {\r\r
-                        0x00000208,\r\r
-                    }\r\r
-                    Interrupt (ResourceConsumer, Edge, ActiveHigh, SharedAndWake, ,, )\r\r
-                    {\r\r
-                        0x00000209,\r\r
-                    }\r\r
-                })\r\r
-                Method (_STA, 0, NotSerialized)  // _STA: Status\r\r
-                {\r\r
-                    Return (0x0F)\r\r
-                }\r\r
-\r\r
-                Method (DPM0, 1, NotSerialized)\r\r
-                {\r\r
-                    DPP0 = Arg0\r\r
-                    Notify (PEP0, 0xA0) // Device-Specific\r\r
-                }\r\r
-\r\r
-                Method (CCVL, 0, NotSerialized)\r\r
-                {\r\r
-                    Return (CCST) /* \_SB_.CCST */\r\r
-                }\r\r
-\r\r
-                Method (HSEN, 0, NotSerialized)\r\r
-                {\r\r
-                    Return (HSFL) /* \_SB_.HSFL */\r\r
-                }\r\r
-\r\r
-                Name (HSEI, ResourceTemplate ()\r\r
-                {\r\r
-                    GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r\r
-                        )\r\r
-                        {   // Pin list\r\r
-                            0x003E\r\r
-                        }\r\r
-                })\r\r
-                Scope (^^GIO0)\r\r
-                {\r\r
-                    OperationRegion (HLEN, GeneralPurposeIo, Zero, One)\r\r
-                }\r\r
-\r\r
-                Field (^^GIO0.HLEN, ByteAcc, NoLock, Preserve)\r\r
-                {\r\r
-                    Connection (HSEI), \r\r
-                    MOD1,   1\r\r
-                }\r\r
-\r\r
-                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r\r
-                {\r\r
-                    While (One)\r\r
-                    {\r\r
-                        Name (_T_0, Buffer (One)  // _T_x: Emitted by ASL Compiler\r\r
-                        {\r\r
-                             0x00                                             // .\r\r
-                        })\r\r
-                        CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.URS0.USB0._DSM._T_0 */\r\r
-                        If ((_T_0 == ToUUID ("ce2ee385-00e6-48cb-9f05-2edb927c4899") /* USB Controller */))\r\r
-                        {\r\r
-                            While (One)\r\r
-                            {\r\r
-                                Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                _T_1 = ToInteger (Arg2)\r\r
-                                If ((_T_1 == Zero))\r\r
-                                {\r\r
-                                    While (One)\r\r
-                                    {\r\r
-                                        Name (_T_2, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                        _T_2 = ToInteger (Arg1)\r\r
-                                        If ((_T_2 == Zero))\r\r
-                                        {\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x1D                                             // .\r\r
-                                            })\r\r
-                                            Break\r\r
-                                        }\r\r
-                                        Else\r\r
-                                        {\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x01                                             // .\r\r
-                                            })\r\r
-                                            Break\r\r
-                                        }\r\r
-\r\r
-                                        Break\r\r
-                                    }\r\r
-\r\r
-                                    Return (Buffer (One)\r\r
-                                    {\r\r
-                                         0x00                                             // .\r\r
-                                    })\r\r
-                                    Break\r\r
-                                }\r\r
-                                ElseIf ((_T_1 == 0x02))\r\r
-                                {\r\r
-                                    Return (Zero)\r\r
-                                    Break\r\r
-                                }\r\r
-                                ElseIf ((_T_1 == 0x03))\r\r
-                                {\r\r
-                                    Return (One)\r\r
-                                    Break\r\r
-                                }\r\r
-                                ElseIf ((_T_1 == 0x04))\r\r
-                                {\r\r
-                                    Return (0x02)\r\r
-                                    Break\r\r
-                                }\r\r
-                                Else\r\r
-                                {\r\r
-                                    Return (Buffer (One)\r\r
-                                    {\r\r
-                                         0x00                                             // .\r\r
-                                    })\r\r
-                                    Break\r\r
-                                }\r\r
-\r\r
-                                Break\r\r
-                            }\r\r
-                        }\r\r
-                        ElseIf ((_T_0 == ToUUID ("a9a82a56-95a1-4b4a-b014-3be47df1b7d5")))\r\r
-                        {\r\r
-                            While (One)\r\r
-                            {\r\r
-                                Name (_T_3, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                _T_3 = ToInteger (Arg1)\r\r
-                                If ((_T_3 == One))\r\r
-                                {\r\r
-                                    While (One)\r\r
-                                    {\r\r
-                                        Name (_T_4, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                        _T_4 = ToInteger (Arg2)\r\r
-                                        If ((_T_4 == One))\r\r
-                                        {\r\r
-                                            ADBG ("MOD1+")\r\r
-                                            MOD1 = One\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x01                                             // .\r\r
-                                            })\r\r
-                                        }\r\r
-                                        ElseIf ((_T_4 == Zero))\r\r
-                                        {\r\r
-                                            ADBG ("MOD1-")\r\r
-                                            MOD1 = Zero\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x01                                             // .\r\r
-                                            })\r\r
-                                        }\r\r
-                                        Else\r\r
-                                        {\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x00                                             // .\r\r
-                                            })\r\r
-                                        }\r\r
-\r\r
-                                        Break\r\r
-                                    }\r\r
-                                }\r\r
-                                Else\r\r
-                                {\r\r
-                                    Return (Buffer (One)\r\r
-                                    {\r\r
-                                         0x00                                             // .\r\r
-                                    })\r\r
-                                }\r\r
-\r\r
-                                Break\r\r
-                            }\r\r
-                        }\r\r
-                        Else\r\r
-                        {\r\r
-                            Return (Buffer (One)\r\r
-                            {\r\r
-                                 0x00                                             // .\r\r
-                            })\r\r
-                            Break\r\r
-                        }\r\r
-\r\r
-                        Break\r\r
-                    }\r\r
-                }\r\r
-\r\r
-                Method (PHYC, 0, NotSerialized)\r\r
-                {\r\r
-                    Name (CFG0, Package (0x01)\r\r
-                    {\r\r
-                        Package (0x03)\r\r
-                        {\r\r
-                            Zero, \r\r
-                            0x088E2198, \r\r
-                            0x20\r\r
-                        }\r\r
-                    })\r\r
-                    Return (CFG0) /* \_SB_.URS0.USB0.PHYC.CFG0 */\r\r
-                }\r\r
-\r\r
-                Device (RHUB)\r\r
-                {\r\r
-                    Name (_ADR, Zero)  // _ADR: Address\r\r
-                    Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r\r
-                    {\r\r
-                        While (One)\r\r
-                        {\r\r
-                            Name (_T_0, Buffer (One)  // _T_x: Emitted by ASL Compiler\r\r
-                            {\r\r
-                                 0x00                                             // .\r\r
-                            })\r\r
-                            CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.URS0.USB0.RHUB._DSM._T_0 */\r\r
-                            If ((_T_0 == ToUUID ("a9a82a56-95a1-4b4a-b014-3be47df1b7d5")))\r\r
-                            {\r\r
-                                While (One)\r\r
-                                {\r\r
-                                    Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                    _T_1 = ToInteger (Arg1)\r\r
-                                    If ((_T_1 == One))\r\r
-                                    {\r\r
-                                        While (One)\r\r
-                                        {\r\r
-                                            Name (_T_2, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                            _T_2 = ToInteger (Arg2)\r\r
-                                            If ((_T_2 == One))\r\r
-                                            {\r\r
-                                                ADBG ("MOD1++")\r\r
-                                                MOD1 = One\r\r
-                                                Return (Buffer (One)\r\r
-                                                {\r\r
-                                                     0x01                                             // .\r\r
-                                                })\r\r
-                                            }\r\r
-                                            ElseIf ((_T_2 == Zero))\r\r
-                                            {\r\r
-                                                ADBG ("MOD1--")\r\r
-                                                MOD1 = Zero\r\r
-                                                Return (Buffer (One)\r\r
-                                                {\r\r
-                                                     0x01                                             // .\r\r
-                                                })\r\r
-                                            }\r\r
-                                            Else\r\r
-                                            {\r\r
-                                                Return (Buffer (One)\r\r
-                                                {\r\r
-                                                     0x00                                             // .\r\r
-                                                })\r\r
-                                            }\r\r
-\r\r
-                                            Break\r\r
-                                        }\r\r
-                                    }\r\r
-                                    Else\r\r
-                                    {\r\r
-                                        Return (Buffer (One)\r\r
-                                        {\r\r
-                                             0x00                                             // .\r\r
-                                        })\r\r
-                                    }\r\r
-\r\r
-                                    Break\r\r
-                                }\r\r
-                            }\r\r
-                            Else\r\r
-                            {\r\r
-                                Return (Buffer (One)\r\r
-                                {\r\r
-                                     0x00                                             // .\r\r
-                                })\r\r
-                                Break\r\r
-                            }\r\r
-\r\r
-                            Break\r\r
-                        }\r\r
-                    }\r\r
-                }\r\r
-            }\r\r
-\r\r
-            Device (UFN0)\r\r
-            {\r\r
-                Name (_ADR, One)  // _ADR: Address\r\r
-                Name (_S0W, 0x03)  // _S0W: S0 Device Wake State\r\r
-                Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device\r\r
-                {\r\r
-                    ToPLD (\r\r
-                        PLD_Revision           = 0x2,\r\r
-                        PLD_IgnoreColor        = 0x1,\r\r
-                        PLD_Red                = 0x0,\r\r
-                        PLD_Green              = 0x0,\r\r
-                        PLD_Blue               = 0x0,\r\r
-                        PLD_Width              = 0x0,\r\r
-                        PLD_Height             = 0x0,\r\r
-                        PLD_UserVisible        = 0x1,\r\r
-                        PLD_Dock               = 0x0,\r\r
-                        PLD_Lid                = 0x0,\r\r
-                        PLD_Panel              = "BACK",\r\r
-                        PLD_VerticalPosition   = "CENTER",\r\r
-                        PLD_HorizontalPosition = "LEFT",\r\r
-                        PLD_Shape              = "VERTICALRECTANGLE",\r\r
-                        PLD_GroupOrientation   = 0x0,\r\r
-                        PLD_GroupToken         = 0x0,\r\r
-                        PLD_GroupPosition      = 0x1,\r\r
-                        PLD_Bay                = 0x0,\r\r
-                        PLD_Ejectable          = 0x0,\r\r
-                        PLD_EjectRequired      = 0x0,\r\r
-                        PLD_CabinetNumber      = 0x0,\r\r
-                        PLD_CardCageNumber     = 0x0,\r\r
-                        PLD_Reference          = 0x0,\r\r
-                        PLD_Rotation           = 0x0,\r\r
-                        PLD_Order              = 0x0,\r\r
-                        PLD_VerticalOffset     = 0xFFFF,\r\r
-                        PLD_HorizontalOffset   = 0xFFFF)\r\r
-\r\r
-                })\r\r
-                Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities\r\r
-                {\r\r
-                    One, \r\r
-                    0x09, \r\r
-                    Zero, \r\r
-                    Zero\r\r
-                })\r\r
-                Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings\r\r
-                {\r\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared, ,, )\r\r
-                    {\r\r
-                        0x000000A5,\r\r
-                    }\r\r
-                    Interrupt (ResourceConsumer, Level, ActiveHigh, SharedAndWake, ,, )\r\r
-                    {\r\r
-                        0x000000A2,\r\r
-                    }\r\r
-                })\r\r
-                Method (CCVL, 0, NotSerialized)\r\r
-                {\r\r
-                    Return (CCST) /* \_SB_.CCST */\r\r
-                }\r\r
-\r\r
-                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r\r
-                {\r\r
-                    While (One)\r\r
-                    {\r\r
-                        Name (_T_0, Buffer (One)  // _T_x: Emitted by ASL Compiler\r\r
-                        {\r\r
-                             0x00                                             // .\r\r
-                        })\r\r
-                        CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.URS0.UFN0._DSM._T_0 */\r\r
-                        If ((_T_0 == ToUUID ("fe56cfeb-49d5-4378-a8a2-2978dbe54ad2")))\r\r
-                        {\r\r
-                            While (One)\r\r
-                            {\r\r
-                                Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                _T_1 = ToInteger (Arg2)\r\r
-                                If ((_T_1 == Zero))\r\r
-                                {\r\r
-                                    While (One)\r\r
-                                    {\r\r
-                                        Name (_T_2, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                        _T_2 = ToInteger (Arg1)\r\r
-                                        If ((_T_2 == Zero))\r\r
-                                        {\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x03                                             // .\r\r
-                                            })\r\r
-                                            Break\r\r
-                                        }\r\r
-                                        Else\r\r
-                                        {\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x01                                             // .\r\r
-                                            })\r\r
-                                            Break\r\r
-                                        }\r\r
-\r\r
-                                        Break\r\r
-                                    }\r\r
-\r\r
-                                    Return (Buffer (One)\r\r
-                                    {\r\r
-                                         0x00                                             // .\r\r
-                                    })\r\r
-                                    Break\r\r
-                                }\r\r
-                                ElseIf ((_T_1 == One))\r\r
-                                {\r\r
-                                    Return (0x20)\r\r
-                                    Break\r\r
-                                }\r\r
-                                Else\r\r
-                                {\r\r
-                                    Return (Buffer (One)\r\r
-                                    {\r\r
-                                         0x00                                             // .\r\r
-                                    })\r\r
-                                    Break\r\r
-                                }\r\r
-\r\r
-                                Break\r\r
-                            }\r\r
-                        }\r\r
-                        ElseIf ((_T_0 == ToUUID ("18de299f-9476-4fc9-b43b-8aeb713ed751")))\r\r
-                        {\r\r
-                            While (One)\r\r
-                            {\r\r
-                                Name (_T_3, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                _T_3 = ToInteger (Arg2)\r\r
-                                If ((_T_3 == Zero))\r\r
-                                {\r\r
-                                    While (One)\r\r
-                                    {\r\r
-                                        Name (_T_4, Zero)  // _T_x: Emitted by ASL Compiler\r\r
-                                        _T_4 = ToInteger (Arg1)\r\r
-                                        If ((_T_4 == Zero))\r\r
-                                        {\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x03                                             // .\r\r
-                                            })\r\r
-                                            Break\r\r
-                                        }\r\r
-                                        Else\r\r
-                                        {\r\r
-                                            Return (Buffer (One)\r\r
-                                            {\r\r
-                                                 0x01                                             // .\r\r
-                                            })\r\r
-                                            Break\r\r
-                                        }\r\r
-\r\r
-                                        Break\r\r
-                                    }\r\r
-\r\r
-                                    Return (Buffer (One)\r\r
-                                    {\r\r
-                                         0x00                                             // .\r\r
-                                    })\r\r
-                                    Break\r\r
-                                }\r\r
-                                ElseIf ((_T_3 == One))\r\r
-                                {\r\r
-                                    Return (0x39)\r\r
-                                    Break\r\r
-                                }\r\r
-                                Else\r\r
-                                {\r\r
-                                    Return (Buffer (One)\r\r
-                                    {\r\r
-                                         0x00                                             // .\r\r
-                                    })\r\r
-                                    Break\r\r
-                                }\r\r
-\r\r
-                                Break\r\r
-                            }\r\r
-                        }\r\r
-                        Else\r\r
-                        {\r\r
-                            Return (Buffer (One)\r\r
-                            {\r\r
-                                 0x00                                             // .\r\r
-                            })\r\r
-                            Break\r\r
-                        }\r\r
-\r\r
-                        Break\r\r
-                    }\r\r
-                }\r\r
-\r\r
-                Method (PHYC, 0, NotSerialized)\r\r
-                {\r\r
-                    Name (CFG0, Package (0x12)\r\r
-                    {\r\r
-                        /*Package (0x03)\r\r
-                        {\r\r
-                            Zero, \r\r
-                            0x088E2198, \r\r
-                            0x20\r\r
-                        }*/\r\r
-                        \r\r
-                                               Package (0x03) { Zero, 0x088E2210, 0x23 },\r\r
-                                               Package (0x03) { Zero, 0x088E2004, 0x03 },\r\r
-                                               Package (0x03) { Zero, 0x088E218c, 0x7c },\r\r
-                                               Package (0x03) { Zero, 0x088E202c, 0x80 },\r\r
-                                               Package (0x03) { Zero, 0x088E2184, 0x0a },\r\r
-                                               Package (0x03) { Zero, 0x088E20b4, 0x19 },\r\r
-                                               Package (0x03) { Zero, 0x088E2194, 0x40 },\r\r
-                                               Package (0x03) { Zero, 0x088E2198, 0x28 },\r\r
-                                               Package (0x03) { Zero, 0x088E2214, 0x21 },\r\r
-                                               Package (0x03) { Zero, 0x088E2220, 0x00 },\r\r
-                                               Package (0x03) { Zero, 0x088E2224, 0x58 },\r\r
-                                               Package (0x03) { Zero, 0x088E2240, 0x35 },\r\r
-                                               Package (0x03) { Zero, 0x088E2244, 0x29 },\r\r
-                                               Package (0x03) { Zero, 0x088E2248, 0xca },\r\r
-                                               Package (0x03) { Zero, 0x088E224c, 0x04 },\r\r
-                                               Package (0x03) { Zero, 0x088E2250, 0x03 },\r\r
-                                               Package (0x03) { Zero, 0x088E223c, 0x00 },\r\r
-                                               Package (0x03) { Zero, 0x088E2210, 0x22 }\r\r
-                    })\r\r
-                    Return (CFG0) /* \_SB_.URS0.UFN0.PHYC.CFG0 */\r\r
-                }\r\r
-            }\r\r
-        }\r
-        \r
+                    Package (0x02)\r
+                    {\r
+                        0x00163FE3, \r
+                        0xFFFFA000\r
+                    }, \r
 \r
-        Device (TSC1)\r
-        {\r
-            Name (_HID, "MSHW1003")  // _HID: Hardware ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0,\r
-                \_SB.GIO0, \r
-                \_SB.IC13\r
-            })\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    I2cSerialBusV2 (0x0020, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.IC13",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
-                    GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullUp, 0x0000,\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x007D\r
-                        }\r
-                    GpioIo (Exclusive, PullNone, 0x0000, 0x0000, IoRestrictionNone,\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0063\r
-                        }\r
-                })\r
-                Return (RBUF) /* \_SB_.TSC1._CRS.RBUF */\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0014E329, \r
+                        0xFFFFA400\r
+                    }, \r
 \r
-            /*Method (INFO, 0, NotSerialized)\r
-            {\r
-                Name (RBUF, Buffer (0x04)\r
-                {\r
-                     0x0F, 0x01, 0x00, 0x00                           // ....\r
-                })\r
-                Return (RBUF)\r
-            }*/\r
+                    Package (0x02)\r
+                    {\r
+                        0x00139DD6, \r
+                        0xFFFFA800\r
+                    }, \r
 \r
-            // PEP Proxy Support\r
-            Name (PGID, Buffer (0x0A)\r
-            {\r
-                "\\_SB.TSC1"\r
-            })                                  // Device ID buffer - PGID( Pep given ID )\r
-            Name (DBUF, Buffer (DBFL){})        // Device ID buffer - PGID( Pep given ID )\r
-            CreateByteField (DBUF, Zero, STAT)  // STATUS 1 BYTE\r
-                                                // HIDDEN 1 BYTE ( SIZE )\r
-            CreateByteField (DBUF, 0x02, DVAL)  // Packet value, 1 BYTES Device Status\r
-            CreateField (DBUF, 0x18, 0xA0, DEID)// Device ID, 20 BYTES(160 Bits)\r
-            Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00126E37, \r
+                        0xFFFFAC00\r
+                    }, \r
 \r
-            Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x001152BA, \r
+                        0xFFFFB000\r
+                    }, \r
 \r
-            Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x001049ED, \r
+                        0xFFFFB400\r
+                    }, \r
 \r
-            Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = Zero\r
-                DEID = PGID /* \_SB_.TSC1.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.TSC1.DBUF */\r
-                }\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x000F527B, \r
+                        0xFFFFB800\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000E6B27, \r
+                        0xFFFFBC00\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000D92CE, \r
+                        0xFFFFC000\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000CC863, \r
+                        0xFFFFC400\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000C0AED, \r
+                        0xFFFFC800\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000B5985, \r
+                        0xFFFFCC00\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000AB357, \r
+                        0xFFFFD000\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000A179D, \r
+                        0xFFFFD400\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000985A0, \r
+                        0xFFFFD800\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x0008FCB6, \r
+                        0xFFFFDC00\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x00087C44, \r
+                        0xFFFFE000\r
+                    }, \r
 \r
-            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = 0x03\r
-                DEID = PGID /* \_SB_.TSC1.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.TSC1.DBUF */\r
-                }\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x000803B7, \r
+                        0xFFFFE400\r
+                    }, \r
 \r
-        // CPU Aggregator Device -- Required for Thermal Parking\r
-        Device (AGR0)\r
-        {\r
-            Name (_HID, "ACPI000C" /* Processor Aggregator Device */)  // _HID: Hardware ID\r
-            Name (_PUR, Package (0x02)  // _PUR: Processor Utilization Request\r
-            {\r
-                One, \r
-                Zero\r
-            })\r
-            Method (_OST, 3, NotSerialized)  // _OST: OSPM Status Indication\r
-            {\r
-                \_SB.PEP0.ROST = Arg2\r
-            }\r
-        }\r
-        \r
-        /*Device (OPBT)\r
-        {\r
-                       Name (_HID, "OPHW1001")\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0,\r
-                \_SB.IC11\r
-            })\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    I2CSerialBus (0x55, ControllerInitiated, 100000, AddressingMode7Bit, "\\_SB.IC11", , )\r
-                })\r
-                Return (RBUF)\r
-            }\r
-        }*/\r
-        \r
-        Device (OP3P)\r
-        {\r
-            Name (_HID, "QCOM2456")\r
-            Method (_CRS, 0x0, NotSerialized) {\r
-                Name (RBUF, ResourceTemplate () {\r
-                    I2CSerialBus( 0x55, ControllerInitiated, 100000, AddressingMode7Bit, "\\_SB.IC11", , )\r
-                })\r
-                               \r
-                Return (RBUF)\r
-        }                      // Number of args in CFG0 must match value of NUM_PMIC_3P_ACPI_ARGS 10 in PmicAcpi.c\r
-            Method (PMCF) {\r
-                Name (CFG0, \r
-                Package(){\r
-                // Charger Info  \r
-                0,              // I2c Index - Resource Index\r
-                1,              // Charger IC Type - PLAT_CONFIG_CHG_IC_SMB1360\r
-                1,              // Charger Connector Type - PLAT_CONFIG_CHG_CONN_WALL            \r
-                1,              // PMIC Watch Dog Timer On - PMIC_TRUE\r
-                20,                         // PMIC Watch Dog Timer Seconds\r
-\r
-                // Gauging Info\r
-                0,              // I2c Index - Gauge Resource Index\r
-                2,              // I2c Index - Gauge GPIO Expander Resource Index\r
-                               0,                              // Gauge GPIO Expander present\r
-                1,              // Gauge IC - PM_THIRD_PARTY_GAUGE_IC_SMB1360\r
-\r
-                // Battery Info\r
-                1,               // Battery Type - PLAT_CONFIG_BATT_CELL_TYPE_1S2P   \r
-                               \r
-                               // GPIO Present\r
-                               0                               // 0- GPIO not present, 1- GPIO present\r
-                })\r
-                Return (CFG0)\r
-            }\r
-               }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00079288, \r
+                        0xFFFFE800\r
+                    }, \r
 \r
-        ThermalZone (TZ0)\r
-        {\r
-            Name (_HID, "QCOM02B0")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x04)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU0, \r
-                \_SB.SYSM.CLUS.CPU1, \r
-                \_SB.SYSM.CLUS.CPU2, \r
-                \_SB.SYSM.CLUS.CPU3\r
-            })\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0007283A, \r
+                        0xFFFFEC00\r
+                    }, \r
 \r
-        ThermalZone (TZ1)\r
-        {\r
-            Name (_HID, "QCOM02B0")  // _HID: Hardware ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.PEP0\r
-            })\r
-            Name (TPSV, 0x0EF6)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ1.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0006C458, \r
+                        0xFFFFF000\r
+                    }, \r
 \r
-            Name (_MTL, 0x14)  // _MTL: Minimum Throttle Limit\r
-            Name (TTC1, Zero)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ1.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00066678, \r
+                        0xFFFFF400\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ1.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00060E33, \r
+                        0xFFFFF800\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ1.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0005BB2D, \r
+                        0xFFFFFC00\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00056D0E, \r
+                        Zero\r
+                    }, \r
 \r
-        ThermalZone (TZ2)\r
-        {\r
-            Name (_HID, "QCOM02B1")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x04)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7\r
-            })\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00052387, \r
+                        0x0400\r
+                    }, \r
 \r
-        ThermalZone (TZ3)\r
-        {\r
-            Name (_HID, "QCOM02B1")  // _HID: Hardware ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.PEP0\r
-            })\r
-            Name (TPSV, 0x0EF6)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ3.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0004DE4C, \r
+                        0x0800\r
+                    }, \r
 \r
-            Name (TTC1, Zero)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ3.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00049D17, \r
+                        0x0C00\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ3.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00045FA6, \r
+                        0x1000\r
+                    }, \r
 \r
-            Name (TTSP, One)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ3.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x000425BE, \r
+                        0x1400\r
+                    }, \r
 \r
-            Name (_MTL, 0x14)  // _MTL: Minimum Throttle Limit\r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0003EF25, \r
+                        0x1800\r
+                    }, \r
 \r
-        ThermalZone (TZ20)\r
-        {\r
-            Name (_HID, "QCOM02AB")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                //\_SB.SYSM.CLUS.CPU6\r
-//#if 0\r
-                \_SB.GPU0\r
-//#endif\r
-            })\r
-            Name (TPSV, 0x0E60)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ20.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0003BBA6, \r
+                        0x1C00\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ20.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00038B11, \r
+                        0x2000\r
+                    }, \r
 \r
-            Name (TTC2, 0x02)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ20.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00035D37, \r
+                        0x2400\r
+                    }, \r
 \r
-            Name (TTSP, 0x02)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ20.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x000331EE, \r
+                        0x2800\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0003090E, \r
+                        0x2C00\r
+                    }, \r
 \r
-        ThermalZone (TZ21)\r
-        {\r
-            Name (_HID, "QCOM02AC")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x1) //(0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                               //\_SB.SYSM.CLUS.CPU6\r
-//#if 0\r
-                \_SB.GPU0\r
-//#endif\r
-            })\r
-            Name (TPSV, 0x0E60)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ21.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0002E270, \r
+                        0x3000\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ21.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0002BDF2, \r
+                        0x3400\r
+                    }, \r
 \r
-            Name (TTC2, 0x02)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ21.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00029B74, \r
+                        0x3800\r
+                    }, \r
 \r
-            Name (TTSP, 0x02)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ21.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00027AD7, \r
+                        0x3C00\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00025BFE, \r
+                        0x4000\r
+                    }, \r
 \r
+                    Package (0x02)\r
+                    {\r
+                        0x00023ECE, \r
+                        0x4400\r
+                    }, \r
 \r
-        ThermalZone (TZ32)\r
-        {\r
-            Name (_HID, "QCOM02C9")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01) //(0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                               //\_SB.SYSM.CLUS.CPU6\r
-                \_SB.GPU0.AVS0\r
-            })\r
-            Name (TPSV, 0x0E60)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ32.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0002232F, \r
+                        0x4800\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ32.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00020909, \r
+                        0x4C00\r
+                    }, \r
 \r
-            Name (TTC2, 0x02)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ32.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0001F046, \r
+                        0x5000\r
+                    }, \r
 \r
-            Name (TTSP, 0x0A)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ32.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0001D8D2, \r
+                        0x5400\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0001C298, \r
+                        0x5800\r
+                    }, \r
 \r
-        ThermalZone (TZ33)\r
-        {\r
-            Name (_HID, "QCOM02CB")  // _HID: Hardware ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.AMSS\r
-            })\r
-            Name (TPSV, 0x0E60)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ33.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0001AD88, \r
+                        0x5C00\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ33.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00019990, \r
+                        0x6000\r
+                    }, \r
 \r
-            Name (TTC2, 0x02)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ33.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x000186A0, \r
+                        0x6400\r
+                    }, \r
 \r
-            Name (TTSP, 0x0A)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ33.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x000174AA, \r
+                        0x6800\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0001639E, \r
+                        0x6C00\r
+                    }, \r
 \r
-        ThermalZone (TZ36)\r
-        {\r
-            Name (_HID, "QCOM029E")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x08)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU0, \r
-                \_SB.SYSM.CLUS.CPU1, \r
-                \_SB.SYSM.CLUS.CPU2, \r
-                \_SB.SYSM.CLUS.CPU3, \r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7//, \r
-                //\_SB.PMBM\r
-            })\r
-            Name (TPSV, 0x0EC4)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ36.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00015371, \r
+                        0x7000\r
+                    }, \r
 \r
-            Name (TTC1, 0x04)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ36.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00014415, \r
+                        0x7400\r
+                    }, \r
 \r
-            Name (TTC2, 0x03)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ36.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00013580, \r
+                        0x7800\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x000127A6, \r
+                        0x7C00\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ36.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00011A7C, \r
+                        0x8000\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00010DFA, \r
+                        0x8400\r
+                    }, \r
 \r
-        ThermalZone (TZ37)\r
-        {\r
-            Name (_HID, "QCOM029E")  // _HID: Hardware ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.PEP0//, \r
-                //\_SB.PMBM\r
-            })\r
-            Name (TPSV, 0x0F8C)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ37.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x00010216, \r
+                        0x8800\r
+                    }, \r
 \r
-            Name (TCRT, 0x1054)\r
-            Method (_CRT, 0, NotSerialized)  // _CRT: Critical Temperature\r
-            {\r
-                Return (\_SB.TZ37.TCRT)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xF6C8, \r
+                        0x8C00\r
+                    }, \r
 \r
-            Name (TTC1, 0x04)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ37.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xEC07, \r
+                        0x9000\r
+                    }, \r
 \r
-            Name (TTC2, 0x03)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ37.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xE1CC, \r
+                        0x9400\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ37.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xD810, \r
+                        0x9800\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0xCECC, \r
+                        0x9C00\r
+                    }, \r
 \r
-        ThermalZone (TZ38)\r
-        {\r
-            Name (_HID, "QCOM029E")  // _HID: Hardware ID\r
-            Name (_UID, 0x02)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.PEP0\r
-            })\r
-            Method (INVT, 0, NotSerialized)\r
-            {\r
-                Return (One)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xC5F9, \r
+                        0xA000\r
+                    }, \r
 \r
-            Method (_MTL, 0, NotSerialized)  // _MTL: Minimum Throttle Limit\r
-            {\r
-                Return (0x3C)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xBD93, \r
+                        0xA400\r
+                    }, \r
 \r
-            Name (TPSV, 0x0B0E)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ38.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xB592, \r
+                        0xA800\r
+                    }, \r
 \r
-            Name (TTC1, 0x04)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ38.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xADF2, \r
+                        0xAC00\r
+                    }, \r
 \r
-            Name (TTC2, 0x03)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ38.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0xA6AE, \r
+                        0xB000\r
+                    }, \r
 \r
-            Name (TTSP, 0x0A)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ38.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x9FC1, \r
+                        0xB400\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x9927, \r
+                        0xB800\r
+                    }, \r
 \r
-        ThermalZone (TZ40)\r
-        {\r
-            Name (_HID, "QCOM02AF")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.COEX\r
-            })\r
-            Name (TPSV, 0x0DFC)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ40.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x92DB, \r
+                        0xBC00\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ40.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x8CD9, \r
+                        0xC000\r
+                    }, \r
 \r
-            Name (TTC2, 0x05)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ40.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x871E, \r
+                        0xC400\r
+                    }, \r
 \r
-            Name (TTSP, 0x1E)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ40.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x81A6, \r
+                        0xC800\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x7C6D, \r
+                        0xCC00\r
+                    }, \r
 \r
-        ThermalZone (TZ41)\r
-        {\r
-            Name (_HID, "QCOM0295")  // _HID: Hardware ID\r
-            Name (_UID, One)  // _UID: Unique ID\r
-            Name (_TSP, 0x32)  // _TSP: Thermal Sampling Period\r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x7771, \r
+                        0xD000\r
+                    }, \r
 \r
-        ThermalZone (TZ44)\r
-        {\r
-            Name (_HID, "QCOM02CC")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x04)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7\r
-            })\r
-            Name (TPSV, 0x0E60)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ44.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x72AE, \r
+                        0xD400\r
+                    }, \r
 \r
-            Name (TTC1, Zero)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ44.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x6E22, \r
+                        0xD800\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ44.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x69CA, \r
+                        0xDC00\r
+                    }, \r
 \r
-            Name (TTSP, One)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ44.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x65A4, \r
+                        0xE000\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x61AC, \r
+                        0xE400\r
+                    }, \r
 \r
-        ThermalZone (TZ99)\r
-        {\r
-            Name (_HID, "QCOM02B2")  // _HID: Hardware ID\r
-            Name (_UID, 0x64)  // _UID: Unique ID\r
-            Name (TCRT, 0x0EF6)\r
-            Method (_CRT, 0, NotSerialized)  // _CRT: Critical Temperature\r
-            {\r
-                Return (\_SB.TZ99.TCRT)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x5DE1, \r
+                        0xE800\r
+                    }, \r
 \r
-            Name (TTC1, 0x04)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ99.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x5A40, \r
+                        0xEC00\r
+                    }, \r
 \r
-            Name (TTC2, 0x03)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ99.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x56C8, \r
+                        0xF000\r
+                    }, \r
 \r
-            Name (TTSP, 0x0A)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ99.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x5377, \r
+                        0xF400\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x01)\r
-                {\r
-                    \_SB.PEP0\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x504A, \r
+                        0xF800\r
+                    }, \r
 \r
-        ThermalZone (TZ4)\r
-        {\r
-            Name (_HID, "QCOM0299")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x0A)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU0, \r
-                \_SB.SYSM.CLUS.CPU1, \r
-                \_SB.SYSM.CLUS.CPU2, \r
-                \_SB.SYSM.CLUS.CPU3, \r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7, \r
-                \_SB.GPU0.MON0, \r
-                \_SB.GPU0\r
-            })\r
-            Name (TPSV, 0x0E92)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ4.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x4D40, \r
+                        0xFC00\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ4.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x4A57, \r
+                        0x00010000\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ4.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x478E, \r
+                        0x00010400\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ4.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x44E4, \r
+                        0x00010800\r
+                    }, \r
 \r
-            Name (_MTL, 0x19)  // _MTL: Minimum Throttle Limit\r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x4256, \r
+                        0x00010C00\r
+                    }, \r
 \r
-        ThermalZone (TZ5)\r
-        {\r
-            Name (_HID, "QCOM029A")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x08)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU0, \r
-                \_SB.SYSM.CLUS.CPU1, \r
-                \_SB.SYSM.CLUS.CPU2, \r
-                \_SB.SYSM.CLUS.CPU3, \r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7\r
-            })\r
-            Name (TPSV, 0x0E92)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ5.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3FE3, \r
+                        0x00011000\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ5.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3D8B, \r
+                        0x00011400\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ5.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3B4C, \r
+                        0x00011800\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ5.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3924, \r
+                        0x00011C00\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3713, \r
+                        0x00012000\r
+                    }, \r
 \r
-        ThermalZone (TZ6)\r
-        {\r
-            Name (_HID, "QCOM029B")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x01)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.COEX\r
-            })\r
-            Name (TPSV, 0x0E92)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ6.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3518, \r
+                        0x00012400\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ6.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3332, \r
+                        0x00012800\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ6.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x3160, \r
+                        0x00012C00\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ6.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x2FA0, \r
+                        0x00013000\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x2DF2, \r
+                        0x00013400\r
+                    }, \r
 \r
-        ThermalZone (TZ7)\r
-        {\r
-            Name (_HID, "QCOM029C")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x08)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU0, \r
-                \_SB.SYSM.CLUS.CPU1, \r
-                \_SB.SYSM.CLUS.CPU2, \r
-                \_SB.SYSM.CLUS.CPU3, \r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7\r
-            })\r
-            Name (TCRT, 0x0DCA)\r
-            Method (_CRT, 0, NotSerialized)  // _CRT: Critical Temperature\r
-            {\r
-                Return (\_SB.TZ7.TCRT)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x2C56, \r
+                        0x00013800\r
+                    }, \r
 \r
-            Name (TPSV, 0x0DC0)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ7.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x2ACA, \r
+                        0x00013C00\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ7.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x294E, \r
+                        0x00014000\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ7.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x27E1, \r
+                        0x00014400\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ7.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x2682, \r
+                        0x00014800\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x2531, \r
+                        0x00014C00\r
+                    }, \r
 \r
-        ThermalZone (TZ8)\r
-        {\r
-            Name (_HID, "QCOM029D")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x0A)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU0, \r
-                \_SB.SYSM.CLUS.CPU1, \r
-                \_SB.SYSM.CLUS.CPU2, \r
-                \_SB.SYSM.CLUS.CPU3, \r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7, \r
-                \_SB.GPU0.MON0, \r
-                \_SB.GPU0\r
-            })\r
-            Name (TPSV, 0x0E92)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ8.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x23ED, \r
+                        0x00015000\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ8.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x22B6, \r
+                        0x00015400\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ8.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x218B, \r
+                        0x00015800\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ8.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x206B, \r
+                        0x00015C00\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Name (_MTL, 0x19)  // _MTL: Minimum Throttle Limit\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1F57, \r
+                        0x00016000\r
+                    }, \r
 \r
-        ThermalZone (TZ9)\r
-        {\r
-            Name (_HID, "QCOM029F")  // _HID: Hardware ID\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Name (_TZD, Package (0x0A)  // _TZD: Thermal Zone Devices\r
-            {\r
-                \_SB.SYSM.CLUS.CPU0, \r
-                \_SB.SYSM.CLUS.CPU1, \r
-                \_SB.SYSM.CLUS.CPU2, \r
-                \_SB.SYSM.CLUS.CPU3, \r
-                \_SB.SYSM.CLUS.CPU4, \r
-                \_SB.SYSM.CLUS.CPU5, \r
-                \_SB.SYSM.CLUS.CPU6, \r
-                \_SB.SYSM.CLUS.CPU7, \r
-                \_SB.GPU0.MON0, \r
-                \_SB.GPU0\r
-            })\r
-            Name (TPSV, 0x0E92)\r
-            Method (_PSV, 0, NotSerialized)  // _PSV: Passive Temperature\r
-            {\r
-                Return (\_SB.TZ9.TPSV)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1E4D, \r
+                        0x00016400\r
+                    }, \r
 \r
-            Name (TTC1, One)\r
-            Method (_TC1, 0, NotSerialized)  // _TC1: Thermal Constant 1\r
-            {\r
-                Return (\_SB.TZ9.TTC1)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1D4D, \r
+                        0x00016800\r
+                    }, \r
 \r
-            Name (TTC2, One)\r
-            Method (_TC2, 0, NotSerialized)  // _TC2: Thermal Constant 2\r
-            {\r
-                Return (\_SB.TZ9.TTC2)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1C56, \r
+                        0x00016C00\r
+                    }, \r
 \r
-            Name (TTSP, 0x32)\r
-            Method (_TSP, 0, NotSerialized)  // _TSP: Thermal Sampling Period\r
-            {\r
-                Return (\_SB.TZ9.TTSP)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1B69, \r
+                        0x00017000\r
+                    }, \r
 \r
-            Name (_TZP, Zero)  // _TZP: Thermal Zone Polling\r
-            Name (_MTL, 0x19)  // _MTL: Minimum Throttle Limit\r
-            Method (_DEP, 0, NotSerialized)  // _DEP: Dependencies\r
-            {\r
-                Return (Package (0x02)\r
-                {\r
-                    \_SB.PEP0, \r
-                    \_SB.ADC1\r
-                })\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1A85, \r
+                        0x00017400\r
+                    }, \r
 \r
-        Name (HWNH, Zero)\r
-        Name (HWNL, Zero)\r
-        //\r
-        //HWN Haptics\r
-        //\r
-        Device (HWN1)\r
-        {\r
-            Name (_HID, "QCOM02A9")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                If ((\_SB.HWNH == Zero))\r
-                {\r
-                    Return (Zero)\r
-                }\r
-                Else\r
-                {\r
-                    Return (0x0F)\r
-                }\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x19AA, \r
+                        0x00017800\r
+                    }, \r
 \r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PMIC\r
-            })\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    GpioInt (Level, ActiveHigh, Exclusive, PullNone, 0x0000,\r
-                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0190\r
-                        }\r
-                })\r
-                Return (RBUF) /* \_SB_.HWN1._CRS.RBUF */\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x18D6, \r
+                        0x00017C00\r
+                    }, \r
 \r
-            Method (HAPI, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x03)\r
-                {\r
-                    One,    // Total HWN Vibs\r
-                    One,    // PMIC number PMI8998\r
-                    One     // Flag indicated wheterh to read configuration from ACPI or registry\r
-                            // 0 -> Read from registry\r
-                            // 1 -> Read from ACPI HAPC method\r
-                })\r
-                Return (CFG0) /* \_SB_.HWN1.HAPI.CFG0 */\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x180B, \r
+                        0x00018000\r
+                    }, \r
 \r
-            // Haptics configuration method\r
-            Method (HAPC, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x16)\r
-                {\r
-                    Zero, \r
-                    0x0984, \r
-                    Zero, \r
-                    One, \r
-                    One, \r
-                    One, \r
-                    One, \r
-                    Zero, \r
-                    0x04, \r
-                    One, \r
-                    0x03, \r
-                    0x14, \r
-                    One, \r
-                    0x03, \r
-                    Zero, \r
-                    Zero, \r
-                    0x06, \r
-                    Zero, \r
-                    Zero, \r
-                    0x0535, \r
-                    0x03, \r
-                    One\r
-                })\r
-                Return (CFG0) /* \_SB_.HWN1.HAPC.CFG0 */\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1747, \r
+                        0x00018400\r
+                    }, \r
 \r
-        // HWN LED\r
-        Device (HWN0)\r
-        {\r
-            Name (_HID, "QCOM02A8")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
-            {\r
-                If ((\_SB.HWNL == Zero))\r
-                {\r
-                    Return (Zero)\r
-                }\r
-                Else\r
-                {\r
-                    Return (0x0F)\r
-                }\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x168A, \r
+                        0x00018800\r
+                    }, \r
 \r
-            // ACPI method for LED Configs\r
-            Method (HWNL, 0, NotSerialized)\r
-            {\r
-                Name (CFG0, Package (0x10)\r
-                {\r
-                    One, \r
-                    0x03, \r
-                    0x019B, \r
-                    0x14, \r
-                    0x20, \r
-                    0x02, \r
-                    0x40, \r
-                    0x03, \r
-                    0x80, \r
-                    0x04, \r
-                    One, \r
-                    One, \r
-                    One, \r
-                    0x03, \r
-                    One, \r
-                    One\r
-                })\r
-                Return (CFG0) /* \_SB_.HWN0.HWNL.CFG0 */\r
-            }\r
-        }\r
-        \r
-        //       \r
-        // Modembridge Driver\r
-        //      \r
-        Device (MBRG)\r
-        {\r
-            Name (_HID, "QCOM020D")  // _HID: Hardware ID\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x15D4, \r
+                        0x00018C00\r
+                    }, \r
 \r
-        Device (CONT)\r
-        {\r
-            Name (_HID, "CONT1234")  // _HID: Hardware ID\r
-            Name (_CID, "PNP0C60" /* Display Sensor Device */)  // _CID: Compatible ID\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1524, \r
+                        0x00019000\r
+                    }, \r
 \r
-        Device (POWR)\r
-        {\r
-            Name (_HID, "POWR1234")  // _HID: Hardware ID\r
-            Name (_CID, "PNP0C40" /* Standard Button Controller */)  // _CID: Compatible ID\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x147B, \r
+                        0x00019400\r
+                    }, \r
 \r
-        Device (SVBI)\r
-        {\r
-            Name (_HID, "SAMM0901")  // _HID: Hardware ID\r
-            Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x13D8, \r
+                        0x00019800\r
+                    }, \r
 \r
-#if 0\r
-        Device (TSC1)\r
-        {\r
-            Name (_HID, "SYNP1234")  // _HID: Hardware ID\r
-            Name (_CID, "PNP0C50" /* HID Protocol Device (I2C bus) */)  // _CID: Compatible ID\r
-            Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-            Name (_HRV, One)  // _HRV: Hardware Revision\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
-            {\r
-                \_SB.GIO0, \r
-                \_SB.IC12, \r
-                \_SB.PEP0\r
-            })\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    I2cSerialBusV2 (0x0020, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.IC12",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
-                    GpioInt (Level, ActiveLow, Exclusive, PullNone, 0x0000,\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0078\r
-                        }\r
-                })\r
-                Return (RBUF) /* \_SB_.TSC1._CRS.RBUF */\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x133B, \r
+                        0x00019C00\r
+                    }, \r
 \r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
-            {\r
-                While (One)\r
-                {\r
-                    Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r
+                    Package (0x02)\r
                     {\r
-                         0x00                                             // .\r
-                    })\r
-                    CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.TSC1._DSM._T_0 */\r
-                    If ((_T_0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de") /* HID I2C Device */))\r
+                        0x12A3, \r
+                        0x0001A000\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x1211, \r
+                        0x0001A400\r
+                    }, \r
+\r
+                    Package (0x02)\r
+                    {\r
+                        0x1184, \r
+                        0x0001A800\r
+                    }, \r
+\r
+                    Package (0x02)\r
                     {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_1 = ToInteger (Arg2)\r
-                            If ((_T_1 == Zero))\r
-                            {\r
-                                While (One)\r
-                                {\r
-                                    Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                                    _T_2 = ToInteger (Arg1)\r
-                                    If ((_T_2 == One))\r
-                                    {\r
-                                        Return (Buffer (One)\r
-                                        {\r
-                                             0x03                                             // .\r
-                                        })\r
-                                    }\r
-                                    Else\r
-                                    {\r
-                                        Return (Buffer (One)\r
-                                        {\r
-                                             0x00                                             // .\r
-                                        })\r
-                                    }\r
+                        0x10FC, \r
+                        0x0001AC00\r
+                    }, \r
 \r
-                                    Break\r
-                                }\r
-                            }\r
-                            ElseIf ((_T_1 == One))\r
-                            {\r
-                                Debug = "Method _DSM Function HID"\r
-                                Return (0x20)\r
-                            }\r
-                            Else\r
-                            {\r
-                            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x1079, \r
+                        0x0001B000\r
+                    }, \r
 \r
-                            Break\r
-                        }\r
-                    }\r
-                    Else\r
+                    Package (0x02)\r
                     {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x00                                             // .\r
-                        })\r
-                    }\r
+                        0x0FFA, \r
+                        0x0001B400\r
+                    }, \r
 \r
-                    Break\r
-                }\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0F80, \r
+                        0x0001B800\r
+                    }, \r
 \r
-            Name (PGID, Buffer (0x0A)\r
-            {\r
-                "\\_SB.TSC1"\r
-            })\r
-            Name (DBUF, Buffer (DBFL){})\r
-            CreateByteField (DBUF, Zero, STAT)\r
-            CreateByteField (DBUF, 0x02, DVAL)\r
-            CreateField (DBUF, 0x18, 0xA0, DEID)\r
-            Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0F0A, \r
+                        0x0001BC00\r
+                    }, \r
 \r
-            Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0E98, \r
+                        0x0001C000\r
+                    }, \r
 \r
-            Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0E2A, \r
+                        0x0001C400\r
+                    }, \r
 \r
-            Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = Zero\r
-                DEID = PGID /* \_SB_.TSC1.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.TSC1.DBUF */\r
-                }\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0DBF, \r
+                        0x0001C800\r
+                    }, \r
 \r
-            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = 0x03\r
-                DEID = PGID /* \_SB_.TSC1.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.TSC1.DBUF */\r
-                }\r
-            }\r
-        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0D59, \r
+                        0x0001CC00\r
+                    }, \r
 \r
-        Device (PEN1)\r
-        {\r
-            Name (_HID, "WCOM0027")  // _HID: Hardware ID\r
-            Name (_CID, "PNP0C50" /* HID Protocol Device (I2C bus) */)  // _CID: Compatible ID\r
-            Name (_SUB, "C153144D")  // _SUB: Subsystem ID\r
-            Name (_HRV, One)  // _HRV: Hardware Revision\r
-            Name (_ADR, Zero)  // _ADR: Address\r
-            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
-            {\r
-                \_SB.GIO0, \r
-                \_SB.IC16, \r
-                \_SB.PEP0\r
-            })\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    I2cSerialBusV2 (0x0009, ControllerInitiated, 0x00061A80,\r
-                        AddressingMode7Bit, "\\_SB.IC16",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
-                    GpioInt (Level, ActiveLow, Exclusive, PullNone, 0x0000,\r
-                        "\\_SB.GIO0", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0077\r
-                        }\r
-                })\r
-                Return (RBUF) /* \_SB_.PEN1._CRS.RBUF */\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0CF5, \r
+                        0x0001D000\r
+                    }, \r
 \r
-            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method\r
-            {\r
-                While (One)\r
-                {\r
-                    Name (_T_0, Buffer (0x01)  // _T_x: Emitted by ASL Compiler\r
+                    Package (0x02)\r
                     {\r
-                         0x00                                             // .\r
-                    })\r
-                    CopyObject (ToBuffer (Arg0), _T_0) /* \_SB_.PEN1._DSM._T_0 */\r
-                    If ((_T_0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de") /* HID I2C Device */))\r
+                        0x0C95, \r
+                        0x0001D400\r
+                    }, \r
+\r
+                    Package (0x02)\r
                     {\r
-                        While (One)\r
-                        {\r
-                            Name (_T_1, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                            _T_1 = ToInteger (Arg2)\r
-                            If ((_T_1 == Zero))\r
-                            {\r
-                                While (One)\r
-                                {\r
-                                    Name (_T_2, 0x00)  // _T_x: Emitted by ASL Compiler\r
-                                    _T_2 = ToInteger (Arg1)\r
-                                    If ((_T_2 == One))\r
-                                    {\r
-                                        Return (Buffer (One)\r
-                                        {\r
-                                             0x03                                             // .\r
-                                        })\r
-                                    }\r
-                                    Else\r
-                                    {\r
-                                        Return (Buffer (One)\r
-                                        {\r
-                                             0x00                                             // .\r
-                                        })\r
-                                    }\r
+                        0x0C39, \r
+                        0x0001D800\r
+                    }, \r
 \r
-                                    Break\r
-                                }\r
-                            }\r
-                            ElseIf ((_T_1 == One))\r
-                            {\r
-                                Debug = "Method _DSM Function HID"\r
-                                Return (One)\r
-                            }\r
-                            Else\r
-                            {\r
-                            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0BDF, \r
+                        0x0001DC00\r
+                    }, \r
 \r
-                            Break\r
-                        }\r
-                    }\r
-                    Else\r
+                    Package (0x02)\r
                     {\r
-                        Return (Buffer (One)\r
-                        {\r
-                             0x00                                             // .\r
-                        })\r
-                    }\r
+                        0x0B88, \r
+                        0x0001E000\r
+                    }, \r
 \r
-                    Break\r
-                }\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0B34, \r
+                        0x0001E400\r
+                    }, \r
 \r
-            Name (PGID, Buffer (0x0A)\r
-            {\r
-                "\\_SB.PEN1"\r
-            })\r
-            Name (DBUF, Buffer (DBFL){})\r
-            CreateByteField (DBUF, Zero, STAT)\r
-            CreateByteField (DBUF, 0x02, DVAL)\r
-            CreateField (DBUF, 0x18, 0xA0, DEID)\r
-            Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0AE3, \r
+                        0x0001E800\r
+                    }, \r
 \r
-            Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0A95, \r
+                        0x0001EC00\r
+                    }, \r
 \r
-            Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State\r
-            {\r
-                Return (0x03)\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0A49, \r
+                        0x0001F000\r
+                    }, \r
 \r
-            Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = Zero\r
-                DEID = PGID /* \_SB_.PEN1.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.PEN1.DBUF */\r
-                }\r
-            }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0A00, \r
+                        0x0001F400\r
+                    }, \r
 \r
-            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3\r
-            {\r
-                DEID = Buffer (ESNL){}\r
-                DVAL = 0x03\r
-                DEID = PGID /* \_SB_.PEN1.PGID */\r
-                If (\_SB.ABD.AVBL)\r
-                {\r
-                    \_SB.PEP0.FLD0 = DBUF /* \_SB_.PEN1.DBUF */\r
-                }\r
-            }\r
-        }\r
-#endif\r
+                    Package (0x02)\r
+                    {\r
+                        0x09B9, \r
+                        0x0001F800\r
+                    }, \r
 \r
-        Device (BTNS)\r
-        {\r
-            Name (_HID, "ACPI0011" /* Generic Buttons Device */)  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_UID, Zero)  // _UID: Unique ID\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (RBUF, ResourceTemplate ()\r
-                {\r
-                    GpioInt (Edge, ActiveBoth, Exclusive, PullDown, 0x0010,\r
-                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0000\r
-                        }\r
-                    GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullNone, 0x000E,\r
-                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0085\r
-                        }\r
-                    GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullDown, 0x0010,\r
-                        "\\_SB.PM01", 0x00, ResourceConsumer, ,\r
-                        )\r
-                        {   // Pin list\r
-                            0x0001\r
-                        }\r
+                    Package (0x02)\r
+                    {\r
+                        0x0974, \r
+                        0x0001FC00\r
+                    }\r
                 })\r
-                Return (RBUF) /* \_SB_.BTNS._CRS.RBUF */\r
             }\r
 \r
-            Name (_DSD, Package (0x02)  // _DSD: Device-Specific Data\r
+            Method (VTCH, 0, NotSerialized)\r
             {\r
-                ToUUID ("fa6bd625-9ce8-470d-a2c7-b3ca36c4282e"), \r
-                Package (0x06)\r
+                Return (Package (0x08)\r
                 {\r
-                    // Portable Device Control Application Collection\r
-                    Package (0x05)\r
+                    Package (0x10)\r
                     {\r
+                        "VPH_PWR", \r
+                        0x83, \r
                         Zero, \r
                         One, \r
                         Zero, \r
+                        0x02, \r
                         One, \r
-                        0x0D\r
+                        0x03, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0x15F9\r
                     }, \r
 \r
-                    // Sleep\r
-                    Package (0x05)\r
+                    Package (0x10)\r
+                    {\r
+                        "PMIC_THERM", \r
+                        0x06, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0x02, \r
+                        One, \r
+                        One, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0x02, \r
+                        0xFFFF3CB0, \r
+                        0x000249F0\r
+                    }, \r
+\r
+                    Package (0x10)\r
                     {\r
+                        "SYS_THERM1", \r
+                        0x4D, \r
                         One, \r
                         Zero, \r
+                        Zero, \r
                         One, \r
                         One, \r
-                        0x81\r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0xFFFFFFD8, \r
+                        0x7D\r
                     }, \r
 \r
-                    // Volume Increment \r
-                    Package (0x05)\r
+                    Package (0x10)\r
                     {\r
+                        "SYS_THERM2", \r
+                        0x50, \r
+                        One, \r
+                        Zero, \r
+                        Zero, \r
                         One, \r
                         One, \r
                         One, \r
-                        0x0C, \r
-                        0xE9\r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0xFFFFFFD8, \r
+                        0x7D\r
                     }, \r
 \r
-                    // Volume Decrement\r
-                    Package (0x05)\r
+                    Package (0x10)\r
                     {\r
+                        "PA_THERM", \r
+                        0x52, \r
+                        One, \r
+                        Zero, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
                         One, \r
                         0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0xFFFFFFD8, \r
+                        0x7D\r
+                    }, \r
+\r
+                    Package (0x10)\r
+                    {\r
+                        "PA_THERM1", \r
+                        0x56, \r
                         One, \r
-                        0x0C, \r
-                        0xEA\r
+                        Zero, \r
+                        Zero, \r
+                        One, \r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0xFFFFFFD8, \r
+                        0x7D\r
                     }, \r
 \r
-                    Package (0x05)\r
+                    Package (0x10)\r
                     {\r
+                        "SYS_THERM3", \r
+                        0x55, \r
                         One, \r
-                        0x03, \r
+                        Zero, \r
+                        Zero, \r
                         One, \r
-                        0x90, \r
-                        0x20\r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0xFFFFFFD8, \r
+                        0x7D\r
                     }, \r
 \r
-                    Package (0x05)\r
+                    Package (0x10)\r
                     {\r
+                        "BAT_THERM", \r
+                        0x57, \r
                         One, \r
-                        0x04, \r
+                        Zero, \r
+                        Zero, \r
                         One, \r
-                        0x90, \r
-                        0x21\r
+                        One, \r
+                        One, \r
+                        0x02, \r
+                        0x000186A0, \r
+                        SYTB, \r
+                        Zero, \r
+                        Zero, \r
+                        Zero, \r
+                        0xFFFFFFD8, \r
+                        0x7D\r
                     }\r
-                }\r
-            })\r
-        }\r
-\r
-        //\r
-        //Qualcomm Diagnostic Consumer Interface\r
-        //\r
-        Device (QDCI)\r
-        {\r
-            Name (_DEP, Package (One)  // _DEP: Dependencies\r
-            {\r
-                \_SB.GLNK\r
-            })\r
-            Name (_HID, "QCOM0224")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-        }\r
-\r
-        Device (BTH0)\r
-        {\r
-            Name (_HID, "NOPE02B5")  // _HID: Hardware ID\r
-            Alias (\_SB.PSUB, _SUB)\r
-            Name (_DEP, Package (0x03)  // _DEP: Dependencies\r
-            {\r
-                \_SB.PEP0, \r
-                \_SB.PMIC, \r
-                \_SB.UAR7\r
-            })\r
-            Name (_PRW, Package (0x02)  // _PRW: Power Resources for Wake\r
-            {\r
-                Zero, \r
-                Zero\r
-            })\r
-            Name (_S4W, 0x02)  // _S4W: S4 Device Wake State\r
-            Name (_S0W, 0x02)  // _S0W: S0 Device Wake State\r
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings\r
-            {\r
-                Name (PBUF, ResourceTemplate ()\r
-                {\r
-                    UartSerialBusV2 (0x0001C200, DataBitsEight, StopBitsOne,\r
-                        0xC0, LittleEndian, ParityTypeNone, FlowControlHardware,\r
-                        0x0020, 0x0020, "\\_SB.UAR7",\r
-                        0x00, ResourceConsumer, , Exclusive,\r
-                        )\r
                 })\r
-                Return (PBUF) /* \_SB_.BTH0._CRS.PBUF */\r
             }\r
 \r
-            Method (_STA, 0, NotSerialized)  // _STA: Status\r
+            Method (VTMT, 0, NotSerialized)\r
             {\r
-                Return (0x0F)\r
+                Return (Package (0x03)\r
+                {\r
+                    0x0B, \r
+                    One, \r
+                    0x05\r
+                })\r
             }\r
         }\r
-//here\r
-\r
+#endif\r
         Device (ADC1)\r
         {\r
             Name (_DEP, Package (0x02)  // _DEP: Dependencies\r
@@ -74616,27 +69171,13 @@ DefinitionBlock ("", "DSDT", 2, "QCOMM ", "SDM850 ", 0x00000003)
 #endif\r
        }\r
 \r
-\r
     Name (WAKP, Package (0x02)\r
     {\r
         Zero, \r
         Zero\r
     })\r
-    Method (_PTS, 1, NotSerialized)  // _PTS: Prepare To Sleep\r
-    {\r
-        \_SB.ADBG (Concatenate ("_PTS:ARG0:", ToHexString (Arg0)))\r
-        \_SB.LED1.LEDR = Zero\r
-        \_SB.LID0.LIDB = One\r
-        \_SB.ADBG ("PLID1")\r
-        \_SB.ADBG (Concatenate ("_PTS:LEDR:", ToHexString (\_SB.LED1.LEDR)))\r
-        If (Arg0){}\r
-    }\r
-\r
-    Method (_WAK, 1, NotSerialized)  // _WAK: Wake\r
-    {\r
-        \_SB.ADBG (Concatenate ("_WAK:ARG0:", ToHexString (Arg0)))\r
-        \_SB.LED1.LEDR = 0x04\r
-        \_SB.ADBG (Concatenate ("_WAK:LEDR:", ToHexString (\_SB.LED1.LEDR)))\r
-        Return (WAKP) /* \WAKP */\r
-    }\r
-}
\ No newline at end of file
+\r
+\r
+\r
+}\r
+\r
index c0238d0d92d5c6ebb30e209cedddb83900bdf961..69f99dbbf622410a0f4d7005424c57000a4abac4 100644 (file)
@@ -265,11 +265,11 @@ APRIORI DXE {
     SECTION UI = "UsbPwrCtrlDxe"
   }
 
-  #FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {
-  #  SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex
-  #  SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
-  #  SECTION UI = "UsbfnDwc3Dxe"
-  #}
+  FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
+    SECTION UI = "UsbfnDwc3Dxe"
+  }
   
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
@@ -456,11 +456,11 @@ APRIORI DXE {
     SECTION UI = "UsbPwrCtrlDxe"
   }
 
-  #FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {
-  #  SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex
-  #  SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
-  #  SECTION UI = "UsbfnDwc3Dxe"
-  #}
+  FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
+    SECTION UI = "UsbfnDwc3Dxe"
+  }
   
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
@@ -491,12 +491,6 @@ APRIORI DXE {
     SECTION UI = "ButtonsDxe"
   }
 
-  #FILE DRIVER = 5af77f10-90df-4e7e-8325-a17ec09d5443 {
-  #  SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
-  #  SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
-  #  SECTION UI = "UsbMsdDxe"
-  #}
-
   FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
@@ -554,15 +548,11 @@ APRIORI DXE {
   FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {   
     SECTION RAW = sdm845Pkg/AcpiTables/testing/DBG2.aml
     SECTION RAW = sdm845Pkg/AcpiTables/845/DSDT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/CSRT.aml
+    SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/FADT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/FACS.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/GTDT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/IORT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/MCFG.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/PPTT.aml
-    # SECTION RAW = sdm845Pkg/AcpiTables/testing/TPM2.aml
     SECTION UI = "AcpiTables"
   }
 
@@ -592,6 +582,7 @@ APRIORI DXE {
   INF MdeModulePkg/Application/UiApp/UiApp.inf
   INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf
 
+
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8
 ERASE_POLARITY     = 1
index ae9b2df16343a0b1aa434e191cb4f96a2b314898..8943bebd0c9b963e5227475904ef3a3df9679da0 100644 (file)
@@ -243,6 +243,16 @@ APRIORI DXE {
     SECTION UI = "SPMI"
   }
 
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/PmicDxe/PmicDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/PmicDxe/PmicDxe.efi
@@ -261,6 +271,11 @@ APRIORI DXE {
     SECTION UI = "UsbfnDwc3Dxe"
   }
 
+  FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
+    SECTION UI = "UsbKbDxe"
+  }
+
   FILE DRIVER = cd823a4d-7dec-4531-ae5d-4134fa4127b8 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbConfigDxe/UsbConfigDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbConfigDxe/UsbConfigDxe.efi
@@ -419,6 +434,16 @@ APRIORI DXE {
     SECTION UI = "SPMI"
   }
 
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/PmicDxe/PmicDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/PmicDxe/PmicDxe.efi
@@ -437,6 +462,11 @@ APRIORI DXE {
     SECTION UI = "UsbfnDwc3Dxe"
   }
 
+  FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
+    SECTION UI = "UsbKbDxe"
+  }
+
   FILE DRIVER = cd823a4d-7dec-4531-ae5d-4134fa4127b8 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbConfigDxe/UsbConfigDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbConfigDxe/UsbConfigDxe.efi
@@ -461,12 +491,6 @@ APRIORI DXE {
     SECTION UI = "ButtonsDxe"
   }
 
-  FILE DRIVER = 5af77f10-90df-4e7e-8325-a17ec09d5443 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
-    SECTION UI = "UsbMsdDxe"
-  }
-
   FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
@@ -537,15 +561,11 @@ APRIORI DXE {
   FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {   
     SECTION RAW = sdm845Pkg/AcpiTables/testing/DBG2.aml
     SECTION RAW = sdm845Pkg/AcpiTables/845/DSDT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/CSRT.aml
+    SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/FADT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/FACS.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/GTDT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/IORT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/MCFG.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/PPTT.aml
-   # SECTION RAW = sdm845Pkg/AcpiTables/testing/TPM2.aml
     SECTION UI = "AcpiTables"
   }
 
index 757b1f4632d6f59083805550fc9566c912d40533..d663b6e049ce23186de130d2f096e8d077fd73da 100644 (file)
@@ -265,11 +265,11 @@ APRIORI DXE {
     SECTION UI = "UsbPwrCtrlDxe"\r
   }\r
 \r
-  #FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {\r
-    #SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex\r
-    #SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi\r
-    #SECTION UI = "UsbfnDwc3Dxe"\r
-  #}\r
+  FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {\r
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex\r
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi\r
+    SECTION UI = "UsbfnDwc3Dxe"\r
+  }\r
 \r
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {\r
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi\r
@@ -456,11 +456,11 @@ APRIORI DXE {
     SECTION UI = "UsbPwrCtrlDxe"\r
   }\r
 \r
# FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {\r
-   # SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex\r
-   # SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi\r
-   # SECTION UI = "UsbfnDwc3Dxe"\r
-  #}\r
+  FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {\r
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex\r
+    SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi\r
+    SECTION UI = "UsbfnDwc3Dxe"\r
+  }\r
 \r
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {\r
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi\r
@@ -491,12 +491,6 @@ APRIORI DXE {
     SECTION UI = "ButtonsDxe"\r
   }\r
 \r
-#  FILE DRIVER = 5af77f10-90df-4e7e-8325-a17ec09d5443 {\r
-#    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex\r
-#    SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi\r
-#    SECTION UI = "UsbMsdDxe"\r
-#  }\r
-\r
   FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {\r
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex\r
     SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi\r
@@ -554,15 +548,11 @@ APRIORI DXE {
   FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {   \r
     SECTION RAW = sdm845Pkg/AcpiTables/testing/DBG2.aml\r
     SECTION RAW = sdm845Pkg/AcpiTables/845/DSDT.aml\r
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/CSRT.aml\r
+    SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml\r
     SECTION RAW = sdm845Pkg/AcpiTables/testing/FADT.aml\r
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/FACS.aml\r
     SECTION RAW = sdm845Pkg/AcpiTables/testing/GTDT.aml\r
     SECTION RAW = sdm845Pkg/AcpiTables/testing/IORT.aml\r
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/MCFG.aml\r
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml\r
     SECTION RAW = sdm845Pkg/AcpiTables/testing/PPTT.aml\r
-   # SECTION RAW = sdm845Pkg/AcpiTables/testing/TPM2.aml\r
     SECTION UI = "AcpiTables"\r
   }\r
 \r