diff options
| author | Felix Singer <felixsinger@posteo.net> | 2022-12-16 04:40:39 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-12-23 10:17:34 +0000 |
| commit | 86bc2e708dc2600c5611b6573d43645e7d57e561 (patch) | |
| tree | 54b589e40a81ee74915df4ed68a6a13c944bc17d /src/soc/intel/braswell | |
| parent | 372573eaff0f757f004de2f4fb3f688de93bbbba (diff) | |
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>
Diffstat (limited to 'src/soc/intel/braswell')
| -rw-r--r-- | src/soc/intel/braswell/acpi/lpe.asl | 6 | ||||
| -rw-r--r-- | src/soc/intel/braswell/acpi/lpss.asl | 54 | ||||
| -rw-r--r-- | src/soc/intel/braswell/acpi/scc.asl | 18 | ||||
| -rw-r--r-- | src/soc/intel/braswell/acpi/southcluster.asl | 2 |
4 files changed, 40 insertions, 40 deletions
diff --git a/src/soc/intel/braswell/acpi/lpe.asl b/src/soc/intel/braswell/acpi/lpe.asl index 02a88ff9e6..494fd244aa 100644 --- a/src/soc/intel/braswell/acpi/lpe.asl +++ b/src/soc/intel/braswell/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/braswell/acpi/lpss.asl b/src/soc/intel/braswell/acpi/lpss.asl index b0477b24f7..da495b8279 100644 --- a/src/soc/intel/braswell/acpi/lpss.asl +++ b/src/soc/intel/braswell/acpi/lpss.asl @@ -143,14 +143,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 } } @@ -202,14 +202,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 } } @@ -261,14 +261,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 } } @@ -320,14 +320,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 } } @@ -379,14 +379,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 } } @@ -438,14 +438,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 } } @@ -497,14 +497,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 } } @@ -550,14 +550,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 } } @@ -603,13 +603,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/braswell/acpi/scc.asl b/src/soc/intel/braswell/acpi/scc.asl index 36c49ed023..9eaf7d2d66 100644 --- a/src/soc/intel/braswell/acpi/scc.asl +++ b/src/soc/intel/braswell/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) @@ -142,14 +142,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 } } @@ -194,13 +194,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/braswell/acpi/southcluster.asl b/src/soc/intel/braswell/acpi/southcluster.asl index 96145704c9..2a374f0b71 100644 --- a/src/soc/intel/braswell/acpi/southcluster.asl +++ b/src/soc/intel/braswell/acpi/southcluster.asl @@ -216,7 +216,7 @@ Method (_OSC, 4) { /* Unrecognized UUID */ CreateDWordField (Arg3, 0, CDW1) - Or (CDW1, 4, CDW1) + CDW1 |= 4 Return (Arg3) } } |