summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/northbridge/intel/haswell/haswell.h4
-rw-r--r--src/northbridge/intel/haswell/northbridge.c23
2 files changed, 9 insertions, 18 deletions
diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h
index d14ee4fd2c..33818ee4aa 100644
--- a/src/northbridge/intel/haswell/haswell.h
+++ b/src/northbridge/intel/haswell/haswell.h
@@ -210,10 +210,6 @@ struct ied_header {
u8 reserved[34];
} __packed;
-#define PCI_DEVICE_ID_HSW_DESKTOP 0x0c00
-#define PCI_DEVICE_ID_HSW_MOBILE 0x0c04
-#define PCI_DEVICE_ID_HSW_ULT 0x0a04
-
#ifdef __SMM__
void intel_northbridge_haswell_finalize_smm(void);
#else /* !__SMM__ */
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 4501afa009..2b9e1553d3 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -478,22 +478,17 @@ static struct device_operations mc_ops = {
.ops_pci = &intel_pci_ops,
};
-static const struct pci_driver mc_driver_hsw_normal __pci_driver = {
- .ops = &mc_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_HSW_DESKTOP,
+static const unsigned short mc_pci_device_ids[] = {
+ 0x0c00, /* Desktop */
+ 0x0c04, /* Mobile */
+ 0x0a04, /* ULT */
+ 0
};
-static const struct pci_driver mc_driver_hsw_mobile __pci_driver = {
- .ops = &mc_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_HSW_MOBILE,
-};
-
-static const struct pci_driver mc_driver_hsw_ult __pci_driver = {
- .ops = &mc_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_HSW_ULT,
+static const struct pci_driver mc_driver_hsw __pci_driver = {
+ .ops = &mc_ops,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .devices = mc_pci_device_ids,
};
static void cpu_bus_init(struct device *dev)