From e15dc9eb1e4aa8ae87e398fb0d6eb895f4bb86d5 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sun, 25 Oct 2020 21:37:01 +0100 Subject: sb/intel/lynxpoint/acpi/lpc.asl: Simplify GPIOBASE resource MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LynxPoint-LP handles GPIOs differently, and LynxPoint-H has the same GPIO kind as previous-generation PCHs, such as Cougar Point. Remove some unneeded logic from `_CRS` and declare the GPIOBASE resource statically. The preprocessor allows later ACPI deduplication to remain reproducible. Change-Id: If771d5b6c3a1623da7d015ed50199877615409b2 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/46781 Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) --- src/southbridge/intel/lynxpoint/acpi/lpc.asl | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl index 8f41e67b44..a823b7084b 100644 --- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl +++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl @@ -157,25 +157,16 @@ Device (LPCB) IO (Decode16, 0xb2, 0xb2, 0x1, 0x02) // SWSMI IO (Decode16, DEFAULT_PMBASE, DEFAULT_PMBASE, 0x1, 0xff) - // GPIO region may be 128 bytes or 4096 bytes - IO (Decode16, 0x0000, 0x0000, 0x1, 0x00, GPR1) +#if !CONFIG(INTEL_LYNXPOINT_LP) + // LynxPoint-LP GPIO resources are defined in the + // SerialIO GPIO device and LynxPoint-H GPIO resources + // are defined here. + IO (Decode16, DEFAULT_GPIOBASE, DEFAULT_GPIOBASE, 0x1, 0x40) +#endif }) Method (_CRS, 0, NotSerialized) { - // LynxPoint-LP GPIO resources are defined in the - // SerialIO GPIO device and LynxPoint-H GPIO resources - // are defined here. - If (!\ISLP ()) { - CreateByteField (^RBUF, ^GPR1._LEN, R1LN) - CreateWordField (^RBUF, ^GPR1._MIN, R1MN) - CreateWordField (^RBUF, ^GPR1._MAX, R1MX) - - // Update GPIO region length - R1MN = DEFAULT_GPIOBASE - R1MX = DEFAULT_GPIOBASE - R1LN = DEFAULT_GPIOSIZE - } Return (RBUF) } } -- cgit v1.2.3