T60: enable Ultrabay if device is plugged in

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6547 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index 9f41a30858624cbcea90203b568fc56ae7de240d..da1cb43b8a08f355054662294e4f7d8c561bc029 100644 (file)
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -180,7 +180,7 @@ chip northbridge/intel/i945
                                        end
                                end
                        end
-                       device pci 1f.1 off # IDE
+                       device pci 1f.1 on # IDE
                                subsystemid 0x17aa 0x200c
                        end
                        device pci 1f.2 on # SATA

diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index e6a7679e81f40107c5838515db9e33f6a705f416..d6321d25d1f2d2cb7597404b2c84cb86375ae1b9 100644 (file)
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -38,7 +38,7 @@
 
 static void mainboard_enable(device_t dev)
 {
-       device_t dev0;
+       device_t dev0, idedev;
        int touchpad;
 
        /* enable Audio */
@@ -53,6 +53,17 @@ static void mainboard_enable(device_t dev)
                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;
+               config->ide_enable_primary = 1;
+               pmh7_ultrabay_power_enable(1);
+               ec_write(0x0c, 0x84);
+       } else {
+               pmh7_ultrabay_power_enable(0);
+               ec_write(0x0c, 0x04);
+       }
 }
 
 struct chip_operations mainboard_ops = {