Signed-off-by: Sven Schnelle svens@stackframe.org --- src/mainboard/lenovo/x60/Makefile.inc | 1 + src/mainboard/lenovo/x60/devicetree.cb | 2 +- src/mainboard/lenovo/x60/dock.c | 6 +++++- src/mainboard/lenovo/x60/dock.h | 1 + src/mainboard/lenovo/x60/mainboard.c | 16 +++++++++++++++- 5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/mainboard/lenovo/x60/Makefile.inc b/src/mainboard/lenovo/x60/Makefile.inc index 7515258..83cdeb9 100644 --- a/src/mainboard/lenovo/x60/Makefile.inc +++ b/src/mainboard/lenovo/x60/Makefile.inc @@ -19,3 +19,4 @@
smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c dock.c romstage-y += dock.c +ramstage-y += dock.c diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb index d5ba7d9..01a42eb 100644 --- a/src/mainboard/lenovo/x60/devicetree.cb +++ b/src/mainboard/lenovo/x60/devicetree.cb @@ -156,7 +156,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/x60/dock.c b/src/mainboard/lenovo/x60/dock.c index b64d864..2d6e686 100644 --- a/src/mainboard/lenovo/x60/dock.c +++ b/src/mainboard/lenovo/x60/dock.c @@ -230,7 +230,6 @@ int dock_connect(void) outb(0x82, 0x1622); outb(0xff, 0x1624);
- /* Enable USB and Ultrabay power */ outb(0x03, 0x1628); return 0; } @@ -247,3 +246,8 @@ int dock_present(void) { return !((inb(DEFAULT_GPIOBASE + 0x0c) >> 13) & 1); } + +int dock_ultrabay_device_present(void) +{ + return !(inb(0x1621) & 0x02); +} diff --git a/src/mainboard/lenovo/x60/dock.h b/src/mainboard/lenovo/x60/dock.h index 05c5cc4..cd68223 100644 --- a/src/mainboard/lenovo/x60/dock.h +++ b/src/mainboard/lenovo/x60/dock.h @@ -5,4 +5,5 @@ extern int dock_connect(void); extern void dock_disconnect(void); extern int dock_present(void); extern int dlpc_init(void); +extern int dock_ultrabay_device_present(void); #endif diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index b9416b5..f7bcb61 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -34,10 +34,11 @@ #include <ec/acpi/ec.h> #include <ec/lenovo/h8/h8.h> #include <northbridge/intel/i945/i945.h> +#include "dock.h"
static void mainboard_enable(device_t dev) { - device_t dev0; + device_t dev0, idedev;
/* enable Audio */ h8_set_audio_mute(0); @@ -46,6 +47,19 @@ static void mainboard_enable(device_t dev) dev0 = dev_find_slot(0, PCI_DEVFN(0,0)); if (dev0 && pci_read_config32(dev0, SKPAD) == 0xcafed00d) ec_write(0x0c, 0xc7); + + 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 = {