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

Generated 'build/dsdt.dsl' files are same.

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

(limited to 'src')

diff --git a/src/mainboard/google/butterfly/acpi/mainboard.asl b/src/mainboard/google/butterfly/acpi/mainboard.asl
index 02ef905299..3552e29ad8 100644
--- a/src/mainboard/google/butterfly/acpi/mainboard.asl
+++ b/src/mainboard/google/butterfly/acpi/mainboard.asl
@@ -8,7 +8,7 @@ Scope (\_SB) {
 		Name (_HID, EisaId("PNP0C0D"))
 		Method (_LID, 0)
 		{
-			Store (\_SB.PCI0.LPCB.EC0.LIDF, \LIDS)
+			\LIDS = \_SB.PCI0.LPCB.EC0.LIDF
 			Return (\LIDS)
 		}
 	}
diff --git a/src/mainboard/google/butterfly/acpi/platform.asl b/src/mainboard/google/butterfly/acpi/platform.asl
index f59e48508a..7c8a815246 100644
--- a/src/mainboard/google/butterfly/acpi/platform.asl
+++ b/src/mainboard/google/butterfly/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 (\_SB.PCI0.LPCB.EC0.LIDF, Local0)
-	if (LNotEqual (Local0, \LIDS)) {
-		Store (Local0, \LIDS)
+	Local0 = \_SB.PCI0.LPCB.EC0.LIDF
+	if (Local0 != \LIDS) {
+		\LIDS = Local0
 		Notify (\_SB.LID0, 0x80)
 	}
 
diff --git a/src/mainboard/google/butterfly/acpi/thermal.asl b/src/mainboard/google/butterfly/acpi/thermal.asl
index 4c6f6d9963..ed381cdab9 100644
--- a/src/mainboard/google/butterfly/acpi/thermal.asl
+++ b/src/mainboard/google/butterfly/acpi/thermal.asl
@@ -21,10 +21,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)
 		}
@@ -50,13 +50,13 @@ Scope (\_TZ)
 		Method (_TMP, 0, Serialized)
 		{
 			// Get CPU Temperature from EC
-			Store (\_SB.PCI0.LPCB.EC0.CTMP, Local0)
+			Local0 = \_SB.PCI0.LPCB.EC0.CTMP
 
 			// Convert to 1/10 Kelvin
-			Multiply (Local0, 10, Local0)
+			Local0 *= 10
 
 			// Adjust by offset to get Kelvin
-			Add (Local0, 2732, Local0)
+			Local0 += 2732
 
 			Return (Local0)
 		}
-- 
cgit v1.2.3