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 15ed80861468f5044db9c2b64db474618023f391..bf3d8d3c6643ec6c310503e011c22c33fd33c2ce 100644 (file)
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -34,25 +34,52 @@
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
 #include <northbridge/intel/i945/i945.h>
-
-static void backlight_enable(void)
-{
-       pmh7_register_set_bit(0x50, 5);
-}
+#include <pc80/mc146818rtc.h>
+#include "dock.h"
 
 static void mainboard_enable(device_t dev)
 {
-       device_t dev0;
-
-       backlight_enable();
+       device_t dev0, idedev;
+       u8 defaults_loaded = 0;
 
        /* 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));
+       if (idedev && idedev->chip_info && dock_ultrabay_device_present()) {
+               struct southbridge_intel_i82801gx_config *config = idedev->chip_info;
+               config->ide_enable_primary = 1;
+               /* enable Ultrabay power */
+               outb(inb(0x1628) | 0x01, 0x1628);
+               ec_write(0x0c, 0x84);
+       } else {
+               /* disable Ultrabay power */
+               outb(inb(0x1628) & ~0x01, 0x1628);
+               ec_write(0x0c, 0x04);
+       }
+
+       if (get_option(&defaults_loaded, "cmos_defaults_loaded") < 0) {
+               printk(BIOS_INFO, "failed to get cmos_defaults_loaded");
+               defaults_loaded = 0;
+       }
+
+       if (!defaults_loaded) {
+               printk(BIOS_INFO, "Restoring CMOS defaults\n");
+               set_option("tft_brightness", &(u8[]){ 0xff });
+               set_option("volume", &(u8[]){ 0x03 });
+               set_option("cmos_defaults_loaded", &(u8[]){ 0x01 });
+       }
 }
 
 struct chip_operations mainboard_ops = {