X60: use EC events 0x50/0x58 instead of GPIO GPE for Docking/Undocking

[coreboot.git] / src / mainboard / lenovo / x60 / mainboard.c

diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index d5c9d953c986562a2c1a0f58136737cc2631687c..bf3d8d3c6643ec6c310503e011c22c33fd33c2ce 100644 (file)
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -45,9 +45,15 @@ static void mainboard_enable(device_t dev)
        /* enable Audio */
        h8_set_audio_mute(0);
 
+       ec_clr_bit(0x03, 2);
+
+       if (inb(0x164c) & 0x08) {
+               ec_set_bit(0x03, 2);
+               ec_write(0x0c, 0x88);
+       }
        /* If we're resuming from suspend, blink suspend LED */
        dev0 = dev_find_slot(0, PCI_DEVFN(0,0));
-       if (dev0 && pci_read_config32(dev0, SKPAD) == 0xcafed00d)
+       if (dev0 && pci_read_config32(dev0, SKPAD) == SKPAD_ACPI_S3_MAGIC)
                ec_write(0x0c, 0xc7);
 
        idedev = dev_find_slot(0, PCI_DEVFN(0x1f,1));