Instead of duplicating the pci_locate_device calls multiple times,

add a get_vt8237_lpc() function.

Signed-off-by: Tobias Diedrich <ranma+coreboot@tdiedrich.de>

Acked-by: Rudolf Marek <r.marek@assembler.cz>




git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6040 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Tobias Diedrich 2010-11-07 18:46:13 +00:00 committed by Rudolf Marek
parent 6953eeb342
commit ef2928e708
1 changed files with 24 additions and 27 deletions

View File

@ -134,6 +134,21 @@ u8 smbus_read_byte(u8 dimm, u8 offset)
#define PSONREADY_TIMEOUT 0x7fffffff
static device_t get_vt8237_lpc(void)
{
device_t dev;
/* Power management controller */
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237R_LPC), 0);
if (dev != PCI_DEV_INVALID)
return dev;
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237S_LPC), 0);
return dev;
}
/**
* Enable the SMBus on VT8237R-based systems.
*/
@ -143,15 +158,9 @@ void enable_smbus(void)
int loops;
/* Power management controller */
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237R_LPC), 0);
if (dev == PCI_DEV_INVALID) {
/* Power management controller */
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237S_LPC), 0);
if (dev == PCI_DEV_INVALID)
die("Power management controller not found\n");
}
dev = get_vt8237_lpc();
if (dev == PCI_DEV_INVALID)
die("Power management controller not found\n");
/* Make sure the RTC power well is up before touching smbus. */
loops = 0;
@ -292,15 +301,9 @@ void enable_rom_decode(void)
device_t dev;
/* Power management controller */
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237R_LPC), 0);
if (dev == PCI_DEV_INVALID) {
/* Power management controller */
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237S_LPC), 0);
if (dev == PCI_DEV_INVALID)
return;
}
dev = get_vt8237_lpc();
if (dev == PCI_DEV_INVALID)
return;
/* ROM decode last 1MB FFC00000 - FFFFFFFF. */
pci_write_config8(dev, 0x41, 0x7f);
@ -316,15 +319,9 @@ static int acpi_is_wakeup_early(void) {
print_debug("IN TEST WAKEUP\n");
/* Power management controller */
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237R_LPC), 0);
if (dev == PCI_DEV_INVALID) {
/* Power management controller */
dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237S_LPC), 0);
if (dev == PCI_DEV_INVALID)
die("Power management controller not found\n");
}
dev = get_vt8237_lpc();
if (dev == PCI_DEV_INVALID)
die("Power management controller not found\n");
/* Set ACPI base address to I/O VT8237R_ACPI_IO_BASE. */
pci_write_config16(dev, 0x88, VT8237R_ACPI_IO_BASE | 0x1);