lenovo/t400: Consolidate `acpi/platform.asl`

The ASL code is already present in
`southbridge/intel/common/acpi/platform.asl` and
`cpu/intel/common/acpi/cpu.asl`.

So include these files instead of duplicating the code.

Something similar was don in commit commit 24813c14 (i945: Consolidate
acpi/platform.asl).

Change-Id: Ide50b34184b80c86b996f86dd589c3cf3bf75587
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/11883
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Paul Menzel 2015-10-12 19:20:48 +02:00 committed by Patrick Georgi
parent 5f302d7bfc
commit bb1b259184
2 changed files with 4 additions and 118 deletions

View File

@ -18,48 +18,6 @@
* Foundation, Inc. * Foundation, Inc.
*/ */
/* These come from the dynamically created CPU SSDT */
External(PDC0)
External(PDC1)
/* The APM port can be used for generating software SMIs */
OperationRegion (APMP, SystemIO, 0xb2, 2)
Field (APMP, ByteAcc, NoLock, Preserve)
{
APMC, 8, // APM command
APMS, 8 // APM status
}
/* Port 80 POST */
OperationRegion (POST, SystemIO, 0x80, 1)
Field (POST, ByteAcc, Lock, Preserve)
{
DBG0, 8
}
/* SMI I/O Trap */
Method(TRAP, 1, Serialized)
{
Store (Arg0, SMIF) // SMI Function
Store (0, TRP0) // Generate trap
Return (SMIF) // Return value of SMI handler
}
/* The _PIC method is called by the OS to choose between interrupt
* routing via the i8259 interrupt controller or the APIC.
*
* _PIC is called with a parameter of 0 for i8259 configuration and
* with a parameter of 1 for Local Apic/IOAPIC configuration.
*/
Method(_PIC, 1)
{
// Remember the OS' IRQ routing choice.
Store(Arg0, PICM)
}
/* The _PTS method (Prepare To Sleep) is called before the OS is /* The _PTS method (Prepare To Sleep) is called before the OS is
* entering a sleep state. The sleep state number is passed in Arg0 * entering a sleep state. The sleep state number is passed in Arg0
*/ */
@ -98,39 +56,6 @@ Method(_WAK,1)
Return(Package(){0,0}) Return(Package(){0,0})
} }
// Power notification
External (\_PR_.CP00, DeviceObj)
External (\_PR_.CP01, DeviceObj)
Method (PNOT)
{
If (MPEN) {
If(And(PDC0, 0x08)) {
Notify (\_PR_.CP00, 0x80) // _PPC
If (And(PDC0, 0x10)) {
Sleep(100)
Notify(\_PR_.CP00, 0x81) // _CST
}
}
If(And(PDC1, 0x08)) {
Notify (\_PR_.CP01, 0x80) // _PPC
If (And(PDC1, 0x10)) {
Sleep(100)
Notify(\_PR_.CP01, 0x81) // _CST
}
}
} Else { // UP
Notify (\_PR_.CP00, 0x80)
Sleep(0x64)
Notify(\_PR_.CP00, 0x81)
}
}
/* System Bus */ /* System Bus */
Scope(\_SB) Scope(\_SB)
@ -147,49 +72,7 @@ Scope(\_SB)
// TRAP(71) // TODO // TRAP(71) // TODO
/* Determine the Operating System and save the value in OSYS. \GOS()
* We have to do this in order to be able to work around
* certain windows bugs.
*
* OSYS value | Operating System
* -----------+------------------
* 2000 | Windows 2000
* 2001 | Windows XP(+SP1)
* 2002 | Windows XP SP2
* 2006 | Windows Vista
* ???? | Windows 7
*/
/* Let's assume we're running at least Windows 2000 */
Store (2000, OSYS)
If (CondRefOf(_OSI, Local0)) {
/* Linux answers _OSI with "True" for a couple of
* Windows version queries. But unlike Windows it
* needs a Video repost, so let's determine whether
* we're running Linux.
*/
If (_OSI("Linux")) {
Store (1, LINX)
}
If (_OSI("Windows 2001")) {
Store (2001, OSYS)
}
If (_OSI("Windows 2001 SP1")) {
Store (2001, OSYS)
}
If (_OSI("Windows 2001 SP2")) {
Store (2002, OSYS)
}
If (_OSI("Windows 2006")) {
Store (2006, OSYS)
}
}
/* And the OS workarounds start right after we know what we're /* And the OS workarounds start right after we know what we're
* running: Windows XP SP1 needs to have C-State coordination * running: Windows XP SP1 needs to have C-State coordination

View File

@ -38,10 +38,13 @@ DefinitionBlock(
// global NVS and variables // global NVS and variables
#include <southbridge/intel/i82801ix/acpi/globalnvs.asl> #include <southbridge/intel/i82801ix/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/platform.asl>
// General Purpose Events // General Purpose Events
#include "acpi/gpe.asl" #include "acpi/gpe.asl"
#include <cpu/intel/common/acpi/cpu.asl>
Scope (\_SB) { Scope (\_SB) {
Device (PCI0) Device (PCI0)
{ {