mb/google/auron: Convert to ASL 2.0 syntax

Built google/auron (Lulu) provides identical 'dsdt.dsl' files.

Change-Id: I5728b220e88d4105fcf6e5cee78662bc80fa01d7
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46169
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>

8 files changed, 60 insertions, 60 deletions

diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl
index 746efa2483..1be0a47218 100644
--- a/src/mainboard/google/auron/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/acpi/mainboard.asl
@@ -19,8 +19,8 @@ Scope (\_SB.PCI0.RP01)
 
 		Method (_DSW, 3, NotSerialized)
 		{
-			Store (BOARD_WLAN_WAKE_GPIO, Local0)
-			If (LEqual (Arg0, 1)) {
+			Local0 = BOARD_WLAN_WAKE_GPIO
+			If (Arg0 == 1) {
 				// Enable GPIO as wake source
 				\_SB.PCI0.LPCB.GPIO.GWAK (Local0)
 			}
diff --git a/src/mainboard/google/auron/acpi/thermal.asl b/src/mainboard/google/auron/acpi/thermal.asl
index 4be4fe5c2a..fd05e7350f 100644
--- a/src/mainboard/google/auron/acpi/thermal.asl
+++ b/src/mainboard/google/auron/acpi/thermal.asl
@@ -24,10 +24,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)
 		}
@@ -53,56 +53,56 @@ Scope (\_TZ)
 		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)
@@ -110,7 +110,7 @@ Scope (\_TZ)
 
 		/* CTDP Down */
 		Method (_AC0) {
-			If (LLessEqual (\FLVL, 0)) {
+			If (\FLVL <= 0) {
 				Return (CTOK (CTL_TDP_THRESHOLD_OFF))
 			} Else {
 				Return (CTOK (CTL_TDP_THRESHOLD_ON))
@@ -119,7 +119,7 @@ Scope (\_TZ)
 
 		/* CTDP Nominal */
 		Method (_AC1) {
-			If (LLessEqual (\FLVL, 1)) {
+			If (\FLVL <= 1) {
 				Return (CTOK (CTL_TDP_THRESHILD_NORMAL))
 			} Else {
 				Return (CTOK (CTL_TDP_THRESHILD_NORMAL))
@@ -132,14 +132,14 @@ Scope (\_TZ)
 		PowerResource (TNP0, 0, 0)
 		{
 			Method (_STA) {
-				If (LLessEqual (\FLVL, 0)) {
+				If (\FLVL <= 0) {
 					Return (One)
 				} Else {
 					Return (Zero)
 				}
 			}
 			Method (_ON)  {
-				Store (0, \FLVL)
+				\FLVL = 0
 
 				/* Enable Power Limit */
 				\_SB.PCI0.MCHC.CTLE (CTL_TDP_POWER_LIMIT)
@@ -147,7 +147,7 @@ Scope (\_TZ)
 				Notify (\_TZ.THRM, 0x81)
 			}
 			Method (_OFF) {
-				Store (1, \FLVL)
+				\FLVL = 1
 
 				/* Disable Power Limit */
 				\_SB.PCI0.MCHC.CTLD ()
@@ -159,18 +159,18 @@ Scope (\_TZ)
 		PowerResource (TNP1, 0, 0)
 		{
 			Method (_STA) {
-				If (LLessEqual (\FLVL, 1)) {
+				If (\FLVL <= 1) {
 					Return (One)
 				} Else {
 					Return (Zero)
 				}
 			}
 			Method (_ON)  {
-				Store (1, \FLVL)
+				\FLVL = 1
 				Notify (\_TZ.THRM, 0x81)
 			}
 			Method (_OFF) {
-				Store (1, \FLVL)
+				\FLVL = 1
 				Notify (\_TZ.THRM, 0x81)
 			}
 		}
diff --git a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl
index febaffeb25..cc26de6859 100644
--- a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl
@@ -26,7 +26,7 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -37,8 +37,8 @@ Scope (\_SB.PCI0.I2C0)
 
 		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.GPIO.GWAK (Local0)
 			}
diff --git a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl
index febaffeb25..cc26de6859 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl
@@ -26,7 +26,7 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -37,8 +37,8 @@ Scope (\_SB.PCI0.I2C0)
 
 		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.GPIO.GWAK (Local0)
 			}
diff --git a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
index b3dc42c8ae..4b0ac45c09 100644
--- a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl
@@ -24,7 +24,7 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -59,7 +59,7 @@ Scope (\_SB.PCI0.I2C1)
 
 		Method (_STA)
 		{
-			If (LEqual (\S2EN, 1)) {
+			If (\S2EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -70,8 +70,8 @@ Scope (\_SB.PCI0.I2C1)
 
 		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.GPIO.GWAK (Local0)
 			}
@@ -96,7 +96,7 @@ Scope (\_SB.PCI0.RP01)
 		{
 			Store (BUDDY_NIC_WAKE_GPIO, Local0)
 
-			If (LEqual (Arg0, 1)) {
+			If (Arg0 == 1) {
 				// Enable GPIO as wake source
 				\_SB.PCI0.LPCB.GPIO.GWAK (Local0)
 			}
diff --git a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl
index febaffeb25..cc26de6859 100644
--- a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl
@@ -26,7 +26,7 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -37,8 +37,8 @@ Scope (\_SB.PCI0.I2C0)
 
 		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.GPIO.GWAK (Local0)
 			}
diff --git a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl
index 76e1f2ec9f..35f0d3c206 100644
--- a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl
@@ -31,17 +31,17 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method(_DSM, 0x4, NotSerialized)
 		{
-			If (LEqual(Arg0, ToUUID("3CDFF6F7-4267-4555-AD05-B30A3D8938DE"))) /* I2C-HID UUID */
+			If (Arg0 == ToUUID("3CDFF6F7-4267-4555-AD05-B30A3D8938DE")) /* I2C-HID UUID */
 			{
-				If (LEqual(Arg2, Zero)) /* DSM Function */
+				If (Arg2 == 0) /* DSM Function */
 				{
 					/* Function 0: Query function, return based on revision */
-					If (LEqual(Arg1, One)) /* Arg1 DSM Revision */
+					If (Arg1 == 1) /* Arg1 DSM Revision */
 					{
 						/* Revision 1: Function 0 supported */
 						Return(Buffer(One) { 0x03 })
 					}
-				} ElseIf (LEqual(Arg2, One)) /* Function 1 : HID Function */
+				} ElseIf (Arg2 == 1) /* Function 1 : HID Function */
 				{
 					Return(0x0020) /* HID Descriptor Address */
 				}
@@ -52,7 +52,7 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -63,8 +63,8 @@ Scope (\_SB.PCI0.I2C0)
 
 		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.GPIO.GWAK (Local0)
 			}
@@ -100,7 +100,7 @@ Scope (\_SB.PCI0.I2C1)
 
 		Method (_STA)
 		{
-			If (LEqual (\S2EN, 1)) {
+			If (\S2EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -111,8 +111,8 @@ Scope (\_SB.PCI0.I2C1)
 
 		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.GPIO.GWAK (Local0)
 			}
diff --git a/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl
index 4329d5f9ab..9ca592f401 100644
--- a/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl
@@ -30,8 +30,8 @@ Scope (\_SB.PCI0.I2C0)
 
 		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.GPIO.GWAK (Local0)
 			}
@@ -39,7 +39,7 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -141,8 +141,8 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_DSW, 3, NotSerialized)
 		{
-			Store (BOARD_CODEC_WAKE_GPIO, Local0)
-			If (LEqual (Arg0, 1)) {
+			Local0 = BOARD_CODEC_WAKE_GPIO
+			If (Arg0 == 1) {
 				// Enable GPIO as wake source
 				\_SB.PCI0.LPCB.GPIO.GWAK (Local0)
 			}
@@ -150,7 +150,7 @@ Scope (\_SB.PCI0.I2C0)
 
 		Method (_STA)
 		{
-			If (LEqual (\S1EN, 1)) {
+			If (\S1EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)
@@ -188,8 +188,8 @@ Scope (\_SB.PCI0.I2C1)
 
 		Method (_DSW, 3, NotSerialized)
 		{
-			Store (BOARD_CODEC_WAKE_GPIO, Local0)
-			If (LEqual (Arg0, 1)) {
+			Local0 = BOARD_CODEC_WAKE_GPIO
+			If (Arg0 == 1) {
 				// Enable GPIO as wake source
 				\_SB.PCI0.LPCB.GPIO.GWAK (Local0)
 			}
@@ -198,7 +198,7 @@ Scope (\_SB.PCI0.I2C1)
 
 		Method (_STA)
 		{
-			If (LEqual (\S2EN, 1)) {
+			If (\S2EN == 1) {
 				Return (0xF)
 			} Else {
 				Return (0x0)