From b1b0550175d97e19a9611894fdb6251a92b9ea9f Mon Sep 17 00:00:00 2001 From: Marijan Limov Date: Sun, 16 Jan 2022 22:02:21 +0100 Subject: [PATCH] Made code compilable with lastest iasl --- Common/pcie.asl | 2 +- Common/pcie1.asl | 2 +- Common/pmic_core.asl | 2 +- polaris/DSDT.AML | Bin 253543 -> 249561 bytes polaris/display2.asl | 16 ++- polaris/graphics.asl | 6 +- polaris/nfc.asl | 327 ++++++++++++++++++++++++------------------- 7 files changed, 201 insertions(+), 154 deletions(-) diff --git a/Common/pcie.asl b/Common/pcie.asl index 10503a5..d725d1d 100644 --- a/Common/pcie.asl +++ b/Common/pcie.asl @@ -755,7 +755,7 @@ Device (PCI0) { If(LNotEqual(And(SUPP, 0x16), 0x16)) { - And(CTRL,0x1E) // Give control of everything to the OS + And(CTRL,0x1E,CTRL) // Give control of everything to the OS //Fixed syntax. } And(CTRL,0x15,CTRL) diff --git a/Common/pcie1.asl b/Common/pcie1.asl index 0ef7bf3..e702c4b 100644 --- a/Common/pcie1.asl +++ b/Common/pcie1.asl @@ -1007,7 +1007,7 @@ Device (PCI1) { If(LNotEqual(And(SUPP, 0x16), 0x16)) { - And(CTRL,0x1E) // Give control of everything to the OS + And(CTRL,0x1E,CTRL) // Give control of everything to the OS //Fixed syntax. } And(CTRL,0x15,CTRL) diff --git a/Common/pmic_core.asl b/Common/pmic_core.asl index b99a3f8..5ee5b89 100644 --- a/Common/pmic_core.asl +++ b/Common/pmic_core.asl @@ -157,7 +157,7 @@ Device (PMAP) Device (PRTC) { Name(_HID, "ACPI000E") - Name(_DEP, Package() {"\\_SB.PMAP"}) // PRTC is dependent on PMAP which implements the RTC Functions + Name(_DEP, Package() {PMAP}) // PRTC is dependent on PMAP which implements the RTC Functions //Get the capabilities of the time and alarm device Method(_GCP) diff --git a/polaris/DSDT.AML b/polaris/DSDT.AML index df5cb954c2a1584d626de89aaabf701782657dc3..2a018e72d04011d249bd215afae79904a4f90df6 100644 GIT binary patch delta 11861 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 delta 15784 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 diff --git a/polaris/display2.asl b/polaris/display2.asl index b8724ef..c16e08d 100644 --- a/polaris/display2.asl +++ b/polaris/display2.asl @@ -17,13 +17,15 @@ Method (ROM2, 3, NotSerialized) { // PCFG is buffer name for all default panel configurations // All other dynamically detected panel configurations must not use this name //====================================================================================== - Switch ( ToInteger (Arg2) ) - { - // Default case - Default { - Store (PCFG, Local2) - } - } +// Switch ( ToInteger (Arg2) ) +// { +// // Default case +// Default { +// Store (PCFG, Local2) +// } +// } + +Store (PCFG, Local2) //It's the default above, looks like it gets run always. TAO_Croatia // Ensure offset does not exceed the buffer size // otherwise return a Null terminated buffer diff --git a/polaris/graphics.asl b/polaris/graphics.asl index e92ac7e..2055be9 100644 --- a/polaris/graphics.asl +++ b/polaris/graphics.asl @@ -1449,7 +1449,7 @@ Device (GPU0) "BANDWIDTH", // Resource Type 13, // Num P-States in Set 0, // Num CustomData fields in Set - TRUE, // Has Thermal Thresholds + "TRUE", // Has Thermal Thresholds //Put it in quotes so compiler doesn't complain. TAO_Croatia 4, // Initial P-State 3, // Stable Power P-State @@ -2962,7 +2962,7 @@ Device (GPU0) "CORE_CLOCK", // Resource Type 9, // Num P-States in Set 1, // Num CustomData fields in Set - TRUE, // Has Thermal Thresholds + "TRUE", // Has Thermal Thresholds 5, // Initial P-State 3, // Stable Power P-State @@ -3001,7 +3001,7 @@ Device (GPU0) "CORE_CLOCK", // Resource Type 2, // Num P-States in Set 1, // Num CustomData fields in Set - TRUE, // Has Thermal Thresholds + "TRUE", // Has Thermal Thresholds 0, // Initial P-State 0, // Stable Power P-State diff --git a/polaris/nfc.asl b/polaris/nfc.asl index 8445d32..6e1d4a7 100644 --- a/polaris/nfc.asl +++ b/polaris/nfc.asl @@ -1,172 +1,217 @@ -// -// NFC entry. -// -Device(NFCD) +Device (NFCD) { - Name(_HID, "NXP1001") - Name(_CID, "ACPI\NXP1001") - Alias(\_SB.PSUB, _SUB) - Name(_CRS, ResourceTemplate() + Name (_HID, "NXP1001") // _HID: Hardware ID + Name (_CID, "ACPI\NXP1001") // _CID: Compatible ID + Alias (\_SB.PSUB, _SUB) + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { - I2CSerialBus(0x28, ControllerInitiated, 400000, AddressingMode7Bit, "\\_SB.I2C4", 0, ResourceConsumer, , ) - GpioInt(Level, ActiveHigh, Exclusive, PullDefault, 0, "\\_SB.GIO0", 0, ResourceConsumer, , ) {63} + I2cSerialBusV2 (0x0028, ControllerInitiated, 0x00061A80, + AddressingMode7Bit, "\\_SB.I2C4", + 0x00, ResourceConsumer, , Exclusive, + ) + GpioInt (Level, ActiveHigh, Exclusive, PullDefault, 0x0000, + "\\_SB.GIO0", 0x00, ResourceConsumer, , + ) + { // Pin list + 0x003F + } }) // ESE SPI GPIO - Name(NFCS, ResourceTemplate() + Name (NFCS, ResourceTemplate () { - GpioIO(Exclusive, PullDefault, 0, 0, IoRestrictionNone, "\\_SB.GIO0", 0, ResourceConsumer, , ) {116} + GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionNone, + "\\_SB.GIO0", 0x00, ResourceConsumer, , + ) + { // Pin list + 0x0074 + } }) // NFCC VEN GPIO - Name(NFCP, ResourceTemplate() + Name (NFCP, ResourceTemplate () { - GpioIO(Exclusive, PullDefault, 0, 0, IoRestrictionNone, "\\_SB.GIO0", 0, ResourceConsumer, , ) {12} - }) - Scope(GIO0) - { - OperationRegion(NFPO, GeneralPurposeIO, Zero, One) - } - Field(\_SB_.GIO0.NFPO, ByteAcc, NoLock, Preserve) - { - Connection(\_SB_.NFCD.NFCP), - MGPE, 1 - } - Method(POON, 0x0, NotSerialized) - { - Store(One, MGPE) - } - Method(POOF, 0x0, NotSerialized) - { - Store(Zero, MGPE) + GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionNone, + "\\_SB.GIO0", 0x00, ResourceConsumer, , + ) + { // Pin list + 0x000C } + }) + Scope (GIO0) + { + OperationRegion (NFPO, GeneralPurposeIo, Zero, One) + } + + Field (\_SB.GIO0.NFPO, ByteAcc, NoLock, Preserve) + { + Connection (\_SB.NFCD.NFCP), + MGPE, 1 + } + + Method (POON, 0, NotSerialized) + { + MGPE = One + } + + Method (POOF, 0, NotSerialized) + { + MGPE = Zero + } //NFCC FW DOWNLOAD GPIO - Name(NFCF, ResourceTemplate() + Name (NFCF, ResourceTemplate () { - GpioIO(Exclusive, PullDefault, 0, 0, IoRestrictionNone, "\\_SB.GIO0", 0, ResourceConsumer, , ) {88} // Download + GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionNone, + "\\_SB.GIO0", 0x00, ResourceConsumer, , + ) + { // Pin list + 0x0058 + } }) - Scope(GIO0) - { - OperationRegion(NFFO, GeneralPurposeIO, Zero, One) - } - Field(\_SB_.GIO0.NFFO, ByteAcc, NoLock, Preserve) + Scope (GIO0) + { + OperationRegion (NFFO, GeneralPurposeIo, Zero, One) + } + + Field (\_SB.GIO0.NFFO, ByteAcc, NoLock, Preserve) + { + Connection (\_SB.NFCD.NFCF), + MGFE, 1 + } + + Method (FWON, 0, NotSerialized) + { + MGFE = One + } + + Method (FWOF, 0, NotSerialized) + { + MGFE = Zero + } + + Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method + { + Debug = "Method NFC _DSM begin" + If ((Arg0 == ToUUID ("a2e7f6c4-9638-4485-9f12-6b4e20b60d63") /* Unknown UUID */)) { - Connection(\_SB_.NFCD.NFCF), - MGFE, 1 - } - Method(FWON, 0x0, NotSerialized) + If ((Arg2 == Zero)) { - Store(One, MGFE) - } - Method(FWOF, 0x0, NotSerialized) - { - Store(Zero, MGFE) + Debug = "Method NFC _DSM QUERY" + If ((Arg1 == One)) + { + \_SB.NFCD.POOF () + Sleep (0x14) + Return (Buffer (One) + { + 0x0F // . + }) + } } - Method(_DSM, 0x4, NotSerialized) + + If ((Arg2 == 0x02)) { - Store("Method NFC _DSM begin", Debug) - If(LEqual(Arg0, Buffer(0x10) + Debug = "Method NFC _DSM SETPOWERMODE" + If ((Arg3 == One)) { - 0xc4, 0xf6, 0xe7, 0xa2, 0x38, 0x96, 0x85, 0x44, 0x9f, 0x12, 0x6b, 0x4e, - 0x20, 0xb6, 0x0d, 0x63 - })) + \_SB.NFCD.POON () + Sleep (0x14) + } + + If ((Arg3 == Zero)) { - If(LEqual(Arg2, Zero)) - { - Store("Method NFC _DSM QUERY", Debug) - If(LEqual(Arg1, One)) - { - \_SB_.NFCD.POOF() - Sleep(0x14) - Return(Buffer(One) - { - 0x0f - }) - } - } - If(LEqual(Arg2, 0x2)) - { - Store("Method NFC _DSM SETPOWERMODE", Debug) - If(LEqual(Arg3, One)) - { - \_SB_.NFCD.POON() - Sleep(0x14) - } - If(LEqual(Arg3, Zero)) - { - \_SB_.NFCD.POOF() - Sleep(0x14) - } - } - If(LEqual(Arg2, One)) - { - Store("Method NFC _DSM SETFWMODE", Debug) + \_SB.NFCD.POOF () + Sleep (0x14) + } + } + + If ((Arg2 == One)) + { + Debug = "Method NFC _DSM SETFWMODE" // // Set the firmware mode to ON. // - If(LEqual(Arg3, One)) - { - \_SB_.NFCD.FWON() + If ((Arg3 == One)) + { + \_SB.NFCD.FWON () // // Provide any delay required by the controller before toggling the power GPIO line. // - Sleep(0x14) - \_SB_.NFCD.POOF() - Sleep(0x14) - \_SB_.NFCD.POON() - Sleep(0x14) - } + Sleep (0x14) + \_SB.NFCD.POOF () + Sleep (0x14) + \_SB.NFCD.POON () + Sleep (0x14) + } // // Set the firmware mode to OFF. // - If(LEqual(Arg3, Zero)) - { - \_SB_.NFCD.FWOF() - Sleep(0x14) - \_SB_.NFCD.POOF() - Sleep(0x14) - \_SB_.NFCD.POON() - Sleep(0x14) - } - } - If(LEqual(Arg2, 0x3)) - { - Store("Method NFC _DSM EEPROM Config", Debug) - Return(Buffer(0x13) - { - 0x9c, 0x1f, 0x38, 0x19, 0xa8, 0xb9, 0x4b, 0xab, 0xa1, 0xba, 0xd0, 0x20, - 0x76, 0x88, 0x2a, 0xe0, 0x03, 0x01, 0x11 - }) - } + If ((Arg3 == Zero)) + { + \_SB.NFCD.FWOF () + Sleep (0x14) + \_SB.NFCD.POOF () + Sleep (0x14) + \_SB.NFCD.POON () + Sleep (0x14) } } -//PEP Proxy Support - Name(PGID, Buffer(10) {"\\_SB.NFCD"}) // Device ID buffer - PGID( Pep given ID ) - Name(DBUF, Buffer(DBFL) {}) // Device ID buffer - PGID( Pep given ID ) - CreateByteField(DBUF, 0x0, STAT) // STATUS 1 BYTE - // HIDDEN 1 BYTE ( SIZE ) - CreateByteField(DBUF, 2, DVAL ) // Packet value, 1 BYTES Device Status - CreateField(DBUF, 24, 160, DEID) // Device ID, 20 BYTES(160 Bits) - Method (_S1D, 0) { Return (3) } // S1 => D3 - Method (_S2D, 0) { Return (3) } // S2 => D3 - Method (_S3D, 0) { Return (3) } // S3 => D3 - - Method(_PS0, 0x0, NotSerialized) - { - Store(Buffer(ESNL){}, DEID) - Store(0, DVAL) - Store(PGID, DEID) - If(\_SB.ABD.AVBL) - { - Store(DBUF, \_SB.PEP0.FLD0) - } - } - Method(_PS3, 0x0, NotSerialized) + + If ((Arg2 == 0x03)) { - Store(Buffer(ESNL){}, DEID) - Store(3, DVAL) - Store(PGID, DEID) - If(\_SB.ABD.AVBL) - { - Store(DBUF, \_SB.PEP0.FLD0) - } + Debug = "Method NFC _DSM EEPROM Config" + Return (Buffer (0x13) + { + /* 0000 */ 0x9C, 0x1F, 0x38, 0x19, 0xA8, 0xB9, 0x4B, 0xAB, // ..8...K. + /* 0008 */ 0xA1, 0xBA, 0xD0, 0x20, 0x76, 0x88, 0x2A, 0xE0, // ... v.*. + /* 0010 */ 0x03, 0x01, 0x11 // ... + }) } -} + } + } +//PEP Proxy Support + Name (PGID, Buffer (0x0A) // Device ID buffer - PGID( Pep given ID ) + { + "\\_SB.NFCD" + }) + Name (DBUF, Buffer (DBFL) {}) // Device ID buffer - PGID( Pep given ID ) + CreateByteField (DBUF, Zero, STAT) // STATUS 1 BYTE + // HIDDEN 1 BYTE ( SIZE ) + CreateByteField (DBUF, 0x02, DVAL) // Packet value, 1 BYTES Device Status + CreateField (DBUF, 0x18, 0xA0, DEID)// Device ID, 20 BYTES(160 Bits) + + // Sets all sleep states to D3 + Method (_S1D, 0, NotSerialized) // _S1D: S1 Device State + { + Return (0x03) + } + + Method (_S2D, 0, NotSerialized) // _S2D: S2 Device State + { + Return (0x03) + } + + Method (_S3D, 0, NotSerialized) // _S3D: S3 Device State + { + Return (0x03) + } + + Method (_PS0, 0, NotSerialized) // _PS0: Power State 0 + { + DEID = Buffer (ESNL) {} + DVAL = Zero + DEID = PGID /* \_SB_.NFCD.PGID */ + If (\_SB.ABD.AVBL) + { + \_SB.PEP0.FLD0 = DBUF /* \_SB_.NFCD.DBUF */ + } + } + + Method (_PS3, 0, NotSerialized) // _PS3: Power State 3 + { + DEID = Buffer (ESNL) {} + DVAL = 0x03 + DEID = PGID /* \_SB_.NFCD.PGID */ + If (\_SB.ABD.AVBL) + { + \_SB.PEP0.FLD0 = DBUF /* \_SB_.NFCD.DBUF */ + } + } +} \ No newline at end of file -- 2.45.2