Fix audio interrupt index to make the mainline kernel driver work
[Teclast-X98-Air-3G_C6J6_custom_DSDT.git] / dsdt.dsl
index fd80b31..6d649d0 100644 (file)
--- a/dsdt.dsl
+++ b/dsdt.dsl
@@ -1023,7 +1023,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     I2C4, 
                     PEPD
                 })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -1041,7 +1041,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     DSEN = (Arg0 & 0x07)
                 }
 
-                Method (_DOD, 0, NotSerialized)  // _DOD: Display Output Devices
+                Method (_DOD, 0, Serialized)  // _DOD: Display Output Devices
                 {
                     NDID = Zero
                     If ((DIDL != Zero))
@@ -3667,10 +3667,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     _Y06)
                 Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
                 {
-                    0x0000001D,
-                }
-                Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
-                {
                     0x00000018,
                 }
                 Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
@@ -3689,6 +3685,10 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 {
                     0x0000001C,
                 }
+                Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
+                {
+                    0x0000001D,
+                }
             })
             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
             {
@@ -3727,176 +3727,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Local0 = PSAT /* \_SB_.LPEA.PSAT */
                 }
             }
-
-            Device (ADMA)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "ADMA0F28" /* Intel Audio DMA */)  // _HID: Hardware ID
-                Name (_CID, "ADMA0F28" /* Intel Audio DMA */)  // _CID: Compatible ID
-                Name (_DDN, "Intel(R) Audio  DMA0 - DMA0F28")  // _DDN: DOS Device Name
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        Return (0x0F)
-                    }
-
-                    Return (Zero)
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        Memory32Fixed (ReadWrite,
-                            0xDF498000,         // Address Base
-                            0x00001000,         // Address Length
-                            _Y07)
-                        Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
-                        {
-                            0x00000018,
-                        }
-                    })
-                    CreateDWordField (RBUF, \_SB.LPEA.ADMA._CRS._Y07._BAS, B0BA)  // _BAS: Base Address
-                    B0BA = LPE0 /* \LPE0 */
-                    Return (RBUF) /* \_SB_.LPEA.ADMA._CRS.RBUF */
-                }
-            }
-
-            Device (SSP1)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "SSPX0000" /* Intel SSP Device */)  // _HID: Hardware ID
-                Name (_CID, "SSPX0000" /* Intel SSP Device */)  // _CID: Compatible ID
-                Name (_DDN, "Intel(R) SSP Device")  // _DDN: DOS Device Name
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        Return (0x0F)
-                    }
-
-                    Return (Zero)
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        Memory32Fixed (ReadWrite,
-                            0xDF4A1000,         // Address Base
-                            0x00001000,         // Address Length
-                            _Y08)
-                        Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
-                        {
-                            0x0000001B,
-                        }
-                    })
-                    CreateDWordField (RBUF, \_SB.LPEA.SSP1._CRS._Y08._BAS, B0BA)  // _BAS: Base Address
-                    B0BA = (LPE0 + 0x000A1000)
-                    Return (RBUF) /* \_SB_.LPEA.SSP1._CRS.RBUF */
-                }
-
-                Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
-                {
-                    Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
-                    If ((Arg0 == ToUUID ("886a3f26-600c-4401-b7b1-01e9c2e7e77e")))
-                    {
-                        Return ("BLUET")
-                    }
-
-                    If ((Arg0 == ToUUID ("30d3f83e-2ee1-4bf0-86e9-f69ded2887ee")))
-                    {
-                        Return (One)
-                    }
-
-                    If ((Arg0 == ToUUID ("208b1400-f7c8-4325-ab32-53cd79b7d0a6")))
-                    {
-                        Return (0xFF2A1000)
-                    }
-
-                    If ((Arg0 == ToUUID ("e6e37c60-e78b-4fbd-bd26-5bd3667a6c9a")))
-                    {
-                        While (One)
-                        {
-                            _T_0 = ToInteger (Arg1)
-                            If ((_T_0 == 0x08))
-                            {
-                                Return (Buffer (0x05)
-                                {
-                                     0x00, 0x00, 0x00, 0x00, 0x01                     /* ..... */
-                                })
-                            }
-                            Else
-                            {
-                                If ((_T_0 == 0x10))
-                                {
-                                    Return (Buffer (0x05)
-                                    {
-                                         0x06, 0x02, 0x00, 0x0E, 0x10                     /* ..... */
-                                    })
-                                }
-                                Else
-                                {
-                                    If ((_T_0 == 0x30))
-                                    {
-                                        Return (Buffer (0x05)
-                                        {
-                                             0x06, 0x02, 0x00, 0x0E, 0x10                     /* ..... */
-                                        })
-                                    }
-                                }
-                            }
-
-                            Break
-                        }
-
-                        Return ("ERR-T")
-                    }
-
-                    Return ("ERR-M")
-                }
-            }
-        }
-
-        Device (TIMC)
-        {
-            Name (_ADR, Zero)  // _ADR: Address
-            Name (_HID, "TIMC0F28")  // _HID: Hardware ID
-            Name (_CID, "TIMC0F28")  // _CID: Compatible ID
-            Name (_DDN, "Intel(R) Audio Machine Driver - TIMC0F28")  // _DDN: DOS Device Name
-            Name (_UID, One)  // _UID: Unique ID
-            Name (_DEP, Package (0x02)  // _DEP: Dependencies
-            {
-                GPO2, 
-                ^I2C2.TTLV
-            })
-            Method (_STA, 0, NotSerialized)  // _STA: Status
-            {
-                Return (Zero)
-            }
-
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-            {
-                Name (RBUF, ResourceTemplate ()
-                {
-                    GpioInt (Edge, ActiveHigh, ExclusiveAndWake, PullNone, 0x0000,
-                        "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0004
-                        }
-                    GpioInt (Edge, ActiveHigh, ExclusiveAndWake, PullNone, 0x0000,
-                        "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x001B
-                        }
-                })
-                Return (RBUF) /* \_SB_.TIMC._CRS.RBUF */
-            }
         }
 
         Device (AMCR)
@@ -3921,7 +3751,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 Return (Zero)
             }
 
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -3959,7 +3789,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 Return (Zero)
             }
 
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -4273,6 +4103,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 PDBM &= 0xFFFFFFFFFFFFFFFD
                 MEMB = Local2
                 PDBM = Local1
+
+                Return (Zero)
             }
 
             Method (_PS3, 0, Serialized)  // _PS3: Power State 3
@@ -4346,6 +4178,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 PDBM &= 0xFFFFFFFFFFFFFFFD
                 MEMB = Local2
                 PDBM = Local1
+
+                Return (Zero)
             }
 
             Method (_DSW, 3, NotSerialized)  // _DSW: Device Sleep Wake
@@ -5274,13 +5108,13 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                         })
                         Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
                         {
-                            Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
+                            Name (T_0, Zero)  // _T_x: Emitted by ASL Compiler
                             If ((Arg0 == ToUUID ("a5fc708f-8775-4ba6-bd0c-ba90a1ec72f8")))
                             {
                                 While (One)
                                 {
-                                    _T_0 = ToInteger (Arg2)
-                                    If ((_T_0 == Zero))
+                                    T_0 = ToInteger (Arg2)
+                                    If ((T_0 == Zero))
                                     {
                                         If ((Arg1 == One))
                                         {
@@ -5299,7 +5133,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                     }
                                     Else
                                     {
-                                        If ((_T_0 == One))
+                                        If ((T_0 == One))
                                         {
                                             If ((SDGV == 0xFF))
                                             {
@@ -5312,7 +5146,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                         }
                                         Else
                                         {
-                                            If ((_T_0 == 0x02))
+                                            If ((T_0 == 0x02))
                                             {
                                                 Return (SDGV) /* \SDGV */
                                             }
@@ -5371,13 +5205,13 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                         })
                         Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
                         {
-                            Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
+                            Name (T_0, Zero)  // _T_x: Emitted by ASL Compiler
                             If ((Arg0 == ToUUID ("a5fc708f-8775-4ba6-bd0c-ba90a1ec72f8")))
                             {
                                 While (One)
                                 {
-                                    _T_0 = ToInteger (Arg2)
-                                    If ((_T_0 == Zero))
+                                    T_0 = ToInteger (Arg2)
+                                    If ((T_0 == Zero))
                                     {
                                         If ((Arg1 == One))
                                         {
@@ -5396,7 +5230,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                     }
                                     Else
                                     {
-                                        If ((_T_0 == One))
+                                        If ((T_0 == One))
                                         {
                                             If ((SDGV == 0xFF))
                                             {
@@ -5409,7 +5243,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                         }
                                         Else
                                         {
-                                            If ((_T_0 == 0x02))
+                                            If ((T_0 == 0x02))
                                             {
                                                 Return (SDGV) /* \SDGV */
                                             }
@@ -5468,13 +5302,13 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                         })
                         Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
                         {
-                            Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
+                            Name (T_0, Zero)  // _T_x: Emitted by ASL Compiler
                             If ((Arg0 == ToUUID ("a5fc708f-8775-4ba6-bd0c-ba90a1ec72f8")))
                             {
                                 While (One)
                                 {
-                                    _T_0 = ToInteger (Arg2)
-                                    If ((_T_0 == Zero))
+                                    T_0 = ToInteger (Arg2)
+                                    If ((T_0 == Zero))
                                     {
                                         If ((Arg1 == One))
                                         {
@@ -5493,7 +5327,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                     }
                                     Else
                                     {
-                                        If ((_T_0 == One))
+                                        If ((T_0 == One))
                                         {
                                             If ((SDGV == 0xFF))
                                             {
@@ -5506,7 +5340,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                         }
                                         Else
                                         {
-                                            If ((_T_0 == 0x02))
+                                            If ((T_0 == 0x02))
                                             {
                                                 Return (SDGV) /* \SDGV */
                                             }
@@ -5565,13 +5399,13 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                         })
                         Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
                         {
-                            Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
+                            Name (T_0, Zero)  // _T_x: Emitted by ASL Compiler
                             If ((Arg0 == ToUUID ("a5fc708f-8775-4ba6-bd0c-ba90a1ec72f8")))
                             {
                                 While (One)
                                 {
-                                    _T_0 = ToInteger (Arg2)
-                                    If ((_T_0 == Zero))
+                                    T_0 = ToInteger (Arg2)
+                                    If ((T_0 == Zero))
                                     {
                                         If ((Arg1 == One))
                                         {
@@ -5590,7 +5424,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                     }
                                     Else
                                     {
-                                        If ((_T_0 == One))
+                                        If ((T_0 == One))
                                         {
                                             If ((SDGV == 0xFF))
                                             {
@@ -5603,7 +5437,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                                         }
                                         Else
                                         {
-                                            If ((_T_0 == 0x02))
+                                            If ((T_0 == 0x02))
                                             {
                                                 Return (SDGV) /* \SDGV */
                                             }
@@ -6120,7 +5954,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 }
             }
 
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -6137,7 +5971,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 Return (0x0F)
             }
 
-            Method (_AEI, 0, NotSerialized)  // _AEI: ACPI Event Interrupts
+            Method (_AEI, 0, Serialized)  // _AEI: ACPI Event Interrupts
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -6241,7 +6075,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
             Name (_CID, "INT33FC" /* Intel Baytrail GPIO Controller */)  // _CID: Compatible ID
             Name (_DDN, "ValleyView General Purpose Input/Output (GPIO) controller")  // _DDN: DOS Device Name
             Name (_UID, One)  // _UID: Unique ID
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -6320,7 +6154,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
             Name (_CID, "INT33FC" /* Intel Baytrail GPIO Controller */)  // _CID: Compatible ID
             Name (_DDN, "ValleyView GPNCORE controller")  // _DDN: DOS Device Name
             Name (_UID, 0x02)  // _UID: Unique ID
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -6362,7 +6196,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                         "\\_SB.GPO1", 0x00, ResourceConsumer, ,
                         )
                         {   // Pin list
-                            0x001A
+                            0x0009
                         }
                 ), 
                 TCD3,   1
@@ -6381,7 +6215,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
             Name (_CID, "INT33FC" /* Intel Baytrail GPIO Controller */)  // _CID: Compatible ID
             Name (_DDN, "ValleyView GPSUS controller")  // _DDN: DOS Device Name
             Name (_UID, 0x03)  // _UID: Unique ID
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -6402,23 +6236,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 Return (0x0F)
             }
 
-            Method (_AEI, 0, NotSerialized)  // _AEI: ACPI Event Interrupts
+            Method (_AEI, 0, Serialized)  // _AEI: ACPI Event Interrupts
             {
-                Name (RBUF, ResourceTemplate ()
-                {
-                    GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullUp, 0x0000,
-                        "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0012
-                        }
-                    GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullUp, 0x0000,
-                        "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0002
-                        }
-                })
                 Name (FBUF, ResourceTemplate ()
                 {
                     GpioInt (Edge, ActiveBoth, SharedAndWake, PullUp, 0x0000,
@@ -8623,7 +8442,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 })
                 Name (_S4W, 0x02)  // _S4W: S4 Device Wake State
                 Name (_S0W, 0x02)  // _S0W: S0 Device Wake State
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (RBUF, ResourceTemplate ()
                     {
@@ -8672,7 +8491,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (NAM, Buffer (0x0F)
                     {
@@ -8723,7 +8542,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 })
                 Name (_S4W, 0x02)  // _S4W: S4 Device Wake State
                 Name (_S0W, 0x02)  // _S0W: S0 Device Wake State
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (RBUF, ResourceTemplate ()
                     {
@@ -9352,7 +9171,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (UBUF, ResourceTemplate ()
                     {
@@ -9390,7 +9209,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (0x0F)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (UBUF, ResourceTemplate ()
                     {
@@ -9530,7 +9349,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (UBUF, ResourceTemplate ()
                     {
@@ -9621,7 +9440,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
             {
                 Name (_HID, "AUTH2750" /* AuthenTec AES2750 */)  // _HID: Hardware ID
                 Name (_DDN, "AuthenTec AES2750")  // _DDN: DOS Device Name
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (UBUF, ResourceTemplate ()
                     {
@@ -9850,7 +9669,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     One, 
                     0x017D7840
                 })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -9889,26 +9708,25 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
 
                 Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
                 {
-                    Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler
-                    Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
+                    Name (T_1, Zero)  // _T_x: Emitted by ASL Compiler
+                    Name (T_0, Zero)  // _T_x: Emitted by ASL Compiler
                     If ((Arg0 == ToUUID ("a9240c44-f032-454d-80e5-7aeed80e9551")))
                     {
-                        CreateByteField (Arg3, Zero, FARG)
                         While (One)
                         {
-                            _T_0 = Arg2
-                            If ((_T_0 == 0x03))
+                            T_0 = Arg2
+                            If ((T_0 == 0x03))
                             {
                                 While (One)
                                 {
-                                    _T_1 = Arg3
-                                    If ((_T_1 == Zero))
+                                    T_1 = Arg3
+                                    If ((T_1 == Zero))
                                     {
                                         Return (0x11)
                                     }
                                     Else
                                     {
-                                        If ((_T_1 == 0x04))
+                                        If ((T_1 == 0x04))
                                         {
                                             Return (Buffer (0x34)
                                             {
@@ -9939,48 +9757,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 }
             }
 
-            Device (TTLV)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "10TI3100")  // _HID: Hardware ID
-                Name (_CID, "10TI3100")  // _CID: Compatible ID
-                Name (_DDN, "TI TLV320AIC3100 Codec Controller ")  // _DDN: DOS Device Name
-                Name (_UID, One)  // _UID: Unique ID
-                Name (OBJ1, Package (0x0A)
-                {
-                    One, 
-                    0x017D7840, 
-                    One, 
-                    0x97, 
-                    One, 
-                    0x86, 
-                    One, 
-                    One, 
-                    0x14, 
-                    0xB3
-                })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (SBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x0018, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C2",
-                            0x00, ResourceConsumer, ,
-                            )
-                    })
-                    Return (SBUF) /* \_SB_.I2C2.TTLV._CRS.SBUF */
-                }
-
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    Return (Zero)
-                }
-
-                Method (_DIS, 0, NotSerialized)  // _DIS: Disable Device
-                {
-                }
-            }
-
             Device (CAM1)
             {
                 Name (_ADR, Zero)  // _ADR: Address
@@ -10025,7 +9801,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -10194,7 +9970,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -10380,7 +10156,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (0x0F)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -10562,7 +10338,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -10735,7 +10511,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (0x0F)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -10908,7 +10684,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -11081,7 +10857,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -11223,7 +10999,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (0x0F)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -11332,209 +11108,61 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
             }
+        }
 
-            Device (TCS0)
+        Device (I2C3)
+        {
+            Name (_ADR, Zero)  // _ADR: Address
+            Name (_HID, "80860F41" /* Intel Baytrail I2C Host Controller */)  // _HID: Hardware ID
+            Name (_CID, "80860F41" /* Intel Baytrail I2C Host Controller */)  // _CID: Compatible ID
+            Name (_DDN, "Intel(R) I2C Controller #3 - 80860F43")  // _DDN: DOS Device Name
+            Name (_UID, 0x03)  // _UID: Unique ID
+            Name (_DEP, Package (0x01)  // _DEP: Dependencies
             {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "GODX0911")  // _HID: Hardware ID
-                Name (_CID, "PNP0C50" /* HID Protocol Device (I2C bus) */)  // _CID: Compatible ID
-                Name (_S0W, Zero)  // _S0W: S0 Device Wake State
-                Name (_DEP, Package (0x02)  // _DEP: Dependencies
-                {
-                    GPO1, 
-                    I2C5
-                })
-                Method (_PS3, 0, Serialized)  // _PS3: Power State 3
+                PEPD
+            })
+            Name (RBUF, ResourceTemplate ()
+            {
+                Memory32Fixed (ReadWrite,
+                    0x00000000,         // Address Base
+                    0x00001000,         // Address Length
+                    _Y1A)
+                Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
                 {
-                    If ((^^^I2C5.PMIC.AVBG == One)) {}
+                    0x00000022,
                 }
+                FixedDMA (0x0014, 0x0004, Width32bit, )
+                FixedDMA (0x0015, 0x0005, Width32bit, )
+            })
+            Method (_HRV, 0, NotSerialized)  // _HRV: Hardware Revision
+            {
+                Return (SOCS) /* \SOCS */
+            }
 
-                Method (_PS0, 0, Serialized)  // _PS0: Power State 0
+            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            {
+                CreateDWordField (RBUF, \_SB.I2C3._Y1A._BAS, B0BA)  // _BAS: Base Address
+                CreateDWordField (RBUF, \_SB.I2C3._Y1A._LEN, B0LN)  // _LEN: Length
+                B0BA = I30A /* \I30A */
+                B0LN = I30L /* \I30L */
+                Return (RBUF) /* \_SB_.I2C3.RBUF */
+            }
+
+            Method (_STA, 0, NotSerialized)  // _STA: Status
+            {
+                If (((I30A == Zero) || (L23D == One)))
                 {
-                    If ((^^^GPO1.AVBL == One))
-                    {
-                        ^^^GPO1.TCD3 = Zero
-                    }
+                    Return (Zero)
+                }
 
-                    Sleep (0x05)
-                    If ((^^^I2C5.PMIC.AVBG == One)) {}
-                    Sleep (0x1E)
-                    If ((^^^GPO1.AVBL == One))
-                    {
-                        ^^^GPO1.TCD3 = One
-                    }
+                Return (0x0F)
+            }
 
-                    Sleep (0x78)
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x0014, ControllerInitiated, 0x0019F0A0,
-                            AddressingMode7Bit, "\\_SB.I2C2",
-                            0x00, ResourceConsumer, ,
-                            )
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
-                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0044
-                            }
-                    })
-                    Name (ABUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x0014, ControllerInitiated, 0x0019F0A0,
-                            AddressingMode7Bit, "\\_SB.I2C2",
-                            0x00, ResourceConsumer, ,
-                            )
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
-                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0044
-                            }
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
-                            "\\_SB.GPO1", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x001A
-                            }
-                    })
-                    If ((OSSL && 0x80))
-                    {
-                        Return (ABUF) /* \_SB_.I2C2.TCS0._CRS.ABUF */
-                    }
-                    Else
-                    {
-                        Return (RBUF) /* \_SB_.I2C2.TCS0._CRS.RBUF */
-                    }
-                }
-
-                Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
-                {
-                    Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler
-                    Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
-                    Debug = "Method _DSM begin"
-                    If ((Arg0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de") /* HID I2C Device */))
-                    {
-                        While (One)
-                        {
-                            _T_0 = ToInteger (Arg2)
-                            If ((_T_0 == Zero))
-                            {
-                                While (One)
-                                {
-                                    _T_1 = ToInteger (Arg1)
-                                    If ((_T_1 == One))
-                                    {
-                                        Debug = "Method _DSM Function Query"
-                                        Return (Buffer (One)
-                                        {
-                                             0x03                                             /* . */
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                             0x00                                             /* . */
-                                        })
-                                    }
-
-                                    Break
-                                }
-                            }
-                            Else
-                            {
-                                If ((_T_0 == One))
-                                {
-                                    Debug = "Method _DSM Function HID"
-                                    Return (Zero)
-                                }
-                                Else
-                                {
-                                    Return (Zero)
-                                }
-                            }
-
-                            Break
-                        }
-                    }
-                    Else
-                    {
-                        Return (Buffer (One)
-                        {
-                             0x00                                             /* . */
-                        })
-                    }
-                }
-
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL == 0x83))
-                    {
-                        Return (0x0F)
-                    }
-
-                    Return (Zero)
-                }
-            }
-        }
-
-        Device (I2C3)
-        {
-            Name (_ADR, Zero)  // _ADR: Address
-            Name (_HID, "80860F41" /* Intel Baytrail I2C Host Controller */)  // _HID: Hardware ID
-            Name (_CID, "80860F41" /* Intel Baytrail I2C Host Controller */)  // _CID: Compatible ID
-            Name (_DDN, "Intel(R) I2C Controller #3 - 80860F43")  // _DDN: DOS Device Name
-            Name (_UID, 0x03)  // _UID: Unique ID
-            Name (_DEP, Package (0x01)  // _DEP: Dependencies
-            {
-                PEPD
-            })
-            Name (RBUF, ResourceTemplate ()
-            {
-                Memory32Fixed (ReadWrite,
-                    0x00000000,         // Address Base
-                    0x00001000,         // Address Length
-                    _Y1A)
-                Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
-                {
-                    0x00000022,
-                }
-                FixedDMA (0x0014, 0x0004, Width32bit, )
-                FixedDMA (0x0015, 0x0005, Width32bit, )
-            })
-            Method (_HRV, 0, NotSerialized)  // _HRV: Hardware Revision
-            {
-                Return (SOCS) /* \SOCS */
-            }
-
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-            {
-                CreateDWordField (RBUF, \_SB.I2C3._Y1A._BAS, B0BA)  // _BAS: Base Address
-                CreateDWordField (RBUF, \_SB.I2C3._Y1A._LEN, B0LN)  // _LEN: Length
-                B0BA = I30A /* \I30A */
-                B0LN = I30L /* \I30L */
-                Return (RBUF) /* \_SB_.I2C3.RBUF */
-            }
-
-            Method (_STA, 0, NotSerialized)  // _STA: Status
-            {
-                If (((I30A == Zero) || (L23D == One)))
-                {
-                    Return (Zero)
-                }
-
-                Return (0x0F)
-            }
-
-            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3
-            {
-                PSAT |= 0x03
-                Local0 = PSAT /* \_SB_.I2C3.PSAT */
-            }
+            Method (_PS3, 0, NotSerialized)  // _PS3: Power State 3
+            {
+                PSAT |= 0x03
+                Local0 = PSAT /* \_SB_.I2C3.PSAT */
+            }
 
             Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0
             {
@@ -11549,199 +11177,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 PSAT,   32
             }
 
-            Device (STAC)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "STAC0303")  // _HID: Hardware ID
-                Name (_CID, "INTACCL")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        If ((ACCS == 0x02))
-                        {
-                            Return (0x0F)
-                        }
-
-                        Return (Zero)
-                    }
-                    Else
-                    {
-                        Return (Zero)
-                    }
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x0019, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C3",
-                            0x00, ResourceConsumer, ,
-                            )
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.STAC._CRS.RBUF */
-                }
-            }
-
-            Device (STMA)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "STMA0303")  // _HID: Hardware ID
-                Name (_CID, "INTMAGN")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        If ((ACCS == 0x02))
-                        {
-                            Return (0x0F)
-                        }
-
-                        Return (Zero)
-                    }
-                    Else
-                    {
-                        Return (Zero)
-                    }
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x001E, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C3",
-                            0x00, ResourceConsumer, ,
-                            )
-                        GpioInt (Level, ActiveHigh, Exclusive, PullDown, 0x0000,
-                            "\\_SB.GPO0", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x005F
-                            }
-                        GpioInt (Level, ActiveHigh, Exclusive, PullDown, 0x0000,
-                            "\\_SB.GPO0", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x003A
-                            }
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.STMA._CRS.RBUF */
-                }
-            }
-
-            Device (STGY)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "STGY0320")  // _HID: Hardware ID
-                Name (_CID, "INTGYRO")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        If ((GYRS == 0x02))
-                        {
-                            Return (0x0F)
-                        }
-
-                        Return (Zero)
-                    }
-                    Else
-                    {
-                        Return (Zero)
-                    }
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x006B, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C3",
-                            0x00, ResourceConsumer, ,
-                            )
-                        GpioInt (Level, ActiveHigh, Exclusive, PullDown, 0x0000,
-                            "\\_SB.GPO0", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x005E
-                            }
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.STGY._CRS.RBUF */
-                }
-            }
-
-            Device (FUSI)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "FUSI0001")  // _HID: Hardware ID
-                Name (_CID, "INTFUSI")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    Return (Zero)
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        GpioInt (Edge, ActiveHigh, Exclusive, PullDown, 0x0000,
-                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0017
-                            }
-                        GpioInt (Edge, ActiveLow, Exclusive, PullDown, 0x0000,
-                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0006
-                            }
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.FUSI._CRS.RBUF */
-                }
-            }
-
-            Device (ALSW)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "JSA01212")  // _HID: Hardware ID
-                Name (_CID, "INTLALS")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        Return (0x0F)
-                    }
-
-                    Return (Zero)
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x0044, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C3",
-                            0x00, ResourceConsumer, ,
-                            )
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
-                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0006
-                            }
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.ALSW._CRS.RBUF */
-                }
-            }
-
             Device (SPBA)
             {
                 Name (_ADR, Zero)  // _ADR: Address
@@ -11752,7 +11187,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 {
                     If ((OSSL & 0x80))
                     {
-                        If ((ACCS == One))
+                        If (((ACCS == One) || (ACCS == 0x3)))
                         {
                             Return (0x0F)
                         }
@@ -11765,7 +11200,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     }
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (RBUF, ResourceTemplate ()
                     {
@@ -11783,115 +11218,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (RBUF) /* \_SB_.I2C3.SPBA._CRS.RBUF */
                 }
             }
-
-            Device (SPBM)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "CPAK8963")  // _HID: Hardware ID
-                Name (_CID, "INTMAGN")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        If ((ACCS == One))
-                        {
-                            Return (0x0F)
-                        }
-
-                        Return (Zero)
-                    }
-                    Else
-                    {
-                        Return (Zero)
-                    }
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x0013, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C3",
-                            0x00, ResourceConsumer, ,
-                            )
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.SPBM._CRS.RBUF */
-                }
-            }
-
-            Device (SPBG)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "BSBG0160")  // _HID: Hardware ID
-                Name (_CID, "INTGYRO")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        If ((GYRS == One))
-                        {
-                            Return (0x0F)
-                        }
-
-                        Return (Zero)
-                    }
-                    Else
-                    {
-                        Return (Zero)
-                    }
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x0068, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C3",
-                            0x00, ResourceConsumer, ,
-                            )
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.SPBG._CRS.RBUF */
-                }
-            }
-
-            Device (SAR1)
-            {
-                Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "SASX9500")  // _HID: Hardware ID
-                Name (_CID, "INTSRCL")  // _CID: Compatible ID
-                Name (_UID, One)  // _UID: Unique ID
-                Method (_STA, 0, NotSerialized)  // _STA: Status
-                {
-                    If ((OSSL & 0x80))
-                    {
-                        Return (0x0F)
-                    }
-
-                    Return (Zero)
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        GpioInt (Edge, ActiveBoth, Exclusive, PullDown, 0x0000,
-                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0013
-                            }
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
-                            "\\_SB.GPO1", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0014
-                            }
-                    })
-                    Return (RBUF) /* \_SB_.I2C3.SAR1._CRS.RBUF */
-                }
-            }
         }
 
         Device (MDM)
@@ -11910,7 +11236,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 Return (Zero)
             }
 
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (UBUF, ResourceTemplate ()
                 {
@@ -12013,8 +11339,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
             Device (TCS0)
             {
                 Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "GODX0911")  // _HID: Hardware ID
-                Name (_CID, "PNP0C50" /* HID Protocol Device (I2C bus) */)  // _CID: Compatible ID
+                Name (_HID, "GDIX1001")  // _HID: Hardware ID
+                Name (_CID, "GDIX1001" /* HID Protocol Device (I2C bus) */)  // _CID: Compatible ID
                 Name (_S0W, Zero)  // _S0W: S0 Device Wake State
                 Name (_DEP, Package (0x02)  // _DEP: Dependencies
                 {
@@ -12044,7 +11370,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Sleep (0x78)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (RBUF, ResourceTemplate ()
                     {
@@ -12052,11 +11378,11 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                             AddressingMode7Bit, "\\_SB.I2C4",
                             0x00, ResourceConsumer, ,
                             )
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
+                        GpioInt (Edge, ActiveLow, Exclusive, PullNone, 0x0000,
                             "\\_SB.GPO2", 0x00, ResourceConsumer, ,
                             )
                             {   // Pin list
-                                0x0044
+                                0x0003
                             }
                     })
                     Name (ABUF, ResourceTemplate ()
@@ -12065,17 +11391,17 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                             AddressingMode7Bit, "\\_SB.I2C4",
                             0x00, ResourceConsumer, ,
                             )
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
+                        GpioInt (Edge, ActiveLow, Exclusive, PullNone, 0x0000,
                             "\\_SB.GPO2", 0x00, ResourceConsumer, ,
                             )
                             {   // Pin list
-                                0x0044
+                                0x0003
                             }
                         GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
                             "\\_SB.GPO1", 0x00, ResourceConsumer, ,
                             )
                             {   // Pin list
-                                0x001A
+                                0x0009
                             }
                     })
                     If ((OSSL && 0x80))
@@ -12088,65 +11414,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     }
                 }
 
-                Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
-                {
-                    Name (_T_1, Zero)  // _T_x: Emitted by ASL Compiler
-                    Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
-                    Debug = "Method _DSM begin"
-                    If ((Arg0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de") /* HID I2C Device */))
-                    {
-                        While (One)
-                        {
-                            _T_0 = ToInteger (Arg2)
-                            If ((_T_0 == Zero))
-                            {
-                                While (One)
-                                {
-                                    _T_1 = ToInteger (Arg1)
-                                    If ((_T_1 == One))
-                                    {
-                                        Debug = "Method _DSM Function Query"
-                                        Return (Buffer (One)
-                                        {
-                                             0x03                                             /* . */
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                             0x00                                             /* . */
-                                        })
-                                    }
-
-                                    Break
-                                }
-                            }
-                            Else
-                            {
-                                If ((_T_0 == One))
-                                {
-                                    Debug = "Method _DSM Function HID"
-                                    Return (Zero)
-                                }
-                                Else
-                                {
-                                    Return (Zero)
-                                }
-                            }
-
-                            Break
-                        }
-                    }
-                    Else
-                    {
-                        Return (Buffer (One)
-                        {
-                             0x00                                             /* . */
-                        })
-                    }
-                }
-
                 Method (_STA, 0, NotSerialized)  // _STA: Status
                 {
                     If ((OSSL == 0x83))
@@ -12230,6 +11497,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
 
                 PSAT |= 0x03
                 Local0 = PSAT /* \_SB_.I2C5.PSAT */
+
+                Return (Zero)
             }
 
             Method (_PS0, 0, NotSerialized)  // _PS0: Power State 0
@@ -12297,7 +11566,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 {
                     I2C5
                 })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -12744,7 +12013,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 {
                     I2C5
                 })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -13193,7 +12462,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 {
                     I2C5
                 })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -13246,7 +12515,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 {
                     I2C5
                 })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -13903,7 +13172,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -14265,7 +13534,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 I2C5, 
                 ^I2C5.PMI1
             })
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (RBUF, ResourceTemplate ()
                 {
@@ -14366,39 +13635,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                             0x005F
                         }
                 })
-                Name (RBU0, ResourceTemplate ()
-                {
-                    GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullDefault, 0x0000,
-                        "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0010
-                        }
-                    GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullDefault, 0x0000,
-                        "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0015
-                        }
-                    GpioInt (Edge, ActiveBoth, Exclusive, PullDefault, 0x0000,
-                        "\\_SB.GPO0", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0001
-                        }
-                    GpioInt (Edge, ActiveBoth, Exclusive, PullDefault, 0x0000,
-                        "\\_SB.GPO0", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0000
-                        }
-                    GpioInt (Edge, ActiveBoth, Exclusive, PullDefault, 0x0000,
-                        "\\_SB.GPO0", 0x00, ResourceConsumer, ,
-                        )
-                        {   // Pin list
-                            0x0028
-                        }
-                })
                 Name (ABU0, ResourceTemplate ()
                 {
                     GpioInt (Edge, ActiveBoth, ExclusiveAndWake, PullDefault, 0x0000,
@@ -14499,13 +13735,13 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
 
             Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
             {
-                Name (_T_0, Zero)  // _T_x: Emitted by ASL Compiler
+                Name (T_0, Zero)  // _T_x: Emitted by ASL Compiler
                 If ((Arg0 == ToUUID ("dfbcf3c5-e7a5-44e6-9c1f-29c76f6e059c") /* Power Button Device */))
                 {
                     While (One)
                     {
-                        _T_0 = ToInteger (Arg2)
-                        If ((_T_0 == Zero))
+                        T_0 = ToInteger (Arg2)
+                        If ((T_0 == Zero))
                         {
                             Return (Buffer (One)
                             {
@@ -14514,7 +13750,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                         }
                         Else
                         {
-                            If ((_T_0 == One))
+                            If ((T_0 == One))
                             {
                                 Return (0x07)
                             }
@@ -14654,7 +13890,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
             Return (Zero)
         }
 
-        Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+        Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
         {
             Name (UBUF, ResourceTemplate ()
             {
@@ -16048,7 +15284,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
             }
 
             Name (CHTP, Zero)
-            Method (SBTP, 0, NotSerialized)
+            Method (SBTP, 0, Serialized)
             {
                 ADBG ("SBTP")
                 ADBG ("XP00")