tree: Replace Or(a,b,c) with ASL 2.0 syntax

Replace `Or (a, b, c)` with `c = a | b`, respectively `c |= b` where
possible.

Change-Id: Icf194b248075f290de90fb4bc4e9a0cd9d76ec61
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70846
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

4 files changed, 17 insertions, 17 deletions

diff --git a/src/mainboard/acer/aspire_vn7_572g/acpi/thermal.asl b/src/mainboard/acer/aspire_vn7_572g/acpi/thermal.asl
index 7d175a23e5..285615d3f8 100644
--- a/src/mainboard/acer/aspire_vn7_572g/acpi/thermal.asl
+++ b/src/mainboard/acer/aspire_vn7_572g/acpi/thermal.asl
@@ -12,14 +12,14 @@ Scope (_TZ)
 			Local0 = \_SB.PCI0.LPCB.EC0.MS0T
 			Local1 = \_SB.PCI0.LPCB.EC0.MCSS
 			/* Suppress warning over reading status flag by dummy OR */
-			Or (Local1, 1, Local1)
+			Local1 |= 1
 			Local2 = \_SB.PCI0.LPCB.EC0.MOSD
 #else
 			Local0 = \_SB.PCI0.LPCB.EC0.ES0T
 			/* "MCSS": Considering neighbouring bits, likely
 			   "ESSF" in thermals, not "ECSS" in power notifications */
 			Local1 = \_SB.PCI0.LPCB.EC0.ESSF
-			Or (Local1, 1, Local1)
+			Local1 |= 1
 			Local2 = \_SB.PCI0.LPCB.EC0.EOSD
 #endif
 			If (Local2)	// Thermal trip
diff --git a/src/mainboard/aopen/dxplplusu/acpi/power.asl b/src/mainboard/aopen/dxplplusu/acpi/power.asl
index 903d844d42..c7b178a44f 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/power.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/power.asl
@@ -50,22 +50,22 @@ Scope (\_GPE)
 /* Clear power buttons */
 Method (\_INI, 0, NotSerialized)
 {
-	Or (\_SB.PCI0.ICH0.PS1H, 0x09, \_SB.PCI0.ICH0.PS1H)
-	Or (\_SB.PCI0.ICH0.PE1H, 0x01, \_SB.PCI0.ICH0.PE1H)
+	\_SB.PCI0.ICH0.PS1H |= 9
+	\_SB.PCI0.ICH0.PE1H |= 1
 }
 
 /* Prepare To Sleep */
 Method (\_PTS, 1, NotSerialized)
 {
-	Or (\_SB.PCI0.ICH0.GS0H, 0x19, \_SB.PCI0.ICH0.GS0H)
-	Or (\_SB.PCI0.ICH0.GS0L, 0x11, \_SB.PCI0.ICH0.GS0L)
+	\_SB.PCI0.ICH0.GS0H |= 0x19
+	\_SB.PCI0.ICH0.GS0L |= 0x11
 }
 
 /* System Wake */
 Method (\_WAK, 1, NotSerialized)
 {
-	Or (\_SB.PCI0.ICH0.GS0H, 0x19, \_SB.PCI0.ICH0.GS0H)
-	Or (\_SB.PCI0.ICH0.GS0L, 0x11, \_SB.PCI0.ICH0.GS0L)
+	\_SB.PCI0.ICH0.GS0H |= 0x19
+	\_SB.PCI0.ICH0.GS0L |= 0x11
 
 	Return ( Package() { 0x0, 0x0 } )
 }
diff --git a/src/mainboard/aopen/dxplplusu/acpi/superio.asl b/src/mainboard/aopen/dxplplusu/acpi/superio.asl
index 22b0e2297e..cd8dc8bf2f 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/superio.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/superio.asl
@@ -75,9 +75,9 @@ Method (_CRS, 0, NotSerialized)
 	\_SB.PCI0.ICH0.SMSC.LDN = 0x0A
 	IOM1 = 0x00
 	IOM2 = 0x00
-	Or (\_SB.PCI0.ICH0.SMSC.IOAH, IOM1, IOM1)
+	IOM1 |= \_SB.PCI0.ICH0.SMSC.IOAH
 	IOM1 <<= 8
-	Or (\_SB.PCI0.ICH0.SMSC.IOAL, IOM1, IOM1)
+	IOM1 |= \_SB.PCI0.ICH0.SMSC.IOAL
 	IOM2 = IOM1
 	If (IOM1 != 0)
 	{
@@ -111,28 +111,28 @@ Method (_INI, 0, NotSerialized)
 	/* GPIO initial output levels */
 	Local0 = GP_1
 	And( Local0, 0x7C, Local0)
-	Or ( Local0, 0x81, Local0)
+	Local0 |= 0x81
 	GP_1 = Local0
 
 	Local0 = GP_2
 	And( Local0, 0xFE, Local0)
-	Or ( Local0, 0x00, Local0)
+	Local0 |= 0
 	GP_2 = Local0
 
 	Local0 = GP_3
 	And( Local0, 0x7F, Local0)
-	Or ( Local0, 0x80, Local0)
+	Local0 |= 0x80
 	GP_3 = Local0
 
 	Local0 = GP_4
 	And( Local0, 0x7F, Local0)
-	Or ( Local0, 0x00, Local0)
+	Local0 |= 0
 	GP_4 = Local0
 
 	/* Power Led */
 	Local0 = LED1
 	And( Local0, 0xfc, Local0)
-	Or ( Local0, 0x01, Local0)
+	Local0 |= 1
 	LED1 = Local0
 
 }
diff --git a/src/mainboard/lenovo/s230u/acpi/gpe.asl b/src/mainboard/lenovo/s230u/acpi/gpe.asl
index 4f25557cf6..f9ba2096fb 100644
--- a/src/mainboard/lenovo/s230u/acpi/gpe.asl
+++ b/src/mainboard/lenovo/s230u/acpi/gpe.asl
@@ -6,7 +6,7 @@ Scope (_GPE)
 	Method (PNOT, 2, Serialized) {
 		Local0 = Arg0 << Arg1
 		Not(One << Arg1, Local1)
-		Or (Local0, And (Local1, PDET), PDET)
+		PDET = Local0 | And (Local1, PDET)
 		If (PDET == Zero) {
 			// Palm removed
 			\_SB.PCI0.LPCB.EC0.HKEY.MHKQ (0x60B1)
@@ -22,7 +22,7 @@ Scope (_GPE)
 			Not (Local0, Local0)
 			And (GIV0, Local0, GIV0)
 		} Else {
-			Or (GIV0, Local0, GIV0)
+			GIV0 |= Local0
 		}
 	}