From 7eac4450b32f6961d5abd8dae32c5eefc1a07c11 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Thu, 17 Jun 2010 16:16:56 +0000 Subject: Always enable parent resources before child resources. Always initialize parents before children. Move s2881 code into a driver. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5633 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/emulation/qemu-x86/northbridge.c | 4 +- src/mainboard/tyan/s2881/mainboard.c | 125 ------------------------- 2 files changed, 2 insertions(+), 127 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c index f4a0cc2973..fa7b192cf5 100644 --- a/src/mainboard/emulation/qemu-x86/northbridge.c +++ b/src/mainboard/emulation/qemu-x86/northbridge.c @@ -122,8 +122,8 @@ static void cpu_pci_domain_read_resources(struct device *dev) static struct device_operations pci_domain_ops = { .read_resources = cpu_pci_domain_read_resources, .set_resources = cpu_pci_domain_set_resources, - .enable_resources = enable_childrens_resources, - .init = 0, + .enable_resources = NULL, + .init = NULL, .scan_bus = pci_domain_scan_bus, }; diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c index 6c41839227..9da5fe8ff4 100644 --- a/src/mainboard/tyan/s2881/mainboard.c +++ b/src/mainboard/tyan/s2881/mainboard.c @@ -21,133 +21,8 @@ */ #include -#include -#include #include "chip.h" -/** - * Do some S2881-specific HWM initialization for the ADT7463 chip. - * - * See Analog Devices ADT7463 datasheet, Rev C (2004): - * http://www.analog.com/en/prod/0,,766_825_ADT7463,00.html - */ -static void adt7463_init(device_t dev) -{ - device_t smbus_dev, adt7463; - struct device_path path; - int result; - - /* Find the SMBus controller (AMD-8111). */ - smbus_dev = dev_find_device(0x1022, 0x746b, 0); - if (!smbus_dev) - die("SMBus controller not found\n"); - printk(BIOS_DEBUG, "SMBus controller found\n"); - - /* Find the ADT7463 device. */ - path.type = DEVICE_PATH_I2C; - path.i2c.device = 0x2d; - adt7463 = find_dev_path(smbus_dev->link_list, &path); - if (!adt7463) - die("ADT7463 not found\n"); - printk(BIOS_DEBUG, "ADT7463 found\n"); - - /* Set all fans to 'Fastest Speed Calculated by All 3 Temperature - * Channels Controls PWMx'. - */ - result = smbus_write_byte(adt7463, 0x5c, 0xc2); - result = smbus_write_byte(adt7463, 0x5d, 0xc2); - result = smbus_write_byte(adt7463, 0x5e, 0xc2); - - /* Make sure that our fans never stop when temp. falls below Tmin, - * but rather keep going at minimum duty cycle (applies to automatic - * fan control mode only). - */ - result = smbus_write_byte(adt7463, 0x62, 0xc0); - - /* Set minimum PWM duty cycle to 25%, rather than the default 50%. */ - result = smbus_write_byte(adt7463, 0x64, 0x40); - result = smbus_write_byte(adt7463, 0x65, 0x40); - result = smbus_write_byte(adt7463, 0x66, 0x40); - - /* Set Tmin to 55C, rather than the default 90C. Above this temperature - * the fans will start blowing harder as temperature increases - * (automatic mode only). - */ - result = smbus_write_byte(adt7463, 0x67, 0x37); - result = smbus_write_byte(adt7463, 0x68, 0x37); - result = smbus_write_byte(adt7463, 0x69, 0x37); - - /* Set THERM limit to 70C, rather than the default 100C. - * The fans will kick in at 100% if the sensors reach this temperature, - * (only in automatic mode, but supposedly even when hardware is - * locked up). This is a failsafe measure. - */ - result = smbus_write_byte(adt7463, 0x6a, 0x46); - result = smbus_write_byte(adt7463, 0x6b, 0x46); - result = smbus_write_byte(adt7463, 0x6c, 0x46); - - /* Remote temperature 1 offset (LSB == 0.25C). */ - result = smbus_write_byte(adt7463, 0x70, 0x02); - - /* Remote temperature 2 offset (LSB == 0.25C). */ - result = smbus_write_byte(adt7463, 0x72, 0x01); - - /* Set TACH measurements to normal (1/second). */ - result = smbus_write_byte(adt7463, 0x78, 0xf0); - - printk(BIOS_DEBUG, "ADT7463 properly initialized\n"); -} - -static void dummy_noop(device_t dummy) -{ -} - -static struct device_operations dummy_operations = { - .read_resources = dummy_noop, - .set_resources = dummy_noop, - .enable_resources = dummy_noop, - .init = adt7463_init, -}; - -static unsigned int scan_root_bus(device_t root, unsigned int max) -{ - struct device_path path; - device_t dummy; - - max = root_dev_scan_bus(root, max); - - printk(BIOS_DEBUG, "scan_root_bus ok\n"); - - /* The following is a little silly. We need a hook into the boot - * process *after* the ADT7463 device has been initialized. So we - * create this dummy device, and we put the ADT7463 S2881 specific - * settings in its init function, which gets called - * as the last device to be initialized. - */ - - path.type = DEVICE_PATH_PNP; - path.pnp.port = 0; - path.pnp.device = 0; - dummy = alloc_dev(root->link_list, &path); - dummy->ops = &dummy_operations; - - return max; -} - -static struct device_operations mainboard_operations = { - .read_resources = root_dev_read_resources, - .set_resources = root_dev_set_resources, - .enable_resources = root_dev_enable_resources, - .init = root_dev_init, - .scan_bus = scan_root_bus, -}; - -static void enable_dev(struct device *dev) -{ - dev->ops = &mainboard_operations; -} - struct chip_operations mainboard_ops = { CHIP_NAME("Tyan S2881 Mainboard") - .enable_dev = enable_dev, }; -- cgit v1.2.3