From 316466b76513dad87f1b7c90eab142ddea955fcc Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Thu, 8 Oct 2020 09:33:36 +0200
Subject: mb/google/parrot: Convert to ASL 2.0 syntax
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie802b540cea13000227c969bbc262f034d1b6b84
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46177
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
---
 src/mainboard/google/parrot/acpi/mainboard.asl |  2 +-
 src/mainboard/google/parrot/acpi/platform.asl  | 12 ++++++------
 src/mainboard/google/parrot/acpi/thermal.asl   | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/mainboard/google/parrot/acpi/mainboard.asl b/src/mainboard/google/parrot/acpi/mainboard.asl
index 39a428bcef..6d5e9070fe 100644
--- a/src/mainboard/google/parrot/acpi/mainboard.asl
+++ b/src/mainboard/google/parrot/acpi/mainboard.asl
@@ -22,7 +22,7 @@ Scope (\_SB) {
 		Name(_HID, EisaId("PNP0C0D"))
 		Method(_LID, 0)
 		{
-			Store (GP15, \LIDS)
+			\LIDS = GP15
 			Return (\LIDS)
 		}
 	}
diff --git a/src/mainboard/google/parrot/acpi/platform.asl b/src/mainboard/google/parrot/acpi/platform.asl
index 2e14a71699..861ba52ff6 100644
--- a/src/mainboard/google/parrot/acpi/platform.asl
+++ b/src/mainboard/google/parrot/acpi/platform.asl
@@ -15,16 +15,16 @@ Method(_WAK,1)
 {
 	/* Update in case state changed while asleep */
 	/* Update AC status */
-	Store (\_SB.PCI0.LPCB.EC0.ADPT, Local0)
-	if (LNotEqual (Local0, \PWRS)) {
-		Store (Local0, \PWRS)
+	Local0 = \_SB.PCI0.LPCB.EC0.ADPT
+	if (Local0 != \PWRS) {
+		\PWRS = Local0
 		Notify (\_SB.PCI0.LPCB.EC0.AC, 0x80)
 	}
 
 	/* Update LID status */
-	Store (GP15, Local0)
-	if (LNotEqual (Local0, \LIDS)) {
-		Store (Local0, \LIDS)
+	Local0 = GP15
+	if (Local0 != \LIDS) {
+		\LIDS = Local0
 		Notify (\_SB.LID0, 0x80)
 	}
 
diff --git a/src/mainboard/google/parrot/acpi/thermal.asl b/src/mainboard/google/parrot/acpi/thermal.asl
index 852f58f907..2d32d47ba1 100644
--- a/src/mainboard/google/parrot/acpi/thermal.asl
+++ b/src/mainboard/google/parrot/acpi/thermal.asl
@@ -26,10 +26,10 @@ Scope (\_TZ)
 		// 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)
 		}
@@ -55,23 +55,23 @@ Scope (\_TZ)
 		Method (_TMP, 0, Serialized)
 		{
 			// Get CPU Temperature from the Embedded Controller
-			Store (\_SB.PCI0.LPCB.EC0.CTMP, Local0)
+			Local0 = \_SB.PCI0.LPCB.EC0.CTMP
 
 			// Re-read from EC if the temperature is very high to
 			// avoid OS shutdown if we got a bad reading.
-			If (LGreaterEqual (Local0, \TCRT)) {
-				Store (\_SB.PCI0.LPCB.EC0.CTMP, Local0)
-				If (LGreaterEqual (Local0, \TCRT)) {
+			If (Local0 >= \TCRT) {
+				Local0 = \_SB.PCI0.LPCB.EC0.CTMP
+				If (Local0 >= \TCRT) {
 					// Check if this is an early read
-					If (LLess (CRDC, IRDC)) {
-						Store (0, Local0)
+					If (CRDC < IRDC) {
+						Local0 = 0
 					}
 				}
 			}
 
 			// Keep track of first few reads by the OS
-			If (LLess (CRDC, IRDC)) {
-				Increment (CRDC)
+			If (CRDC < IRDC) {
+				CRDC++
 			}
 
 			Return (CTOK (Local0))
-- 
cgit v1.2.3