summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2020-10-25 18:45:45 +0100
committerAngel Pons <th3fanbus@gmail.com>2020-11-04 23:21:36 +0000
commitb0d342028ddbc47e8b21d43d47c48be3066c350a (patch)
tree7f00fc7ec10269a23d56ebe75ec913e44afc5ce6
parentaacabd0bd634f53d43cc5bde8ae4170d7b47144b (diff)
downloadcoreboot-b0d342028ddbc47e8b21d43d47c48be3066c350a.tar.xz
sb/intel/lynxpoint/acpi: Put together LP GPIO code
Rename `lpt_lp.asl` and place all Lynxpoint-LP GPIO ASL there. It has been named `gpio.asl` to ease diffs between Lynxpoint and Broadwell. Tested with BUILD_TIMELESS=1, Google Panther does not change. Change-Id: I7cc4ab3371014be783761f110542471a8c0157a3 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46774 Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/gpio.asl (renamed from src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl)53
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/pch.asl2
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/serialio.asl53
3 files changed, 53 insertions, 55 deletions
diff --git a/src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
index b258900a36..3650b701e3 100644
--- a/src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
@@ -1,6 +1,57 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* LynxPoint-H */
+Device (GPIO)
+{
+ // GPIO Controller
+ Name (_HID, "INT33C7")
+ Name (_CID, "INT33C7")
+ Name (_UID, 1)
+
+ Name (RBUF, ResourceTemplate()
+ {
+ DWordIo (ResourceProducer,
+ MinFixed, // IsMinFixed
+ MaxFixed, // IsMaxFixed
+ PosDecode, // Decode
+ EntireRange, // ISARanges
+ 0x00000000, // AddressGranularity
+ 0x00000000, // AddressMinimum
+ 0x00000000, // AddressMaximum
+ 0x00000000, // AddressTranslation
+ 0x00000001, // RangeLength
+ , // ResourceSourceIndex
+ , // ResourceSource
+ BAR0)
+ // Disabled due to IRQ storm: http://crosbug.com/p/29548
+ //Interrupt (ResourceConsumer,
+ // Level, ActiveHigh, Shared, , , ) {14}
+ })
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ If (\ISLP ()) {
+ CreateDwordField (^RBUF, ^BAR0._MIN, BMIN)
+ CreateDwordField (^RBUF, ^BAR0._MAX, BMAX)
+ CreateDwordField (^RBUF, ^BAR0._LEN, BLEN)
+
+ Store (DEFAULT_GPIOSIZE, BLEN)
+ Store (DEFAULT_GPIOBASE, BMIN)
+ Store (Subtract (Add (DEFAULT_GPIOBASE,
+ DEFAULT_GPIOSIZE), 1), BMAX)
+ }
+
+ Return (RBUF)
+ }
+
+ Method (_STA, 0, NotSerialized)
+ {
+ If (\ISLP ()) {
+ Return (0xF)
+ } Else {
+ Return (0x0)
+ }
+ }
+}
Scope (\_SB.PCI0.LPCB)
{
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index bace058387..5ac83a4ae7 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -76,7 +76,7 @@ Scope (\)
// Serial IO
#if CONFIG(INTEL_LYNXPOINT_LP)
#include "serialio.asl"
-#include "lpt_lp.asl"
+#include "gpio.asl"
#endif
Method (_OSC, 4)
diff --git a/src/southbridge/intel/lynxpoint/acpi/serialio.asl b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
index 8956563cd9..164b623584 100644
--- a/src/southbridge/intel/lynxpoint/acpi/serialio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
@@ -510,56 +510,3 @@ Device (SDIO)
}
}
}
-
-Device (GPIO)
-{
- // GPIO Controller
- Name (_HID, "INT33C7")
- Name (_CID, "INT33C7")
- Name (_UID, 1)
-
- Name (RBUF, ResourceTemplate()
- {
- DWordIo (ResourceProducer,
- MinFixed, // IsMinFixed
- MaxFixed, // IsMaxFixed
- PosDecode, // Decode
- EntireRange, // ISARanges
- 0x00000000, // AddressGranularity
- 0x00000000, // AddressMinimum
- 0x00000000, // AddressMaximum
- 0x00000000, // AddressTranslation
- 0x00000001, // RangeLength
- , // ResourceSourceIndex
- , // ResourceSource
- BAR0)
- // Disabled due to IRQ storm: http://crosbug.com/p/29548
- //Interrupt (ResourceConsumer,
- // Level, ActiveHigh, Shared, , , ) {14}
- })
-
- Method (_CRS, 0, NotSerialized)
- {
- If (\ISLP ()) {
- CreateDwordField (^RBUF, ^BAR0._MIN, BMIN)
- CreateDwordField (^RBUF, ^BAR0._MAX, BMAX)
- CreateDwordField (^RBUF, ^BAR0._LEN, BLEN)
-
- Store (DEFAULT_GPIOSIZE, BLEN)
- Store (DEFAULT_GPIOBASE, BMIN)
- Store (Subtract (Add (DEFAULT_GPIOBASE,
- DEFAULT_GPIOSIZE), 1), BMAX)
- }
-
- Return (RBUF)
- }
-
- Method (_STA, 0, NotSerialized)
- {
- If (\ISLP ()) {
- Return (0xF)
- } Else {
- Return (0x0)
- }
- }
-}