From b294582a0fb988767b02fc00087429e3b51b8de0 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 7 Nov 2007 00:19:42 +0000 Subject: Add PCI IDs for most Intel southbridges of the 82801 series (ICH/ICH0 up to the ICH9 family) in preparation for further code improvements for the i82801xx southbridge code. Small fixes in the 6300ESB PCI IDs. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2947 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/southbridge/intel/esb6300/esb6300.c | 4 ++-- src/southbridge/intel/esb6300/esb6300_bridge1c.c | 2 +- src/southbridge/intel/esb6300/esb6300_lpc.c | 2 +- src/southbridge/intel/esb6300/esb6300_pic.c | 2 +- src/southbridge/intel/esb6300/esb6300_sata.c | 2 +- src/southbridge/intel/esb6300/esb6300_uhci.c | 9 +++++---- 6 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/southbridge/intel') diff --git a/src/southbridge/intel/esb6300/esb6300.c b/src/southbridge/intel/esb6300/esb6300.c index 162771d7dc..11110191f7 100644 --- a/src/southbridge/intel/esb6300/esb6300.c +++ b/src/southbridge/intel/esb6300/esb6300.c @@ -22,11 +22,11 @@ void esb6300_enable(device_t dev) return; } if ((lpc_dev->vendor != PCI_VENDOR_ID_INTEL) || - (lpc_dev->device != PCI_DEVICE_ID_INTEL_6300ESB_ISA)) { + (lpc_dev->device != PCI_DEVICE_ID_INTEL_6300ESB_LPC)) { uint32_t id; id = pci_read_config32(lpc_dev, PCI_VENDOR_ID); if (id != (PCI_VENDOR_ID_INTEL | - (PCI_DEVICE_ID_INTEL_6300ESB_ISA << 16))) { + (PCI_DEVICE_ID_INTEL_6300ESB_LPC << 16))) { return; } } diff --git a/src/southbridge/intel/esb6300/esb6300_bridge1c.c b/src/southbridge/intel/esb6300/esb6300_bridge1c.c index 77ee8b5588..50bae9fb2a 100644 --- a/src/southbridge/intel/esb6300/esb6300_bridge1c.c +++ b/src/southbridge/intel/esb6300/esb6300_bridge1c.c @@ -46,6 +46,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_6300ESB_BRIDGE1C, + .device = PCI_DEVICE_ID_INTEL_6300ESB_PCI_X, }; diff --git a/src/southbridge/intel/esb6300/esb6300_lpc.c b/src/southbridge/intel/esb6300/esb6300_lpc.c index a704b756c1..52db05b6a4 100644 --- a/src/southbridge/intel/esb6300/esb6300_lpc.c +++ b/src/southbridge/intel/esb6300/esb6300_lpc.c @@ -406,5 +406,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_6300ESB_ISA, + .device = PCI_DEVICE_ID_INTEL_6300ESB_LPC, }; diff --git a/src/southbridge/intel/esb6300/esb6300_pic.c b/src/southbridge/intel/esb6300/esb6300_pic.c index 71d70e956b..97635ae524 100644 --- a/src/southbridge/intel/esb6300/esb6300_pic.c +++ b/src/southbridge/intel/esb6300/esb6300_pic.c @@ -104,6 +104,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_6300ESB_PIC1, + .device = PCI_DEVICE_ID_INTEL_6300ESB_APIC1, }; diff --git a/src/southbridge/intel/esb6300/esb6300_sata.c b/src/southbridge/intel/esb6300/esb6300_sata.c index 9c5c782170..0bedd93a9a 100644 --- a/src/southbridge/intel/esb6300/esb6300_sata.c +++ b/src/southbridge/intel/esb6300/esb6300_sata.c @@ -72,6 +72,6 @@ static const struct pci_driver sata_driver __pci_driver = { static const struct pci_driver sata_driver_nr __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_6300ESB_SATA_R, + .device = PCI_DEVICE_ID_INTEL_6300ESB_SATA_RAID, }; diff --git a/src/southbridge/intel/esb6300/esb6300_uhci.c b/src/southbridge/intel/esb6300/esb6300_uhci.c index efb106d8f6..9184ed24e4 100644 --- a/src/southbridge/intel/esb6300/esb6300_uhci.c +++ b/src/southbridge/intel/esb6300/esb6300_uhci.c @@ -36,10 +36,10 @@ 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_6300ESB_USB, + .device = PCI_DEVICE_ID_INTEL_6300ESB_USB1, }; static const struct pci_driver usb2_driver __pci_driver = { @@ -48,9 +48,10 @@ static const struct pci_driver usb2_driver __pci_driver = { .device = PCI_DEVICE_ID_INTEL_6300ESB_USB2, }; -static const struct pci_driver usb3_driver __pci_driver = { +/* Note: May or may not need different init than UHCI. */ +static const struct pci_driver ehci_driver __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_6300ESB_USB3, + .device = PCI_DEVICE_ID_INTEL_6300ESB_EHCI, }; -- cgit v1.2.3