diff options
| -rw-r--r-- | src/include/device/pci_ids.h | 5 | ||||
| -rw-r--r-- | src/northbridge/intel/haswell/northbridge.c | 16 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/lpc.c | 23 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/spi.c | 9 |
4 files changed, 22 insertions, 31 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 7aac1f7076..e9e5ab7517 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -2600,6 +2600,11 @@ #define PCI_DEVICE_ID_INTEL_PCIE_PB 0x3597 #define PCI_DEVICE_ID_INTEL_PCIE_PC 0x3599 +/* Intel Lynx Point Device IDS */ + +#define PCI_DEVICE_ID_INTEL_LYNXPOINT_MOB_DESK_MIN 0x8c41 +#define PCI_DEVICE_ID_INTEL_LYNXPOINT_MOB_DESK_MAX 0x8c4f + #define PCI_VENDOR_ID_COMPUTONE 0x8e0e #define PCI_DEVICE_ID_COMPUTONE_IP2EX 0x0291 #define PCI_DEVICE_ID_COMPUTONE_PG 0x0302 diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c index 1c6a8fce8b..52b24bae04 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -461,22 +461,10 @@ static struct device_operations mc_ops = { .ops_pci = &intel_pci_ops, }; -static const struct pci_driver mc_driver_0100 __pci_driver = { +static const struct pci_driver mc_driver_hsw_mobile __pci_driver = { .ops = &mc_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = 0x0100, -}; - -static const struct pci_driver mc_driver __pci_driver = { - .ops = &mc_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = 0x0104, /* Sandy bridge */ -}; - -static const struct pci_driver mc_driver_1 __pci_driver = { - .ops = &mc_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = 0x0154, /* Ivy bridge */ + .device = 0x0c04, /* Mobile Haswell */ }; static void cpu_bus_init(device_t dev) diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index 55c2f5aaa0..a121e49874 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -647,16 +647,19 @@ static struct device_operations device_ops = { }; -/* IDs for LPC device of Intel 6 Series Chipset, Intel 7 Series Chipset, and - * Intel C200 Series Chipset - */ - -static const unsigned short pci_device_ids[] = { 0x1c46, 0x1c47, 0x1c49, 0x1c4a, - 0x1c4b, 0x1c4c, 0x1c4d, 0x1c4e, - 0x1c4f, 0x1c50, 0x1c52, 0x1c54, - 0x1e55, 0x1c56, 0x1e57, 0x1c5c, - 0x1e5d, 0x1e5e, 0x1e5f, - 0 }; +/* IDs for LPC device of Intel 8 Series Chipset (Lynx Point) */ +static const unsigned short pci_device_ids[] = { + 0x8c41, /* Mobile Full Featured Engineering Sample. */ + 0x8c42, /* Desktop Full Featured Engineering Sample. */ + 0x8c44, /* Z87 SKU */ + 0x8c46, /* Z85 SKU */ + 0x8c49, /* HM86 SKU */ + 0x8c4a, /* H87 SKU */ + 0x8c4b, /* HM87 SKU */ + 0x8c4c, /* Q85 SKU */ + 0x8c4e, /* Q87 SKU */ + 0x8c4f, /* QM87 SKU */ + 0 }; static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, diff --git a/src/southbridge/intel/lynxpoint/spi.c b/src/southbridge/intel/lynxpoint/spi.c index 2050412345..8eea28c88f 100644 --- a/src/southbridge/intel/lynxpoint/spi.c +++ b/src/southbridge/intel/lynxpoint/spi.c @@ -310,13 +310,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, */ static inline int get_ich_version(uint16_t device_id) { - if (device_id == PCI_DEVICE_ID_INTEL_TGP_LPC) - return 7; - - if ((device_id >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && - device_id <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX) || - (device_id >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN && - device_id <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) + if (device_id >= PCI_DEVICE_ID_INTEL_LYNXPOINT_MOB_DESK_MIN && + device_id <= PCI_DEVICE_ID_INTEL_LYNXPOINT_MOB_DESK_MAX) return 9; return 0; |