summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2021-12-30 02:43:34 +0100
committerFelix Singer <felixsinger@posteo.net>2021-12-31 09:00:52 +0000
commitd190cdd25ea1365ae6ce31a9669253d2d175ed6b (patch)
tree992985e5de9ccd61830c212b1657c8ff1cf5ed8c
parent4fd000193b6bfe4af734e07d2db514f808145492 (diff)
downloadcoreboot-d190cdd25ea1365ae6ce31a9669253d2d175ed6b.tar.gz
coreboot-d190cdd25ea1365ae6ce31a9669253d2d175ed6b.tar.bz2
coreboot-d190cdd25ea1365ae6ce31a9669253d2d175ed6b.zip
soc/intel/cannonlake/acpi: Replace Add(a,b) with ASL 2.0 syntax
Replace `Add (a, b)` with `a + b`. Change-Id: I90dc0ecb1e3f16874a72cdf01afb097d4e7b6076 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/60503 Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/cannonlake/acpi/gpio.asl2
-rw-r--r--src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl2
-rw-r--r--src/soc/intel/cannonlake/acpi/xhci.asl3
3 files changed, 3 insertions, 4 deletions
diff --git a/src/soc/intel/cannonlake/acpi/gpio.asl b/src/soc/intel/cannonlake/acpi/gpio.asl
index 375a6a3068e0..3249954bd061 100644
--- a/src/soc/intel/cannonlake/acpi/gpio.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio.asl
@@ -92,7 +92,7 @@ Method (GADD, 1, NotSerialized)
}
Store (PCRB (Local0), Local2)
Local2 += PAD_CFG_BASE
- Return (Add (Local2, Multiply (Local1, 16)))
+ Return (Local2 + Multiply (Local1, 16))
}
/*
diff --git a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
index db4b53d5111f..9122e65fc43f 100644
--- a/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
+++ b/src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl
@@ -92,5 +92,5 @@ Method (GADD, 1, NotSerialized)
}
Store (PCRB (Local0), Local2)
Local2 += PAD_CFG_BASE
- Return (Add (Local2, Multiply (Local1, 16)))
+ Return (Local2 + Multiply (Local1, 16))
}
diff --git a/src/soc/intel/cannonlake/acpi/xhci.asl b/src/soc/intel/cannonlake/acpi/xhci.asl
index 50c0cb8a0cb8..614268c9921c 100644
--- a/src/soc/intel/cannonlake/acpi/xhci.asl
+++ b/src/soc/intel/cannonlake/acpi/xhci.asl
@@ -19,8 +19,7 @@ Method (UPWE, 3, Serialized)
Local0 = Arg1 + ((Arg0 - 1) * 0x10)
/* Map ((XMEM << 16) + Local0 in PSCR */
- OperationRegion (PSCR, SystemMemory,
- Add (ShiftLeft (Arg2, 16), Local0), 0x10)
+ OperationRegion (PSCR, SystemMemory, ShiftLeft (Arg2, 16) + Local0, 0x10)
Field (PSCR, DWordAcc, NoLock, Preserve)
{
PSCT, 32,