diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2007-11-04 03:21:37 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2007-11-04 03:21:37 +0000 |
| commit | a29ec0633ad1cd277c17bba87d5094b2f981e726 (patch) | |
| tree | daf386bf9b8e7f9d44aeff74d67137a1170dfd46 | |
| parent | 02b2365f02cd987b7d4306a82bccaad19494443d (diff) | |
Restructure the PCI IDs list for the ICH* chipsets from ICH/ICH0 up to
ICH5/ICH5R (more to follow) in preparation of further 82801xx improvements.
Use human-readable names for the PCI ID #defines.
Rename *_ISA to *_LPC as per datasheet.
The 82801DBM only has 3 (not 4) USB devices, looks like a copy-paste error.
The fixes in southbridge code are only to keep the build working for now,
any real improvements will only go into the 82801xx code in future.
This is abuild-tested so it shouldn't break anything.
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2938 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
21 files changed, 159 insertions, 146 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 0e62bfb029..73ff5192ad 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -1829,36 +1829,136 @@ #define PCI_DEVICE_ID_INTEL_82371AB_USB 0x7112 #define PCI_DEVICE_ID_INTEL_82371AB_ACPI 0x7113 /* Same as SMB */ #define PCI_DEVICE_ID_INTEL_82371AB_SMB 0x7113 /* Same as ACPI */ -#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410 -#define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411 -#define PCI_DEVICE_ID_INTEL_82801AA_2 0x2412 -#define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413 -#define PCI_DEVICE_ID_INTEL_82801AA_5 0x2415 -#define PCI_DEVICE_ID_INTEL_82801AA_6 0x2416 -#define PCI_DEVICE_ID_INTEL_82801AA_8 0x2418 -#define PCI_DEVICE_ID_INTEL_82801AB_0 0x2420 -#define PCI_DEVICE_ID_INTEL_82801AB_1 0x2421 -#define PCI_DEVICE_ID_INTEL_82801AB_2 0x2422 -#define PCI_DEVICE_ID_INTEL_82801AB_3 0x2423 -#define PCI_DEVICE_ID_INTEL_82801AB_5 0x2425 -#define PCI_DEVICE_ID_INTEL_82801AB_6 0x2426 -#define PCI_DEVICE_ID_INTEL_82801AB_8 0x2428 -#define PCI_DEVICE_ID_INTEL_82801BA_1E0 0x244e -#define PCI_DEVICE_ID_INTEL_82801BA_1F0 0x2440 -#define PCI_DEVICE_ID_INTEL_82801BA_1F1 0x244b -#define PCI_DEVICE_ID_INTEL_82801BA_1F2 0x2442 -#define PCI_DEVICE_ID_INTEL_82801BA_1F3 0x2443 -#define PCI_DEVICE_ID_INTEL_82801BA_1F4 0x2444 -#define PCI_DEVICE_ID_INTEL_82801BA_1F5 0x2445 -#define PCI_DEVICE_ID_INTEL_82801CA_1E0 0x244e -#define PCI_DEVICE_ID_INTEL_82801CA_1F0 0x2480 -#define PCI_DEVICE_ID_INTEL_82801CA_1F1 0x248b -#define PCI_DEVICE_ID_INTEL_82801CA_1D0 0x2482 -#define PCI_DEVICE_ID_INTEL_82801CA_1F3 0x2483 -#define PCI_DEVICE_ID_INTEL_82801CA_1D1 0x2484 -#define PCI_DEVICE_ID_INTEL_82801CA_1F5 0x2485 -#define PCI_DEVICE_ID_INTEL_82801CA_1F6 0x2486 -#define PCI_DEVICE_ID_INTEL_82801CA_1D2 0x2487 + +/* Intel 82801AA (ICH) */ +#define PCI_DEVICE_ID_INTEL_82801AA_LPC 0x2410 +#define PCI_DEVICE_ID_INTEL_82801AA_IDE 0x2411 +#define PCI_DEVICE_ID_INTEL_82801AA_USB 0x2412 +#define PCI_DEVICE_ID_INTEL_82801AA_SMB 0x2413 +#define PCI_DEVICE_ID_INTEL_82801AA_AC97_AUDIO 0x2415 +#define PCI_DEVICE_ID_INTEL_82801AA_AC97_MODEM 0x2416 +#define PCI_DEVICE_ID_INTEL_82801AA_PCI 0x2418 + +/* Intel 82801AB (ICH0) */ +#define PCI_DEVICE_ID_INTEL_82801AB_LPC 0x2420 +#define PCI_DEVICE_ID_INTEL_82801AB_IDE 0x2421 +#define PCI_DEVICE_ID_INTEL_82801AB_USB 0x2422 +#define PCI_DEVICE_ID_INTEL_82801AB_SMB 0x2423 +#define PCI_DEVICE_ID_INTEL_82801AB_AC97_AUDIO 0x2425 +#define PCI_DEVICE_ID_INTEL_82801AB_AC97_MODEM 0x2426 +#define PCI_DEVICE_ID_INTEL_82801AB_PCI 0x2428 + +/* Intel 82801BA (ICH2) */ +#define PCI_DEVICE_ID_INTEL_82801BA_LPC 0x2440 +#define PCI_DEVICE_ID_INTEL_82801BA_USB_FN2 0x2442 +#define PCI_DEVICE_ID_INTEL_82801BA_SMB 0x2443 +#define PCI_DEVICE_ID_INTEL_82801BA_USB_FN4 0x2444 +#define PCI_DEVICE_ID_INTEL_82801BA_AC97_AUDIO 0x2445 +#define PCI_DEVICE_ID_INTEL_82801BA_AC97_MODEM 0x2446 +#define PCI_DEVICE_ID_INTEL_82801BA_LAN 0x2449 +#define PCI_DEVICE_ID_INTEL_82801BA_IDE 0x244b +#define PCI_DEVICE_ID_INTEL_82801BA_PCI 0x244e + +/* Intel 82801BAM (ICH2-M) */ +#define PCI_DEVICE_ID_INTEL_82801BAM_USB_FN2 0x2442 +#define PCI_DEVICE_ID_INTEL_82801BAM_SMB 0x2443 +#define PCI_DEVICE_ID_INTEL_82801BAM_USB_FN4 0x2444 +#define PCI_DEVICE_ID_INTEL_82801BAM_AC97_AUDIO 0x2445 +#define PCI_DEVICE_ID_INTEL_82801BAM_AC97_MODEM 0x2446 +#define PCI_DEVICE_ID_INTEL_82801BAM_PCI 0x2448 +#define PCI_DEVICE_ID_INTEL_82801BAM_LAN 0x2449 +#define PCI_DEVICE_ID_INTEL_82801BAM_IDE 0x244a +#define PCI_DEVICE_ID_INTEL_82801BAM_LPC 0x244c + +/* Intel 82801CA (ICH3-S) */ +#define PCI_DEVICE_ID_INTEL_82801CA_LAN 0x2449 +#define PCI_DEVICE_ID_INTEL_82801CA_PCI 0x244e +#define PCI_DEVICE_ID_INTEL_82801CA_LPC 0x2480 +#define PCI_DEVICE_ID_INTEL_82801CA_USB1 0x2482 +#define PCI_DEVICE_ID_INTEL_82801CA_SMB 0x2483 +#define PCI_DEVICE_ID_INTEL_82801CA_USB2 0x2484 +#define PCI_DEVICE_ID_INTEL_82801CA_AC97_AUDIO 0x2485 +#define PCI_DEVICE_ID_INTEL_82801CA_AC97_MODEM 0x2486 +#define PCI_DEVICE_ID_INTEL_82801CA_USB3 0x2487 +#define PCI_DEVICE_ID_INTEL_82801CA_IDE 0x248b + +/* Intel 82801CAM (ICH3-M) */ +#define PCI_DEVICE_ID_INTEL_82801CAM_PCI 0x2448 +#define PCI_DEVICE_ID_INTEL_82801CAM_LAN 0x2449 +#define PCI_DEVICE_ID_INTEL_82801CAM_USB1 0x2482 +#define PCI_DEVICE_ID_INTEL_82801CAM_SMB 0x2483 +#define PCI_DEVICE_ID_INTEL_82801CAM_USB2 0x2484 +#define PCI_DEVICE_ID_INTEL_82801CAM_AC97_AUDIO 0x2485 +#define PCI_DEVICE_ID_INTEL_82801CAM_AC97_MODEM 0x2486 +#define PCI_DEVICE_ID_INTEL_82801CAM_USB3 0x2487 +#define PCI_DEVICE_ID_INTEL_82801CAM_IDE 0x248a +#define PCI_DEVICE_ID_INTEL_82801CAM_LPC 0x248c + +/* Intel 82801DB (ICH4) */ +#define PCI_DEVICE_ID_INTEL_82801DB_LAN 0x103a +#define PCI_DEVICE_ID_INTEL_82801DB_PCI 0x244e +#define PCI_DEVICE_ID_INTEL_82801DB_LPC 0x24c0 +#define PCI_DEVICE_ID_INTEL_82801DB_USB1 0x24c2 +#define PCI_DEVICE_ID_INTEL_82801DB_SMB 0x24c3 +#define PCI_DEVICE_ID_INTEL_82801DB_USB2 0x24c4 +#define PCI_DEVICE_ID_INTEL_82801DB_AC97_AUDIO 0x24c5 +#define PCI_DEVICE_ID_INTEL_82801DB_AC97_MODEM 0x24c6 +#define PCI_DEVICE_ID_INTEL_82801DB_USB3 0x24c7 +#define PCI_DEVICE_ID_INTEL_82801DB_IDE 0x24cb +#define PCI_DEVICE_ID_INTEL_82801DB_EHCI 0x24cd + +/* Intel 82801DBM (ICH4-M) */ +#define PCI_DEVICE_ID_INTEL_82801DBM_LAN 0x103a +#define PCI_DEVICE_ID_INTEL_82801DBM_PCI 0x2448 +#define PCI_DEVICE_ID_INTEL_82801DBM_USB1 0x24c2 +#define PCI_DEVICE_ID_INTEL_82801DBM_SMB 0x24c3 +#define PCI_DEVICE_ID_INTEL_82801DBM_USB2 0x24c4 +#define PCI_DEVICE_ID_INTEL_82801DBM_AC97_AUDIO 0x24c5 +#define PCI_DEVICE_ID_INTEL_82801DBM_AC97_MODEM 0x24c6 +#define PCI_DEVICE_ID_INTEL_82801DBM_USB3 0x24c7 +#define PCI_DEVICE_ID_INTEL_82801DBM_IDE 0x24ca +#define PCI_DEVICE_ID_INTEL_82801DBM_LPC 0x24cc +#define PCI_DEVICE_ID_INTEL_82801DBM_EHCI 0x24cd + +/* Intel 82801EB (ICH5) */ +#define PCI_DEVICE_ID_INTEL_82801EB_LAN 0x1051 +#define PCI_DEVICE_ID_INTEL_82801EB_PCI 0x244e +#define PCI_DEVICE_ID_INTEL_82801EB_LPC 0x24d0 +#define PCI_DEVICE_ID_INTEL_82801EB_SATA 0x24d1 +#define PCI_DEVICE_ID_INTEL_82801EB_USB1 0x24d2 +#define PCI_DEVICE_ID_INTEL_82801EB_SMB 0x24d3 +#define PCI_DEVICE_ID_INTEL_82801EB_USB2 0x24d4 +#define PCI_DEVICE_ID_INTEL_82801EB_AC97_AUDIO 0x24d5 +#define PCI_DEVICE_ID_INTEL_82801EB_AC97_MODEM 0x24d6 +#define PCI_DEVICE_ID_INTEL_82801EB_USB3 0x24d7 +#define PCI_DEVICE_ID_INTEL_82801EB_IDE 0x24db +#define PCI_DEVICE_ID_INTEL_82801EB_EHCI 0x24dd +#define PCI_DEVICE_ID_INTEL_82801EB_USB4 0x24de + +/* Intel 82801ER (ICH5R) */ +#define PCI_DEVICE_ID_INTEL_82801ER_LAN 0x1051 +#define PCI_DEVICE_ID_INTEL_82801ER_PCI 0x244e +#define PCI_DEVICE_ID_INTEL_82801ER_LPC 0x24d0 +#define PCI_DEVICE_ID_INTEL_82801ER_USB1 0x24d2 +#define PCI_DEVICE_ID_INTEL_82801ER_SMB 0x24d3 +#define PCI_DEVICE_ID_INTEL_82801ER_USB2 0x24d4 +#define PCI_DEVICE_ID_INTEL_82801ER_AC97_AUDIO 0x24d5 +#define PCI_DEVICE_ID_INTEL_82801ER_AC97_MODEM 0x24d6 +#define PCI_DEVICE_ID_INTEL_82801ER_USB3 0x24d7 +#define PCI_DEVICE_ID_INTEL_82801ER_IDE 0x24db +#define PCI_DEVICE_ID_INTEL_82801ER_EHCI 0x24dd +#define PCI_DEVICE_ID_INTEL_82801ER_USB4 0x24de +#define PCI_DEVICE_ID_INTEL_82801ER_SATA 0x24df + +/* Intel 82801E (C-ICH) */ +#define PCI_DEVICE_ID_INTEL_82801E_LPC 0x2450 +#define PCI_DEVICE_ID_INTEL_82801E_USB 0x2452 +#define PCI_DEVICE_ID_INTEL_82801E_SMB 0x2453 +#define PCI_DEVICE_ID_INTEL_82801E_LAN1 0x2459 +#define PCI_DEVICE_ID_INTEL_82801E_IDE 0x245b +#define PCI_DEVICE_ID_INTEL_82801E_LAN2 0x245d +#define PCI_DEVICE_ID_INTEL_82801E_PCI 0x245e + #define PCI_DEVICE_ID_INTEL_82870_1E0 0x1461 #define PCI_DEVICE_ID_INTEL_82870_1F0 0x1460 #define PCI_DEVICE_ID_INTEL_82820FW_0 0x2440 @@ -1868,63 +1968,7 @@ #define PCI_DEVICE_ID_INTEL_82820FW_4 0x2449 #define PCI_DEVICE_ID_INTEL_82820FW_5 0x244b #define PCI_DEVICE_ID_INTEL_82820FW_6 0x244e -#define PCI_DEVICE_ID_INTEL_82801BA_0 0x2440 -#define PCI_DEVICE_ID_INTEL_82801BA_1 0x2442 -#define PCI_DEVICE_ID_INTEL_82801BA_2 0x2443 -#define PCI_DEVICE_ID_INTEL_82801BA_3 0x2444 -#define PCI_DEVICE_ID_INTEL_82801BA_4 0x2445 -#define PCI_DEVICE_ID_INTEL_82801BA_5 0x2446 -#define PCI_DEVICE_ID_INTEL_82801BA_6 0x2448 -#define PCI_DEVICE_ID_INTEL_82801BA_7 0x2449 -#define PCI_DEVICE_ID_INTEL_82801BA_8 0x244a -#define PCI_DEVICE_ID_INTEL_82801BA_9 0x244b -#define PCI_DEVICE_ID_INTEL_82801BA_10 0x244c -#define PCI_DEVICE_ID_INTEL_82801BA_11 0x244e -#define PCI_DEVICE_ID_INTEL_82801E_0 0x2450 -#define PCI_DEVICE_ID_INTEL_82801E_2 0x2452 -#define PCI_DEVICE_ID_INTEL_82801E_3 0x2453 -#define PCI_DEVICE_ID_INTEL_82801E_9 0x2459 -#define PCI_DEVICE_ID_INTEL_82801E_11 0x245b -#define PCI_DEVICE_ID_INTEL_82801E_13 0x245d -#define PCI_DEVICE_ID_INTEL_82801E_14 0x245e -#define PCI_DEVICE_ID_INTEL_82801CA_LAN 0x2449 -#define PCI_DEVICE_ID_INTEL_82801CA_PCI 0x244e // Same as 82801ER -#define PCI_DEVICE_ID_INTEL_82801CA_LPC 0x2480 -#define PCI_DEVICE_ID_INTEL_82801CA_USB 0x2482 -#define PCI_DEVICE_ID_INTEL_82801CA_SMB 0x2483 -#define PCI_DEVICE_ID_INTEL_82801CA_USB2 0x2484 -#define PCI_DEVICE_ID_INTEL_82801CA_AC97_AUDIO 0x2485 -#define PCI_DEVICE_ID_INTEL_82801CA_AC97_MODEM 0x2486 -#define PCI_DEVICE_ID_INTEL_82801CA_USB3 0x2487 -#define PCI_DEVICE_ID_INTEL_82801CA_10 0x248a -#define PCI_DEVICE_ID_INTEL_82801CA_IDE 0x248b -#define PCI_DEVICE_ID_INTEL_82801CA_12 0x248c -#define PCI_DEVICE_ID_INTEL_82801DB_0 0x24c0 -#define PCI_DEVICE_ID_INTEL_82801DB_2 0x24c2 -#define PCI_DEVICE_ID_INTEL_82801DB_3 0x24c3 -#define PCI_DEVICE_ID_INTEL_82801DB_4 0x24c4 -#define PCI_DEVICE_ID_INTEL_82801DB_5 0x24c5 -#define PCI_DEVICE_ID_INTEL_82801DB_6 0x24c6 -#define PCI_DEVICE_ID_INTEL_82801DB_7 0x24c7 -#define PCI_DEVICE_ID_INTEL_82801DB_11 0x24cb -#define PCI_DEVICE_ID_INTEL_82801DB_13 0x24cd -#define PCI_DEVICE_ID_INTEL_82801EB_0 0x24d0 -#define PCI_DEVICE_ID_INTEL_82801EB_USB 0x24d2 -#define PCI_DEVICE_ID_INTEL_82801EB_4 0x24d4 -#define PCI_DEVICE_ID_INTEL_82801EB_D 0x24dd -#define PCI_DEVICE_ID_INTEL_82801EB_E 0x24de -#define PCI_DEVICE_ID_INTEL_82801EB_IDE 0x24db -#define PCI_DEVICE_ID_INTEL_82801ER_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801ER_ISA 0x24d0 -#define PCI_DEVICE_ID_INTEL_82801ER_USB 0x24d2 -#define PCI_DEVICE_ID_INTEL_82801ER_SMB 0x24d3 -#define PCI_DEVICE_ID_INTEL_82801ER_USB2 0x24d4 -#define PCI_DEVICE_ID_INTEL_82801ER_AC97_AUDIO 0x24d5 -#define PCI_DEVICE_ID_INTEL_82801ER_AC97_MODEM 0x24d6 -#define PCI_DEVICE_ID_INTEL_82801ER_USB3 0x24d7 -#define PCI_DEVICE_ID_INTEL_82801ER_EHCI 0x24dd -#define PCI_DEVICE_ID_INTEL_82801ER_IDE 0x24db -#define PCI_DEVICE_ID_INTEL_82801ER_SATA 0x24df + #define PCI_DEVICE_ID_INTEL_6300ESB_ISA 0x25a1 #define PCI_DEVICE_ID_INTEL_6300ESB_AC97_AUDIO 0x25a6 #define PCI_DEVICE_ID_INTEL_6300ESB_AC97_MODEM 0x25a7 @@ -1966,31 +2010,6 @@ #define PCI_DEVICE_ID_INTEL_PCIE_PB 0x3597 #define PCI_DEVICE_ID_INTEL_PCIE_PC 0x3599 -#define PCI_DEVICE_ID_INTEL_82801DBM_1E0 0x2448 -#define PCI_DEVICE_ID_INTEL_82801DBM_1F0 0x24cc -#define PCI_DEVICE_ID_INTEL_82801DBM_1F1 0x24ca -#define PCI_DEVICE_ID_INTEL_82801DBM_1F3 0x24c3 -#define PCI_DEVICE_ID_INTEL_82801DBM_1F5 0x24c5 -#define PCI_DEVICE_ID_INTEL_82801DBM_1F6 0x24c6 -#define PCI_DEVICE_ID_INTEL_82801DBM_1D0 0x24c2 -#define PCI_DEVICE_ID_INTEL_82801DBM_1D1 0x24c4 -#define PCI_DEVICE_ID_INTEL_82801DBM_1D2 0x24c7 -#define PCI_DEVICE_ID_INTEL_82801DBM_1D7 0x24cd - -#define PCI_DEVICE_ID_INTEL_82801ER_1E0 0x244e -#define PCI_DEVICE_ID_INTEL_82801ER_1F0 0x24d0 -#define PCI_DEVICE_ID_INTEL_82801ER_1F1 0x24db -#define PCI_DEVICE_ID_INTEL_82801ER_1F2 0x24d1 -#define PCI_DEVICE_ID_INTEL_82801ER_1F2_R 0x24df -#define PCI_DEVICE_ID_INTEL_82801ER_1F3 0x24d3 -#define PCI_DEVICE_ID_INTEL_82801ER_1F5 0x24d5 -#define PCI_DEVICE_ID_INTEL_82801ER_1F6 0x24d6 -#define PCI_DEVICE_ID_INTEL_82801ER_1D0 0x24d2 -#define PCI_DEVICE_ID_INTEL_82801ER_1D1 0x24d4 -#define PCI_DEVICE_ID_INTEL_82801ER_1D2 0x24d7 -#define PCI_DEVICE_ID_INTEL_82801ER_1D3 0x24de -#define PCI_DEVICE_ID_INTEL_82801ER_1D7 0x24dd - #define PCI_VENDOR_ID_COMPUTONE 0x8e0e #define PCI_DEVICE_ID_COMPUTONE_IP2EX 0x0291 #define PCI_DEVICE_ID_COMPUTONE_PG 0x0302 diff --git a/src/mainboard/dell/s1850/reset.c b/src/mainboard/dell/s1850/reset.c index 874bfc4848..06d8886d8d 100644 --- a/src/mainboard/dell/s1850/reset.c +++ b/src/mainboard/dell/s1850/reset.c @@ -26,7 +26,7 @@ void full_reset(void) { device_t dev; /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_ISA), 0); + dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); if (dev != PCI_DEV_INVALID) { unsigned byte; byte = pci_read_config8(dev, 0xa4); diff --git a/src/mainboard/intel/jarrell/reset.c b/src/mainboard/intel/jarrell/reset.c index 874bfc4848..06d8886d8d 100644 --- a/src/mainboard/intel/jarrell/reset.c +++ b/src/mainboard/intel/jarrell/reset.c @@ -26,7 +26,7 @@ void full_reset(void) { device_t dev; /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_ISA), 0); + dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); if (dev != PCI_DEV_INVALID) { unsigned byte; byte = pci_read_config8(dev, 0xa4); diff --git a/src/mainboard/supermicro/x6dhe_g/reset.c b/src/mainboard/supermicro/x6dhe_g/reset.c index 874bfc4848..06d8886d8d 100644 --- a/src/mainboard/supermicro/x6dhe_g/reset.c +++ b/src/mainboard/supermicro/x6dhe_g/reset.c @@ -26,7 +26,7 @@ void full_reset(void) { device_t dev; /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_ISA), 0); + dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); if (dev != PCI_DEV_INVALID) { unsigned byte; byte = pci_read_config8(dev, 0xa4); diff --git a/src/mainboard/supermicro/x6dhe_g2/reset.c b/src/mainboard/supermicro/x6dhe_g2/reset.c index 874bfc4848..06d8886d8d 100644 --- a/src/mainboard/supermicro/x6dhe_g2/reset.c +++ b/src/mainboard/supermicro/x6dhe_g2/reset.c @@ -26,7 +26,7 @@ void full_reset(void) { device_t dev; /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_ISA), 0); + dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); if (dev != PCI_DEV_INVALID) { unsigned byte; byte = pci_read_config8(dev, 0xa4); diff --git a/src/mainboard/supermicro/x6dhr_ig/reset.c b/src/mainboard/supermicro/x6dhr_ig/reset.c index 874bfc4848..06d8886d8d 100644 --- a/src/mainboard/supermicro/x6dhr_ig/reset.c +++ b/src/mainboard/supermicro/x6dhr_ig/reset.c @@ -26,7 +26,7 @@ void full_reset(void) { device_t dev; /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_ISA), 0); + dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); if (dev != PCI_DEV_INVALID) { unsigned byte; byte = pci_read_config8(dev, 0xa4); diff --git a/src/mainboard/supermicro/x6dhr_ig2/reset.c b/src/mainboard/supermicro/x6dhr_ig2/reset.c index 874bfc4848..06d8886d8d 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/reset.c +++ b/src/mainboard/supermicro/x6dhr_ig2/reset.c @@ -26,7 +26,7 @@ void full_reset(void) { device_t dev; /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_ISA), 0); + dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); if (dev != PCI_DEV_INVALID) { unsigned byte; byte = pci_read_config8(dev, 0xa4); diff --git a/src/southbridge/intel/i82801ca/i82801ca_usb.c b/src/southbridge/intel/i82801ca/i82801ca_usb.c index 180d58504a..7e7c058b46 100644 --- a/src/southbridge/intel/i82801ca/i82801ca_usb.c +++ b/src/southbridge/intel/i82801ca/i82801ca_usb.c @@ -34,7 +34,7 @@ static struct device_operations usb_ops = { static const struct pci_driver usb_driver_1 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801CA_USB, + .device = PCI_DEVICE_ID_INTEL_82801CA_USB1, }; static const struct pci_driver usb_driver_2 __pci_driver = { .ops = &usb_ops, diff --git a/src/southbridge/intel/i82801db/i82801db_lpc.c b/src/southbridge/intel/i82801db/i82801db_lpc.c index fbc8805bd2..c7c203106f 100644 --- a/src/southbridge/intel/i82801db/i82801db_lpc.c +++ b/src/southbridge/intel/i82801db/i82801db_lpc.c @@ -412,5 +412,5 @@ static struct device_operations lpc_ops = { static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_ISA, + .device = PCI_DEVICE_ID_INTEL_82801DB_LPC, }; diff --git a/src/southbridge/intel/i82801db/i82801db_uhci.c b/src/southbridge/intel/i82801db/i82801db_uhci.c index 6b214e846b..77172fd309 100644 --- a/src/southbridge/intel/i82801db/i82801db_uhci.c +++ b/src/southbridge/intel/i82801db/i82801db_uhci.c @@ -54,21 +54,21 @@ static struct device_operations uhci_ops = { .ops_pci = &lops_pci, }; -static const struct pci_driver uhci_driver __pci_driver = { +static const struct pci_driver usb1_driver __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB0, + .device = PCI_DEVICE_ID_INTEL_82801DB_USB1, }; static const struct pci_driver usb2_driver __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB1, + .device = PCI_DEVICE_ID_INTEL_82801DB_USB2, }; static const struct pci_driver usb3_driver __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB2, + .device = PCI_DEVICE_ID_INTEL_82801DB_USB3, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c b/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c index a524b95142..3b364017dd 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c @@ -21,7 +21,7 @@ static struct device_operations ac97audio_ops = { static const struct pci_driver ac97audio_driver __pci_driver = { .ops = &ac97audio_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_1F5, + .device = PCI_DEVICE_ID_INTEL_82801DBM_AC97_AUDIO, }; @@ -37,5 +37,5 @@ static struct device_operations ac97modem_ops = { static const struct pci_driver ac97modem_driver __pci_driver = { .ops = &ac97modem_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_1F6, + .device = PCI_DEVICE_ID_INTEL_82801DBM_AC97_MODEM, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_ide.c b/src/southbridge/intel/i82801dbm/i82801dbm_ide.c index 4bb0d464e8..f7d799657b 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_ide.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_ide.c @@ -48,6 +48,6 @@ static struct device_operations ide_ops = { static const struct pci_driver ide_driver __pci_driver = { .ops = &ide_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1F1, + .device = PCI_DEVICE_ID_INTEL_82801DBM_IDE, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c index ba48718d6d..cec09192b7 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c @@ -211,5 +211,5 @@ static struct device_operations lpc_ops = { static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_1F0, + .device = PCI_DEVICE_ID_INTEL_82801DBM_LPC, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_pci.c b/src/southbridge/intel/i82801dbm/i82801dbm_pci.c index ca3b34738b..b69cd601c4 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_pci.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_pci.c @@ -28,6 +28,6 @@ static struct device_operations pci_ops = { static const struct pci_driver pci_driver __pci_driver = { .ops = &pci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_1E0, + .device = PCI_DEVICE_ID_INTEL_82801DBM_PCI, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_sata.c b/src/southbridge/intel/i82801dbm/i82801dbm_sata.c index 5b567c1507..405ee0e92f 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_sata.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_sata.c @@ -70,6 +70,6 @@ static struct device_operations sata_ops = { static const struct pci_driver stat_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1F2_R, + .device = PCI_DEVICE_ID_INTEL_82801DBM_SATA, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_usb.c b/src/southbridge/intel/i82801dbm/i82801dbm_usb.c index a14b6aa53e..3fd61673b2 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_usb.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_usb.c @@ -35,21 +35,15 @@ static struct device_operations usb_ops = { static const struct pci_driver usb_driver_1 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1D0, + .device = PCI_DEVICE_ID_INTEL_82801DBM_USB1, }; static const struct pci_driver usb_driver_2 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1D1, + .device = PCI_DEVICE_ID_INTEL_82801DBM_USB2, }; static const struct pci_driver usb_driver_3 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1D2, + .device = PCI_DEVICE_ID_INTEL_82801DBM_USB3, }; -static const struct pci_driver usb_driver_4 __pci_driver = { - .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1D3, -}; - diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c b/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c index 03ff797205..f05fbbb933 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c @@ -36,5 +36,5 @@ static struct device_operations usb2_ops = { static const struct pci_driver usb2_driver __pci_driver = { .ops = &usb2_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1D7, + .device = PCI_DEVICE_ID_INTEL_82801DBM_EHCI, }; diff --git a/src/southbridge/intel/i82801er/i82801er.c b/src/southbridge/intel/i82801er/i82801er.c index 5e38ac3acb..6738a52104 100644 --- a/src/southbridge/intel/i82801er/i82801er.c +++ b/src/southbridge/intel/i82801er/i82801er.c @@ -22,11 +22,11 @@ void i82801er_enable(device_t dev) return; } if ((lpc_dev->vendor != PCI_VENDOR_ID_INTEL) || - (lpc_dev->device != PCI_DEVICE_ID_INTEL_82801ER_ISA)) { + (lpc_dev->device != PCI_DEVICE_ID_INTEL_82801ER_LPC)) { uint32_t id; id = pci_read_config32(lpc_dev, PCI_VENDOR_ID); if (id != (PCI_VENDOR_ID_INTEL | - (PCI_DEVICE_ID_INTEL_82801ER_ISA << 16))) { + (PCI_DEVICE_ID_INTEL_82801ER_LPC << 16))) { return; } } diff --git a/src/southbridge/intel/i82801er/i82801er_lpc.c b/src/southbridge/intel/i82801er/i82801er_lpc.c index eff7a8cdf4..02d474e8d5 100644 --- a/src/southbridge/intel/i82801er/i82801er_lpc.c +++ b/src/southbridge/intel/i82801er/i82801er_lpc.c @@ -388,5 +388,5 @@ static struct device_operations lpc_ops = { static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_ISA, + .device = PCI_DEVICE_ID_INTEL_82801ER_LPC, }; diff --git a/src/southbridge/intel/i82801er/i82801er_sata.c b/src/southbridge/intel/i82801er/i82801er_sata.c index 515f1c9cc8..c710d83364 100644 --- a/src/southbridge/intel/i82801er/i82801er_sata.c +++ b/src/southbridge/intel/i82801er/i82801er_sata.c @@ -52,12 +52,12 @@ static struct device_operations sata_ops = { static const struct pci_driver sata_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1F2_R, + .device = PCI_DEVICE_ID_INTEL_82801ER_SATA, }; static const struct pci_driver sata_driver_nr __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_1F2, + .device = PCI_DEVICE_ID_INTEL_82801EB_SATA, }; diff --git a/src/southbridge/intel/i82801er/i82801er_uhci.c b/src/southbridge/intel/i82801er/i82801er_uhci.c index bf19bcbcf7..c0f42314a5 100644 --- a/src/southbridge/intel/i82801er/i82801er_uhci.c +++ b/src/southbridge/intel/i82801er/i82801er_uhci.c @@ -39,7 +39,7 @@ static struct device_operations uhci_ops = { static const struct pci_driver uhci_driver __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801ER_USB, + .device = PCI_DEVICE_ID_INTEL_82801ER_USB1, }; static const struct pci_driver usb2_driver __pci_driver = { |