From f3985488ff94158b9fb08c997a838a49d0766ee4 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Thu, 8 Oct 2020 10:07:09 +0200
Subject: [PATCH] mb/roda/rv11: 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 identical.

Change-Id: Id12c20dbe949c4badfe07578c6d202cd4cfb8191
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46211
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/roda/rv11/acpi/alsd.asl    | 12 ++++-----
 src/mainboard/roda/rv11/acpi/thermal.asl | 34 ++++++++++++------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/mainboard/roda/rv11/acpi/alsd.asl b/src/mainboard/roda/rv11/acpi/alsd.asl
index f910dc6073..b3028e3217 100644
--- a/src/mainboard/roda/rv11/acpi/alsd.asl
+++ b/src/mainboard/roda/rv11/acpi/alsd.asl
@@ -10,12 +10,12 @@ Device (ALSD)
 
 	Method (_ALI, 0, NotSerialized)  // _ALI: Ambient Light Illuminance
 	{
-		Store (\_SB.PCI0.LPCB.EC0.LUXH, Local0)
-		Or (ShiftLeft (Local0, 8), \_SB.PCI0.LPCB.EC0.LUXL, Local0)
-		Store ("-----> _ALI: ", Debug)
-		Store (Local0, Debug)
-		Store (\_SB.PCI0.LPCB.EC0.LUXH, Debug)
-		Store (\_SB.PCI0.LPCB.EC0.LUXL, Debug)
+		Local0 = \_SB.PCI0.LPCB.EC0.LUXH
+		Local0 = (Local0 << 8) | \_SB.PCI0.LPCB.EC0.LUXL
+		Debug = "-----> _ALI: "
+		Debug = Local0
+		Debug = \_SB.PCI0.LPCB.EC0.LUXH
+		Debug = \_SB.PCI0.LPCB.EC0.LUXL
 		Return (Local0)
 	}
 
diff --git a/src/mainboard/roda/rv11/acpi/thermal.asl b/src/mainboard/roda/rv11/acpi/thermal.asl
index 7f356e34b7..1d18781bb4 100644
--- a/src/mainboard/roda/rv11/acpi/thermal.asl
+++ b/src/mainboard/roda/rv11/acpi/thermal.asl
@@ -10,10 +10,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)
 	}
@@ -49,17 +49,17 @@ Scope (\_TZ)
 
 		Method (_TMP, 0, NotSerialized)  // _TMP: Temperature
 		{
-			Store (\_SB.PCI0.LPCB.EC0.CPUT, Local0)
+			Local0 = \_SB.PCI0.LPCB.EC0.CPUT
 
 			If (Local0 >= 0x80)
 			{
-				Store ("-----> CPU Temperature (INVALID): ", Debug)
-				Store (Local0, Debug)
+				Debug = "-----> CPU Temperature (INVALID): "
+				Debug = Local0
 				Return (CTOK (0))
 			}
 
-			Store ("-----> CPU Temperature: ", Debug)
-			Store (Local0, Debug)
+			Debug = "-----> CPU Temperature: "
+			Debug = Local0
 
 			Return (CTOK (Local0))
 		}
@@ -82,17 +82,17 @@ Scope (\_TZ)
 
 		Method (_TMP, 0, NotSerialized)  // _TMP: Temperature
 		{
-			Store (\_SB.PCI0.LPCB.EC0.LOCT, Local0)
+			Local0 = \_SB.PCI0.LPCB.EC0.LOCT
 
 			If (Local0 >= 0x80)
 			{
-				Store ("-----> LOC Temperature (INVALID): ", Debug)
-				Store (Local0, Debug)
+				Debug = "-----> LOC Temperature (INVALID): "
+				Debug = Local0
 				Return (CTOK (0))
 			}
 
-			Store ("-----> LOC Temperature: ", Debug)
-			Store (Local0, Debug)
+			Debug = "-----> LOC Temperature: "
+			Debug = Local0
 
 			Return (CTOK (Local0))
 		}
@@ -114,17 +114,17 @@ Scope (\_TZ)
 
 		Method (_TMP, 0, NotSerialized)  // _TMP: Temperature
 		{
-			Store (\_SB.PCI0.LPCB.EC0.OEMT, Local0)
+			Local0 = \_SB.PCI0.LPCB.EC0.OEMT
 
 			If (Local0 >= 0x80)
 			{
-				Store ("-----> OEM Temperature (INVALID): ", Debug)
-				Store (Local0, Debug)
+				Debug = "-----> OEM Temperature (INVALID): "
+				Debug = Local0
 				Return (CTOK (0))
 			}
 
-			Store ("-----> OEM Temperature: ", Debug)
-			Store (Local0, Debug)
+			Debug = "-----> OEM Temperature: "
+			Debug = Local0
 
 			Return (CTOK (Local0))
 		}