Attention is currently required from: Patrick Rudolph. Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60503 )
Change subject: soc/intel/cannonlake/acpi: Replace Add(a,b) with ASL 2.0 syntax ......................................................................
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 --- M src/soc/intel/cannonlake/acpi/gpio.asl M src/soc/intel/cannonlake/acpi/gpio_cnp_h.asl M src/soc/intel/cannonlake/acpi/xhci.asl 3 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/60503/1
diff --git a/src/soc/intel/cannonlake/acpi/gpio.asl b/src/soc/intel/cannonlake/acpi/gpio.asl index fb122ad..5461c38 100644 --- a/src/soc/intel/cannonlake/acpi/gpio.asl +++ b/src/soc/intel/cannonlake/acpi/gpio.asl @@ -92,7 +92,7 @@ } Store (PCRB (Local0), Local2) 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 5c14317..705c216 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 @@ } Store (PCRB (Local0), Local2) 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 50c0cb8..614268c 100644 --- a/src/soc/intel/cannonlake/acpi/xhci.asl +++ b/src/soc/intel/cannonlake/acpi/xhci.asl @@ -19,8 +19,7 @@ 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,