T60: add _CST table

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

diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index 371085bd49c4111483ad38d8e3b49d165ed827f5..19ac221b9833b6bca40a96c2d0fe21213621fb3f 100644 (file)
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -35,23 +35,40 @@
 #include <ec/lenovo/h8/h8.h>
 #include <northbridge/intel/i945/i945.h>
 #include <pc80/mc146818rtc.h>
+#include <arch/x86/include/arch/acpigen.h>
+
+static struct cst_entry cst_entries[] = {
+       { 0x7f, 1, 2, 0, 1, 1, 1, 1000 },
+       { 0x01, 8, 0, 0, DEFAULT_PMBASE + LV2, 2, 1, 500 },
+       { 0x01, 8, 0, 0, DEFAULT_PMBASE + LV3, 2, 17, 250 },
+};
+
+int get_cst_entries(struct cst_entry **entries)
+{
+       *entries = cst_entries;
+       return ARRAY_SIZE(cst_entries);
+}
 
 static void mainboard_enable(device_t dev)
 {
+       struct southbridge_intel_i82801gx_config *config;
        device_t dev0, idedev;
        u8 defaults_loaded = 0;
 
-       /* enable Audio */
-       h8_set_audio_mute(0);
-
        /* 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) == SKPAD_ACPI_S3_MAGIC)
                ec_write(0x0c, 0xc7);
 
        idedev = dev_find_slot(0, PCI_DEVFN(0x1f,1));
-       if (idedev && idedev->chip_info && h8_ultrabay_device_present()) {
-               struct southbridge_intel_i82801gx_config *config = idedev->chip_info;
+
+       if (!(inb(DEFAULT_GPIOBASE + 0x0c) & 0x40)) {
+               /* legacy I/O connected */
+               pmh7_ultrabay_power_enable(1);
+               ec_write(0x0c, 0x84);
+       } else if (idedev && idedev->chip_info &&
+                  h8_ultrabay_device_present()) {
+               config = idedev->chip_info;
                config->ide_enable_primary = 1;
                pmh7_ultrabay_power_enable(1);
                ec_write(0x0c, 0x84);
@@ -61,7 +78,8 @@ static void mainboard_enable(device_t dev)
        }
 
        /* set dock status led */
-       ec_write(0x0c, inb(0x164c) & 8 ? 0x88 : 0x08);
+       ec_write(0x0c, 0x08);
+       ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09);
 
        if (get_option(&defaults_loaded, "cmos_defaults_loaded") < 0) {
                printk(BIOS_INFO, "failed to get cmos_defaults_loaded");