X60: enable Ultrabay if device is plugged in

[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 6606a876958a4b35f9f99b222d8ba7e6fa901f49..f7bcb61f63c955e98d15ee0df969ff3e2782ff45 100644 (file)
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -32,51 +32,34 @@
 #include <arch/io.h>
 #include <ec/lenovo/pmh7/pmh7.h>
 #include <ec/acpi/ec.h>
-
-static void backlight_enable(void)
-{
-       pmh7_register_set_bit(0x50, 5);
-}
-
-static void trackpoint_enable(void)
-{
-       ec_write(0x0b, 0x03);
-}
-
-static void wlan_enable(void)
-{
-       ec_write(0x3a, 0x20);
-}
+#include <ec/lenovo/h8/h8.h>
+#include <northbridge/intel/i945/i945.h>
+#include "dock.h"
 
 static void mainboard_enable(device_t dev)
 {
-       backlight_enable();
-       trackpoint_enable();
-       /* FIXME: this should be ACPI's task
-        * but for now, enable it here */
-       wlan_enable();
-
-       /* enable ACPI events */
-       ec_write(0x00, 0xa6);
-       ec_write(0x01, 0x05);
-
-       ec_write(0x02, 0xa0);
-       ec_write(0x03, 0x05);
+       device_t dev0, idedev;
 
-       /* set mask of enabled beeps */
-       ec_write(0x04, 0xfe);
-       ec_write(0x05, 0x96);
-
-       /* Unknown, but required for hotkeys
-          Maybe a mask for enabled keys? */
+       /* enable Audio */
+       h8_set_audio_mute(0);
 
-       ec_write(0x12, 0xff);
-       ec_write(0x13, 0xff);
-       ec_write(0x14, 0xf4);
-       ec_write(0x15, 0x3c);
+       /* 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)
+               ec_write(0x0c, 0xc7);
 
-       /* enable Audio */
-       ec_clr_bit(0x3a, 0);
+       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);
+       }
 }
 
 struct chip_operations mainboard_ops = {