From 6adfaa690ce918a35098b2b91028f20298b974aa Mon Sep 17 00:00:00 2001 From: Ed Swierk Date: Mon, 25 Aug 2008 17:02:09 +0000 Subject: This patch adds PCI device IDs for the Intel EP80579 Integrated Processor, and renames some existing macros for clarity. Signed-off-by: Ed Swierk Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3536 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/device/pci_ids.h | 21 ++++++++++++++++----- src/northbridge/intel/i3100/pciexp_porta.c | 2 +- src/southbridge/intel/i3100/i3100_sata.c | 8 ++++---- src/southbridge/intel/i3100/i3100_uhci.c | 6 +++--- 4 files changed, 24 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 8f0faffe85..2331f3b4fe 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -2345,15 +2345,26 @@ #define PCI_DEVICE_ID_INTEL_3100_LPC 0x2670 #define PCI_DEVICE_ID_INTEL_3100_EHCI 0x268c #define PCI_DEVICE_ID_INTEL_3100_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_3100_SATA 0x2680 -#define PCI_DEVICE_ID_INTEL_3100_SATA_R 0x2681 -#define PCI_DEVICE_ID_INTEL_3100_USB 0x2688 -#define PCI_DEVICE_ID_INTEL_3100_USB2 0x2689 +#define PCI_DEVICE_ID_INTEL_3100_IDE 0x2680 +#define PCI_DEVICE_ID_INTEL_3100_AHCI 0x2681 +#define PCI_DEVICE_ID_INTEL_3100_UHCI 0x2688 +#define PCI_DEVICE_ID_INTEL_3100_UHCI2 0x2689 #define PCI_DEVICE_ID_INTEL_3100_SMB 0x269b #define PCI_DEVICE_ID_INTEL_3100_MC 0x35b0 -#define PCI_DEVICE_ID_INTEL_3100_PCIE_PA 0x35b6 +#define PCI_DEVICE_ID_INTEL_3100_PCIE_PA0 0x35b6 #define PCI_DEVICE_ID_INTEL_3100_PCIE_PA1 0x35b7 +/* Intel EP80579 */ +#define PCI_DEVICE_ID_INTEL_EP80579_LPC 0x5031 +#define PCI_DEVICE_ID_INTEL_EP80579_EHCI 0x5035 +#define PCI_DEVICE_ID_INTEL_EP80579_IDE 0x5028 +#define PCI_DEVICE_ID_INTEL_EP80579_AHCI 0x5029 +#define PCI_DEVICE_ID_INTEL_EP80579_UHCI 0x5033 +#define PCI_DEVICE_ID_INTEL_EP80579_SMB 0x5032 +#define PCI_DEVICE_ID_INTEL_EP80579_MC 0x5020 +#define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA0 0x5024 +#define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA1 0x5025 + #define PCI_DEVICE_ID_INTEL_80310 0x530d #define PCI_DEVICE_ID_INTEL_82810_MC1 0x7120 #define PCI_DEVICE_ID_INTEL_82810_IG1 0x7121 diff --git a/src/northbridge/intel/i3100/pciexp_porta.c b/src/northbridge/intel/i3100/pciexp_porta.c index b887e5ec28..8cafb28f38 100644 --- a/src/northbridge/intel/i3100/pciexp_porta.c +++ b/src/northbridge/intel/i3100/pciexp_porta.c @@ -78,7 +78,7 @@ static struct device_operations pcie_ops = { static struct pci_driver pci_driver_0 __pci_driver = { .ops = &pcie_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_3100_PCIE_PA, + .device = PCI_DEVICE_ID_INTEL_3100_PCIE_PA0, }; static struct pci_driver pci_driver_1 __pci_driver = { diff --git a/src/southbridge/intel/i3100/i3100_sata.c b/src/southbridge/intel/i3100/i3100_sata.c index 7f1bd77e20..49ecf9240a 100644 --- a/src/southbridge/intel/i3100/i3100_sata.c +++ b/src/southbridge/intel/i3100/i3100_sata.c @@ -79,23 +79,23 @@ static struct device_operations sata_ops = { static struct pci_driver sata_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_3100_SATA, + .device = PCI_DEVICE_ID_INTEL_3100_IDE, }; static struct pci_driver sata_driver_nr __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_3100_SATA_R, + .device = PCI_DEVICE_ID_INTEL_3100_AHCI, }; static struct pci_driver sata_driver_ep80579 __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_EP80579_SATA, + .device = PCI_DEVICE_ID_INTEL_EP80579_IDE, }; static struct pci_driver sata_driver_nr_ep80579 __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_EP80579_SATA_R, + .device = PCI_DEVICE_ID_INTEL_EP80579_AHCI, }; diff --git a/src/southbridge/intel/i3100/i3100_uhci.c b/src/southbridge/intel/i3100/i3100_uhci.c index 85a1c1b10a..e5c25a95a1 100644 --- a/src/southbridge/intel/i3100/i3100_uhci.c +++ b/src/southbridge/intel/i3100/i3100_uhci.c @@ -52,17 +52,17 @@ static struct device_operations uhci_ops = { static struct pci_driver uhci_driver __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_3100_USB, + .device = PCI_DEVICE_ID_INTEL_3100_UHCI, }; static struct pci_driver usb2_driver __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_3100_USB2, + .device = PCI_DEVICE_ID_INTEL_3100_UHCI2, }; static struct pci_driver uhci_driver_ep80579 __pci_driver = { .ops = &uhci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_EP80579_USB, + .device = PCI_DEVICE_ID_INTEL_EP80579_UHCI, }; -- cgit v1.2.3