Author: svens Date: Wed Apr 27 21:48:05 2011 New Revision: 6548 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6548
Log: X60: enable Ultrabay if device is plugged in
Signed-off-by: Sven Schnelle svens@stackframe.org Acked-by: Peter Stuge peter@stuge.se
Modified: trunk/src/mainboard/lenovo/x60/Makefile.inc trunk/src/mainboard/lenovo/x60/devicetree.cb trunk/src/mainboard/lenovo/x60/dock.c trunk/src/mainboard/lenovo/x60/dock.h trunk/src/mainboard/lenovo/x60/mainboard.c
Modified: trunk/src/mainboard/lenovo/x60/Makefile.inc ============================================================================== --- trunk/src/mainboard/lenovo/x60/Makefile.inc Wed Apr 27 21:47:49 2011 (r6547) +++ trunk/src/mainboard/lenovo/x60/Makefile.inc Wed Apr 27 21:48:05 2011 (r6548) @@ -19,3 +19,4 @@
smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c dock.c romstage-y += dock.c +ramstage-y += dock.c
Modified: trunk/src/mainboard/lenovo/x60/devicetree.cb ============================================================================== --- trunk/src/mainboard/lenovo/x60/devicetree.cb Wed Apr 27 21:47:49 2011 (r6547) +++ trunk/src/mainboard/lenovo/x60/devicetree.cb Wed Apr 27 21:48:05 2011 (r6548) @@ -156,7 +156,7 @@ 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
Modified: trunk/src/mainboard/lenovo/x60/dock.c ============================================================================== --- trunk/src/mainboard/lenovo/x60/dock.c Wed Apr 27 21:47:49 2011 (r6547) +++ trunk/src/mainboard/lenovo/x60/dock.c Wed Apr 27 21:48:05 2011 (r6548) @@ -247,3 +247,8 @@ { return !((inb(DEFAULT_GPIOBASE + 0x0c) >> 13) & 1); } + +int dock_ultrabay_device_present(void) +{ + return inb(0x1621) & 0x02 ? 0 : 1; +}
Modified: trunk/src/mainboard/lenovo/x60/dock.h ============================================================================== --- trunk/src/mainboard/lenovo/x60/dock.h Wed Apr 27 21:47:49 2011 (r6547) +++ trunk/src/mainboard/lenovo/x60/dock.h Wed Apr 27 21:48:05 2011 (r6548) @@ -5,4 +5,5 @@ extern void dock_disconnect(void); extern int dock_present(void); extern int dlpc_init(void); +extern int dock_ultrabay_device_present(void); #endif
Modified: trunk/src/mainboard/lenovo/x60/mainboard.c ============================================================================== --- trunk/src/mainboard/lenovo/x60/mainboard.c Wed Apr 27 21:47:49 2011 (r6547) +++ trunk/src/mainboard/lenovo/x60/mainboard.c Wed Apr 27 21:48:05 2011 (r6548) @@ -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 @@ 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 = {