HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46179 )
Change subject: mb/google/slippy: Convert to ASL 2.0 syntax ......................................................................
mb/google/slippy: Convert to ASL 2.0 syntax
Change-Id: I6a0b0e53cfccc1715f236bd6700b42d1147b74b3 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/mainboard/google/slippy/acpi/platform.asl M src/mainboard/google/slippy/acpi/thermal.asl M src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl M src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl M src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl M src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl 6 files changed, 41 insertions(+), 41 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/46179/1
diff --git a/src/mainboard/google/slippy/acpi/platform.asl b/src/mainboard/google/slippy/acpi/platform.asl index 2813078..a5f343d 100644 --- a/src/mainboard/google/slippy/acpi/platform.asl +++ b/src/mainboard/google/slippy/acpi/platform.asl @@ -15,16 +15,16 @@ Method(_WAK,1) { /* Update AC status */ - Store (_SB.PCI0.LPCB.EC0.ACEX, Local0) - if (LNotEqual (Local0, \PWRS)) { - Store (Local0, \PWRS) + Local0 = _SB.PCI0.LPCB.EC0.ACEX + if (Local0 != \PWRS) { + \PWRS = Local0 Notify (_SB.PCI0.LPCB.EC0.AC, 0x80) }
/* Update LID status */ Store (_SB.PCI0.LPCB.EC0.LIDS, Local0) - if (LNotEqual (Local0, \LIDS)) { - Store (Local0, \LIDS) + if (Local0 != \LIDS) { + \LIDS = Local0 Notify (_SB.PCI0.LPCB.EC0.LID0, 0x80) }
diff --git a/src/mainboard/google/slippy/acpi/thermal.asl b/src/mainboard/google/slippy/acpi/thermal.asl index 74e73a2..838565b 100644 --- a/src/mainboard/google/slippy/acpi/thermal.asl +++ b/src/mainboard/google/slippy/acpi/thermal.asl @@ -12,7 +12,7 @@ // 1 = Start throttling Method (THRT, 1, Serialized) { - If (LEqual (Arg0, 0)) { + If (Arg0 == 0) { /* Disable Power Limit */ _SB.PCI0.MCHC.CTLD () } Else { @@ -35,10 +35,10 @@ // Convert from Degrees C to 1/10 Kelvin for ACPI Method (CTOK, 1) { // 10th of Degrees C - Multiply (Arg0, 10, Local0) + Local0 = Arg0 * 10
// Convert to Kelvin - Add (Local0, 2732, Local0) + Local0 += 2732
Return (Local0) } @@ -64,56 +64,56 @@ Method (TCHK, 0, Serialized) { // Get Temperature from TIN# set in NVS - Store (_SB.PCI0.LPCB.EC0.TINS (TMPS), Local0) + Local0 = _SB.PCI0.LPCB.EC0.TINS (TMPS)
// Check for sensor not calibrated - If (LEqual (Local0, _SB.PCI0.LPCB.EC0.TNCA)) { + If (Local0 == _SB.PCI0.LPCB.EC0.TNCA) { Return (CTOK(0)) }
// Check for sensor not present - If (LEqual (Local0, _SB.PCI0.LPCB.EC0.TNPR)) { + If (Local0 == _SB.PCI0.LPCB.EC0.TNPR) { Return (CTOK(0)) }
// Check for sensor not powered - If (LEqual (Local0, _SB.PCI0.LPCB.EC0.TNOP)) { + If (Local0 == _SB.PCI0.LPCB.EC0.TNOP) { Return (CTOK(0)) }
// Check for sensor bad reading - If (LEqual (Local0, _SB.PCI0.LPCB.EC0.TBAD)) { + If (Local0 == _SB.PCI0.LPCB.EC0.TBAD) { Return (CTOK(0)) }
// Adjust by offset to get Kelvin - Add (_SB.PCI0.LPCB.EC0.TOFS, Local0, Local0) + Local0 += _SB.PCI0.LPCB.EC0.TOFS
// Convert to 1/10 Kelvin - Multiply (Local0, 10, Local0) + Local0 *= 10 Return (Local0) }
Method (_TMP, 0, Serialized) { // Get temperature from EC in deci-kelvin - Store (TCHK (), Local0) + Local0 = TCHK ()
// Critical temperature in deci-kelvin - Store (CTOK (\TCRT), Local1) + Local1 = CTOK (\TCRT)
- If (LGreaterEqual (Local0, Local1)) { - Store ("CRITICAL TEMPERATURE", Debug) - Store (Local0, Debug) + If (Local0 >= Local1) { + Debug = "CRITICAL TEMPERATURE" + Debug = Local0
// Wait 1 second for EC to re-poll Sleep (1000)
// Re-read temperature from EC - Store (TCHK (), Local0) + Local0 = TCHK ()
- Store ("RE-READ TEMPERATURE", Debug) - Store (Local0, Debug) + Debug = "RE-READ TEMPERATURE" + Debug = Local0 }
Return (Local0) diff --git a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl index d395a31..49f146c 100644 --- a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } diff --git a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl index bf4adfd..e5af385 100644 --- a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl index 8bbb19a..5a7d294 100644 --- a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } @@ -68,7 +68,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -79,8 +79,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } @@ -119,8 +119,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TOUCHSCREEN_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } @@ -135,7 +135,7 @@
Method (_STA) { - If (LEqual (\S2EN, 1)) { + If (\S2EN == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl index bf4adfd..e5af385 100644 --- a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) }