Remove extra sensor definitions

[Teclast-X98-Air-3G_C6J6_custom_DSDT.git] / dsdt.dsl

diff --git a/dsdt.dsl b/dsdt.dsl
index 7dd2477..e9c8f8b 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))
@@ -3745,22 +3745,23 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Name (RBUF, ResourceTemplate ()
                 {
-                    Name (RBUF, ResourceTemplate ()
+                    Memory32Fixed (ReadWrite,
+                        0xDF498000,         // Address Base
+                        0x00001000,         // Address Length
+                        _Y07)
+                    Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
                     {
-                        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
+                        0x00000018,
+                    }
+                })
+
+                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                {
+                    CreateDWordField (RBUF, \_SB.LPEA.ADMA._Y07._BAS, B0BA)  // _BAS: Base Address
                     B0BA = LPE0 /* \LPE0 */
-                    Return (RBUF) /* \_SB_.LPEA.ADMA._CRS.RBUF */
+                    Return (RBUF) /* \_SB_.LPEA.ADMA.RBUF */
                 }
             }
 
@@ -3781,22 +3782,23 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
 
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Name (RBUF, ResourceTemplate ()
                 {
-                    Name (RBUF, ResourceTemplate ()
+                    Memory32Fixed (ReadWrite,
+                        0xDF4A1000,         // Address Base
+                        0x00001000,         // Address Length
+                        _Y08)
+                    Interrupt (ResourceConsumer, Level, ActiveLow, Exclusive, ,, )
                     {
-                        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
+                        0x0000001B,
+                    }
+                })
+
+                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                {
+                    CreateDWordField (RBUF, \_SB.LPEA.SSP1._Y08._BAS, B0BA)  // _BAS: Base Address
                     B0BA = (LPE0 + 0x000A1000)
-                    Return (RBUF) /* \_SB_.LPEA.SSP1._CRS.RBUF */
+                    Return (RBUF) /* \_SB_.LPEA.SSP1.RBUF */
                 }
 
                 Method (_DSM, 4, Serialized)  // _DSM: Device-Specific Method
@@ -3878,7 +3880,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 ()
                 {
@@ -3921,7 +3923,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 +3961,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 +4275,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 +4350,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
@@ -6120,7 +6126,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 +6143,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 +6247,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 +6326,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 +6368,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                         "\\_SB.GPO1", 0x00, ResourceConsumer, ,
                         )
                         {   // Pin list
-                            0x001A
+                            0x0009
                         }
                 ), 
                 TCD3,   1
@@ -6381,7 +6387,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 +6408,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 +8614,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 +8663,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 +8714,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 +9343,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 +9381,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 +9521,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 +9612,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 +9841,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 ()
                     {
@@ -9893,7 +9884,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     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
@@ -9959,7 +9949,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     0x14, 
                     0xB3
                 })
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
                 {
                     Name (SBUF, ResourceTemplate ()
                     {
@@ -10025,7 +10015,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 +10184,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 +10370,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 +10552,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 +10725,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 +10898,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 +11071,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 +11213,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,154 +11322,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                     Return (Zero)
                 }
             }
-
-            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 (_S0W, Zero)  // _S0W: S0 Device Wake State
-                Name (_DEP, Package (0x02)  // _DEP: Dependencies
-                {
-                    GPO1, 
-                    I2C5
-                })
-                Method (_PS3, 0, Serialized)  // _PS3: Power State 3
-                {
-                    If ((^^^I2C5.PMIC.AVBG == One)) {}
-                }
-
-                Method (_PS0, 0, Serialized)  // _PS0: Power State 0
-                {
-                    If ((^^^GPO1.AVBL == One))
-                    {
-                        ^^^GPO1.TCD3 = Zero
-                    }
-
-                    Sleep (0x05)
-                    If ((^^^I2C5.PMIC.AVBG == One)) {}
-                    Sleep (0x1E)
-                    If ((^^^GPO1.AVBL == One))
-                    {
-                        ^^^GPO1.TCD3 = One
-                    }
-
-                    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)
@@ -11549,17 +11391,17 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "ALASKA", "A M I ", 0x00000003)
                 PSAT,   32
             }
 
-            Device (STAC)
+            Device (SPBA)
             {
                 Name (_ADR, Zero)  // _ADR: Address
-                Name (_HID, "STAC0303")  // _HID: Hardware ID
+                Name (_HID, "KXCJ9000")  // _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))
+                        If ((ACCS == One))
                         {
                             Return (0x0F)
                         }
@@ -11572,345 +11414,43 @@ 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 ()
                     {
-                        I2cSerialBus (0x0019, ControllerInitiated, 0x00061A80,
+                        I2cSerialBus (0x000F, ControllerInitiated, 0x00061A80,
                             AddressingMode7Bit, "\\_SB.I2C3",
                             0x00, ResourceConsumer, ,
                             )
+                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
+                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
+                            )
+                            {   // Pin list
+                                0x0017
+                            }
                     })
-                    Return (RBUF) /* \_SB_.I2C3.STAC._CRS.RBUF */
+                    Return (RBUF) /* \_SB_.I2C3.SPBA._CRS.RBUF */
                 }
             }
+        }
 
-            Device (STMA)
+        Device (MDM)
+        {
+            Name (_HID, EisaId ("MCD0001"))  // _HID: Hardware ID
+            Name (_CID, "MCD0001")  // _CID: Compatible ID
+            Name (CPU, "ValleyView2")
+            Name (MDMN, "XMM_6260")
+            Method (_STA, 0, NotSerialized)  // _STA: Status
             {
-                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 ((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
-                Name (_HID, "KXCJ9000")  // _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 == One))
-                        {
-                            Return (0x0F)
-                        }
-
-                        Return (Zero)
-                    }
-                    Else
-                    {
-                        Return (Zero)
-                    }
-                }
-
-                Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
-                {
-                    Name (RBUF, ResourceTemplate ()
-                    {
-                        I2cSerialBus (0x000F, ControllerInitiated, 0x00061A80,
-                            AddressingMode7Bit, "\\_SB.I2C3",
-                            0x00, ResourceConsumer, ,
-                            )
-                        GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly,
-                            "\\_SB.GPO2", 0x00, ResourceConsumer, ,
-                            )
-                            {   // Pin list
-                                0x0017
-                            }
-                    })
-                    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)
-        {
-            Name (_HID, EisaId ("MCD0001"))  // _HID: Hardware ID
-            Name (_CID, "MCD0001")  // _CID: Compatible ID
-            Name (CPU, "ValleyView2")
-            Name (MDMN, "XMM_6260")
-            Method (_STA, 0, NotSerialized)  // _STA: Status
-            {
-                If ((OSSL & 0x80))
-                {
-                    Return (0x0F)
-                }
+                    Return (0x0F)
+                }
 
                 Return (Zero)
             }
 
-            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
             {
                 Name (UBUF, ResourceTemplate ()
                 {
@@ -12044,7 +11584,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 +11592,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 +11605,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))
@@ -12230,6 +11770,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 +11839,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 +12286,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 +12735,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 +12788,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 +13445,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 +13807,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 +13908,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,
@@ -14654,7 +14163,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 +15557,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")