summaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo/x60/acpi
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2011-07-11 18:36:16 +0200
committerSven Schnelle <svens@stackframe.org>2011-08-18 20:50:55 +0200
commit8d0b86c9abc61414b06a60b28868739e077ffa87 (patch)
treecad2193cfc2a4a81fbf39a20cb5a45557e6a81e0 /src/mainboard/lenovo/x60/acpi
parentd819853f857f68dfd3661607d77ae5ccc7461e3b (diff)
X60: use EC events 0x50/0x58 instead of GPIO GPE for Docking/Undocking
Change-Id: I674e5166f5fb7ba299e6f1231f30434a5bf731c5 Signed-off-by: Sven Schnelle <svens@stackframe.org> Reviewed-on: http://review.coreboot.org/161 Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/lenovo/x60/acpi')
-rw-r--r--src/mainboard/lenovo/x60/acpi/dock.asl14
-rw-r--r--src/mainboard/lenovo/x60/acpi/gpe.asl12
2 files changed, 12 insertions, 14 deletions
diff --git a/src/mainboard/lenovo/x60/acpi/dock.asl b/src/mainboard/lenovo/x60/acpi/dock.asl
index d393f44f32..136f8884b7 100644
--- a/src/mainboard/lenovo/x60/acpi/dock.asl
+++ b/src/mainboard/lenovo/x60/acpi/dock.asl
@@ -39,7 +39,6 @@ Scope (\_SB)
Method(_DCK, 1, NotSerialized)
{
if (Arg0) {
- Sleep(250)
/* connect dock */
TRAP(SMI_DOCK_CONNECT)
} else {
@@ -53,7 +52,7 @@ Scope (\_SB)
Method(_STA, 0, NotSerialized)
{
- Return (DSTA)
+ Return (DSTA)
}
}
}
@@ -64,4 +63,15 @@ Scope(\_SB.PCI0.LPCB.EC)
{
Notify(\_SB.DOCK, 3)
}
+
+ Method(_Q50, 0, NotSerialized)
+ {
+ Notify(\_SB.DOCK, 3)
+ }
+
+ Method(_Q58, 0, NotSerialized)
+ {
+ Notify(\_SB.DOCK, 0)
+ }
+
}
diff --git a/src/mainboard/lenovo/x60/acpi/gpe.asl b/src/mainboard/lenovo/x60/acpi/gpe.asl
index 11e5dc03c0..b160b5015f 100644
--- a/src/mainboard/lenovo/x60/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x60/acpi/gpe.asl
@@ -27,16 +27,4 @@ Scope (\_GPE)
/* Read EC register to clear wake status */
Store(\_SB.PCI0.LPCB.EC.WAKE, Local0)
}
-
- /* SLICE_ON_3M GPE (Dock status) */
- Method(_L1D, 0, NotSerialized)
- {
- if (GP13) {
- Or(GIV1, 0x20, GIV1)
- Notify(\_SB.DOCK, 3)
- } else {
- And(GIV1, 0xdf, GIV1)
- Notify(\_SB.DOCK, 0)
- }
- }
}