X60/T60: remove superflous h8_set_audio_mute()

[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 d6321d25d1f2d2cb7597404b2c84cb86375ae1b9..d4f260d4f533c57fb2ca9479bfae3673ea285ec6 100644 (file)
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -38,25 +38,24 @@
 
 static void mainboard_enable(device_t dev)
 {
+       struct southbridge_intel_i82801gx_config *config;
        device_t dev0, idedev;
-       int touchpad;
-
-       /* enable Audio */
-       h8_set_audio_mute(0);
+       u8 defaults_loaded = 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) == 0xcafed00d)
+       if (dev0 && pci_read_config32(dev0, SKPAD) == SKPAD_ACPI_S3_MAGIC)
                ec_write(0x0c, 0xc7);
 
-       if (get_option(&touchpad, "touchpad") < 0)
-               touchpad = 1;
-
-       pmh7_touchpad_enable(touchpad);
-
        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);
@@ -64,6 +63,22 @@ static void mainboard_enable(device_t dev)
                pmh7_ultrabay_power_enable(0);
                ec_write(0x0c, 0x04);
        }
+
+       /* set dock status led */
+       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");
+               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 = {