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/baytrail/acpi/lpe.asl  |  2 +-
 src/soc/intel/baytrail/acpi/lpss.asl | 20 ++++++++++----------
 src/soc/intel/baytrail/acpi/scc.asl  |  6 +++---
 3 files changed, 14 insertions(+), 14 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 a997a6e2a0..d0ce253ff3 100644
--- a/src/soc/intel/baytrail/acpi/lpe.asl
+++ b/src/soc/intel/baytrail/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/baytrail/acpi/lpss.asl b/src/soc/intel/baytrail/acpi/lpss.asl
index 8882e0efa8..113d5c0d2f 100644
--- a/src/soc/intel/baytrail/acpi/lpss.asl
+++ b/src/soc/intel/baytrail/acpi/lpss.asl
@@ -118,7 +118,7 @@ Device (I2C1)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -177,7 +177,7 @@ Device (I2C2)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -236,7 +236,7 @@ Device (I2C3)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -295,7 +295,7 @@ Device (I2C4)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -354,7 +354,7 @@ Device (I2C5)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -413,7 +413,7 @@ Device (I2C6)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -472,7 +472,7 @@ Device (I2C7)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -525,7 +525,7 @@ Device (SPI1)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -634,7 +634,7 @@ Device (UAR1)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -687,7 +687,7 @@ Device (UAR2)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
diff --git a/src/soc/intel/baytrail/acpi/scc.asl b/src/soc/intel/baytrail/acpi/scc.asl
index 0dcac61021..d11173b935 100644
--- a/src/soc/intel/baytrail/acpi/scc.asl
+++ b/src/soc/intel/baytrail/acpi/scc.asl
@@ -47,7 +47,7 @@ Device (EMMC)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 
@@ -110,7 +110,7 @@ Device (SDIO)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
@@ -162,7 +162,7 @@ Device (SDCD)
 
 	Method (_PS0)
 	{
-		And (PSAT, 0xfffffffc, PSAT)
+		PSAT &= 0xfffffffc
 		PSAT |= 0
 	}
 }
-- 
cgit v1.2.3