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 /src/southbridge/intel/i82801er | |
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
Diffstat (limited to 'src/southbridge/intel/i82801er')
-rw-r--r-- | src/southbridge/intel/i82801er/i82801er.c | 4 | ||||
-rw-r--r-- | src/southbridge/intel/i82801er/i82801er_lpc.c | 2 | ||||
-rw-r--r-- | src/southbridge/intel/i82801er/i82801er_sata.c | 4 | ||||
-rw-r--r-- | src/southbridge/intel/i82801er/i82801er_uhci.c | 2 |
4 files changed, 6 insertions, 6 deletions
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 = { |