From 35e65a8bc36628baad7d2ed94bef7619971e6d88 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 16 Dec 2022 07:11:17 +0100
Subject: tree: Replace And(a,b,c) with ASL 2.0 syntax

Replace `And (a, b, c)` with `c = a & b`, respectively `c &= b` where
possible.

Change-Id: Ie558f9d0b597c56ca3b31498edb68de8877d3a2f
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70850
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/intel/braswell/acpi/lpe.asl  |  2 +-
 src/soc/intel/braswell/acpi/lpss.asl | 18 +++++++++---------
 src/soc/intel/braswell/acpi/scc.asl  |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/src/soc/intel/braswell/acpi/lpe.asl b/src/soc/intel/braswell/acpi/lpe.asl
index 494fd244aa..9f400458c3 100644
--- a/src/soc/intel/braswell/acpi/lpe.asl
+++ b/src/soc/intel/braswell/acpi/lpe.asl
@@ -93,7 +93,7 @@ Device (LPEA)
 
 		Method (_ON)
 		{
-			And (PSAT, 0xfffffffc, PSAT)
+			PSAT &= 0xfffffffc
 			PSAT |= 0
 		}
 	}
diff --git a/src/soc/intel/braswell/acpi/lpss.asl b/src/soc/intel/braswell/acpi/lpss.asl
index da495b8279..2c720ffcc1 100644
--- a/src/soc/intel/braswell/acpi/lpss.asl
+++ b/src/soc/intel/braswell/acpi/lpss.asl
@@ -149,7 +149,7 @@ Device (I2C1)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -208,7 +208,7 @@ Device (I2C2)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -267,7 +267,7 @@ Device (I2C3)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -326,7 +326,7 @@ Device (I2C4)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -385,7 +385,7 @@ Device (I2C5)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -444,7 +444,7 @@ Device (I2C6)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -503,7 +503,7 @@ Device (I2C7)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -556,7 +556,7 @@ Device (UAR1)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -609,7 +609,7 @@ Device (UAR2)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
diff --git a/src/soc/intel/braswell/acpi/scc.asl b/src/soc/intel/braswell/acpi/scc.asl
index 9eaf7d2d66..91c5d278f1 100644
--- a/src/soc/intel/braswell/acpi/scc.asl
+++ b/src/soc/intel/braswell/acpi/scc.asl
@@ -47,7 +47,7 @@ Device (EMMC)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 
@@ -148,7 +148,7 @@ Device (SDIO)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -200,7 +200,7 @@ Device (SDCD)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
-- 
cgit v1.2.3