Patchwork [3/4] T60: enable Ultrabay if device is plugged in

login
register
about
Submitter Sven Schnelle
Date 2011-04-27 18:49:04
Message ID <1303930145-9065-4-git-send-email-svens@stackframe.org>
Download mbox | patch
Permalink /patch/2920/
State Accepted
Commit r6547
Headers show

Comments

Sven Schnelle - 2011-04-27 18:49:04
Signed-off-by: Sven Schnelle <svens@stackframe.org>
---
 src/mainboard/lenovo/t60/devicetree.cb |    2 +-
 src/mainboard/lenovo/t60/mainboard.c   |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

Patch

diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index 9f41a30..da1cb43 100644
--- 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 e6a7679..d6321d2 100644
--- 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 = {