From 86bc2e708dc2600c5611b6573d43645e7d57e561 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 16 Dec 2022 04:40:39 +0100
Subject: 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>
---
 src/soc/intel/baytrail/acpi/lpe.asl          |  6 +--
 src/soc/intel/baytrail/acpi/lpss.asl         | 60 ++++++++++++++--------------
 src/soc/intel/baytrail/acpi/scc.asl          | 18 ++++-----
 src/soc/intel/baytrail/acpi/southcluster.asl |  2 +-
 4 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'src/soc/intel/baytrail')

diff --git a/src/soc/intel/baytrail/acpi/lpe.asl b/src/soc/intel/baytrail/acpi/lpe.asl
index 171134eb08..a997a6e2a0 100644
--- a/src/soc/intel/baytrail/acpi/lpe.asl
+++ b/src/soc/intel/baytrail/acpi/lpe.asl
@@ -87,14 +87,14 @@ Device (LPEA)
 
 		Method (_OFF)
 		{
-			Or (PSAT, 0x00000003, PSAT)
-			Or (PSAT, 0x00000000, PSAT)
+			PSAT |= 3
+			PSAT |= 0
 		}
 
 		Method (_ON)
 		{
 			And (PSAT, 0xfffffffc, PSAT)
-			Or (PSAT, 0x00000000, PSAT)
+			PSAT |= 0
 		}
 	}
 }
diff --git a/src/soc/intel/baytrail/acpi/lpss.asl b/src/soc/intel/baytrail/acpi/lpss.asl
index 997dc273a5..8882e0efa8 100644
--- a/src/soc/intel/baytrail/acpi/lpss.asl
+++ b/src/soc/intel/baytrail/acpi/lpss.asl
@@ -112,14 +112,14 @@ Device (I2C1)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -171,14 +171,14 @@ Device (I2C2)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -230,14 +230,14 @@ Device (I2C3)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -289,14 +289,14 @@ Device (I2C4)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -348,14 +348,14 @@ Device (I2C5)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -407,14 +407,14 @@ Device (I2C6)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -466,14 +466,14 @@ Device (I2C7)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -519,14 +519,14 @@ Device (SPI1)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -628,14 +628,14 @@ Device (UAR1)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -681,13 +681,13 @@ Device (UAR2)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
diff --git a/src/soc/intel/baytrail/acpi/scc.asl b/src/soc/intel/baytrail/acpi/scc.asl
index c5da6fe369..0dcac61021 100644
--- a/src/soc/intel/baytrail/acpi/scc.asl
+++ b/src/soc/intel/baytrail/acpi/scc.asl
@@ -41,14 +41,14 @@ Device (EMMC)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 
 	Device (EM45)
@@ -104,14 +104,14 @@ Device (SDIO)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
 
@@ -156,13 +156,13 @@ Device (SDCD)
 
 	Method (_PS3)
 	{
-		Or (PSAT, 0x00000003, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 3
+		PSAT |= 0
 	}
 
 	Method (_PS0)
 	{
 		And (PSAT, 0xfffffffc, PSAT)
-		Or (PSAT, 0x00000000, PSAT)
+		PSAT |= 0
 	}
 }
diff --git a/src/soc/intel/baytrail/acpi/southcluster.asl b/src/soc/intel/baytrail/acpi/southcluster.asl
index 37ae3cad2e..03f884ab46 100644
--- a/src/soc/intel/baytrail/acpi/southcluster.asl
+++ b/src/soc/intel/baytrail/acpi/southcluster.asl
@@ -217,7 +217,7 @@ Method (_OSC, 4)
 	{
 		/* Unrecognized UUID */
 		CreateDWordField (Arg3, 0, CDW1)
-		Or (CDW1, 4, CDW1)
+		CDW1 |= 4
 		Return (Arg3)
 	}
 }
-- 
cgit v1.2.3