diff options
| author | Felix Singer <felixsinger@posteo.net> | 2022-03-07 04:34:52 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-03-07 08:32:09 +0000 |
| commit | 43b7f416783ccc98952a4eb5f9274907442b03e5 (patch) | |
| tree | 86a45336e809bee5d2891f2be9cf00184da9bb18 /src | |
| parent | 2c423441c054d7a8c93cc814b9db5f8f7185bd0f (diff) | |
src: Make PCI ID define names shorter
Shorten define names containing PCI_{DEVICE,VENDOR}_ID_ with
PCI_{DID,VID}_ using the commands below, which also take care of some
spacing issues. An additional clean up of pci_ids.h is done in
CB:61531.
Used commands:
* find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]\{2\}\([_0-9A-Za-z]\{8\}\)*[_0-9A-Za-z]\{0,5\}\)\t/PCI_\1ID_\3\t\t/g'
* find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]*\)/PCI_\1ID_\3/g'
Change-Id: If9027700f53b6d0d3964c26a41a1f9b8f62be178
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'src')
263 files changed, 6876 insertions, 6878 deletions
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c index 70ffe48b26..b8dafd1bdd 100644 --- a/src/device/pci_rom.c +++ b/src/device/pci_rom.c @@ -276,7 +276,7 @@ pci_rom_write_acpi_tables(const struct device *device, unsigned long current, return current; /* AMD/ATI uses VFCT */ - if (device->vendor == PCI_VENDOR_ID_ATI) { + if (device->vendor == PCI_VID_ATI) { acpi_vfct_t *vfct; current = ALIGN_UP(current, 8); diff --git a/src/drivers/aspeed/ast2050/ast2050.c b/src/drivers/aspeed/ast2050/ast2050.c index 5cb7198c29..7ead9a832f 100644 --- a/src/drivers/aspeed/ast2050/ast2050.c +++ b/src/drivers/aspeed/ast2050/ast2050.c @@ -60,6 +60,6 @@ static struct device_operations aspeed_ast2050_ops = { static const struct pci_driver aspeed_ast2050_driver __pci_driver = { .ops = &aspeed_ast2050_ops, - .vendor = PCI_VENDOR_ID_ASPEED, - .device = PCI_DEVICE_ID_ASPEED_AST2050_VGA, + .vendor = PCI_VID_ASPEED, + .device = PCI_DID_ASPEED_AST2050_VGA, }; diff --git a/src/drivers/broadcom/bcm57xx_aspm_disable.c b/src/drivers/broadcom/bcm57xx_aspm_disable.c index 197be1e194..130e981551 100644 --- a/src/drivers/broadcom/bcm57xx_aspm_disable.c +++ b/src/drivers/broadcom/bcm57xx_aspm_disable.c @@ -27,6 +27,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver bcm57xx_aspm_fixup __pci_driver = { .ops = &bcm57xx_aspm_fixup_ops, - .vendor = PCI_VENDOR_ID_BROADCOM, + .vendor = PCI_VID_BROADCOM, .devices = pci_device_ids, }; diff --git a/src/drivers/generic/bayhub/bh720.c b/src/drivers/generic/bayhub/bh720.c index 58a50173dd..8358b6a8e9 100644 --- a/src/drivers/generic/bayhub/bh720.c +++ b/src/drivers/generic/bayhub/bh720.c @@ -108,13 +108,13 @@ static struct device_operations bh720_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_O2_BH720, + PCI_DID_O2_BH720, 0 }; static const struct pci_driver bayhub_bh720 __pci_driver = { .ops = &bh720_ops, - .vendor = PCI_VENDOR_ID_O2, + .vendor = PCI_VID_O2, .devices = pci_device_ids, }; diff --git a/src/drivers/generic/bayhub_lv2/lv2.c b/src/drivers/generic/bayhub_lv2/lv2.c index 7cd8a3651f..3a249e0419 100644 --- a/src/drivers/generic/bayhub_lv2/lv2.c +++ b/src/drivers/generic/bayhub_lv2/lv2.c @@ -70,13 +70,13 @@ static struct device_operations lv2_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_O2_LV2, + PCI_DID_O2_LV2, 0 }; static const struct pci_driver bayhub_lv2 __pci_driver = { .ops = &lv2_ops, - .vendor = PCI_VENDOR_ID_O2, + .vendor = PCI_VID_O2, .devices = pci_device_ids, }; diff --git a/src/drivers/genesyslogic/gl9750/gl9750.c b/src/drivers/genesyslogic/gl9750/gl9750.c index ca5cd096a5..c021eadf00 100644 --- a/src/drivers/genesyslogic/gl9750/gl9750.c +++ b/src/drivers/genesyslogic/gl9750/gl9750.c @@ -35,13 +35,13 @@ static struct device_operations gl9750_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_GLI_9750, + PCI_DID_GLI_9750, 0 }; static const struct pci_driver genesyslogic_gl9750 __pci_driver = { .ops = &gl9750_ops, - .vendor = PCI_VENDOR_ID_GLI, + .vendor = PCI_VID_GLI, .devices = pci_device_ids, }; diff --git a/src/drivers/genesyslogic/gl9755/gl9755.c b/src/drivers/genesyslogic/gl9755/gl9755.c index 44342c6632..bf4831c504 100644 --- a/src/drivers/genesyslogic/gl9755/gl9755.c +++ b/src/drivers/genesyslogic/gl9755/gl9755.c @@ -47,13 +47,13 @@ static struct device_operations gl9755_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_GLI_9755, + PCI_DID_GLI_9755, 0 }; static const struct pci_driver genesyslogic_gl9755 __pci_driver = { .ops = &gl9755_ops, - .vendor = PCI_VENDOR_ID_GLI, + .vendor = PCI_VID_GLI, .devices = pci_device_ids, }; diff --git a/src/drivers/genesyslogic/gl9763e/gl9763e.c b/src/drivers/genesyslogic/gl9763e/gl9763e.c index cd581b9380..4dcfbdcbd0 100644 --- a/src/drivers/genesyslogic/gl9763e/gl9763e.c +++ b/src/drivers/genesyslogic/gl9763e/gl9763e.c @@ -50,13 +50,13 @@ static struct device_operations gl9763e_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_GLI_9763E, + PCI_DID_GLI_9763E, 0 }; static const struct pci_driver genesyslogic_gl9763e __pci_driver = { .ops = &gl9763e_ops, - .vendor = PCI_VENDOR_ID_GLI, + .vendor = PCI_VID_GLI, .devices = pci_device_ids, }; diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c index 430bda35b1..ff77f653b0 100644 --- a/src/drivers/intel/gma/opregion.c +++ b/src/drivers/intel/gma/opregion.c @@ -159,7 +159,7 @@ static enum cb_err locate_vbt_vbios(const u8 *vbios, struct region_device *rdev) /* Make sure we got an Intel VGA option rom */ if ((oprom->signature != OPROM_SIGNATURE) || - (pcir->vendor != PCI_VENDOR_ID_INTEL) || + (pcir->vendor != PCI_VID_INTEL) || (pcir->signature != 0x52494350) || (pcir->classcode[0] != 0x00) || (pcir->classcode[1] != 0x00) || diff --git a/src/drivers/intel/i210/i210.c b/src/drivers/intel/i210/i210.c index 32cae6f269..0b2fcd250e 100644 --- a/src/drivers/intel/i210/i210.c +++ b/src/drivers/intel/i210/i210.c @@ -224,6 +224,6 @@ static const unsigned short i210_device_ids[] = { 0x1537, 0x1538, 0x1533, 0 }; static const struct pci_driver i210_driver __pci_driver = { .ops = &i210_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = i210_device_ids, }; diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c index 9ab4f2d510..7718ac543f 100644 --- a/src/drivers/intel/ish/ish.c +++ b/src/drivers/intel/ish/ish.c @@ -51,16 +51,16 @@ static const struct device_operations pci_ish_device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CNL_ISHB, - PCI_DEVICE_ID_INTEL_CML_ISHB, - PCI_DEVICE_ID_INTEL_TGL_ISHB, - PCI_DEVICE_ID_INTEL_TGL_H_ISHB, + PCI_DID_INTEL_CNL_ISHB, + PCI_DID_INTEL_CML_ISHB, + PCI_DID_INTEL_TGL_ISHB, + PCI_DID_INTEL_TGL_H_ISHB, 0 }; static const struct pci_driver ish_intel_driver __pci_driver = { .ops = &pci_ish_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index 3432249f8a..b4ef40e426 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -267,7 +267,7 @@ static void r8168_set_customized_led(struct device *dev, u16 io_base) if (!config) return; - if (dev->device == PCI_DEVICE_ID_REALTEK_8125) { + if (dev->device == PCI_DID_REALTEK_8125) { /* Set LED global Feature register */ outb(config->led_feature, io_base + CMD_LED_FEATURE); printk(BIOS_DEBUG, "r8125: read back LED global feature setting as 0x%x\n", @@ -425,14 +425,14 @@ static struct device_operations r8168_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_REALTEK_8168, - PCI_DEVICE_ID_REALTEK_8125, + PCI_DID_REALTEK_8168, + PCI_DID_REALTEK_8125, 0 }; static const struct pci_driver r8168_driver __pci_driver = { .ops = &r8168_ops, - .vendor = PCI_VENDOR_ID_REALTEK, + .vendor = PCI_VID_REALTEK, .devices = pci_device_ids, }; diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c index 9d8c399804..c85b4d1bff 100644 --- a/src/drivers/ricoh/rce822/rce822.c +++ b/src/drivers/ricoh/rce822/rce822.c @@ -53,7 +53,7 @@ static const unsigned short pci_device_ids[] = { 0xe822, 0xe823, 0 }; static const struct pci_driver rce822 __pci_driver = { .ops = &rce822_ops, - .vendor = PCI_VENDOR_ID_RICOH, + .vendor = PCI_VID_RICOH, .devices = pci_device_ids, }; diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c index 0b4c7d47ea..fe6eb155c6 100644 --- a/src/drivers/siemens/nc_fpga/nc_fpga.c +++ b/src/drivers/siemens/nc_fpga/nc_fpga.c @@ -165,6 +165,6 @@ static const unsigned short nc_fpga_device_ids[] = { 0x4080, 0x4091, 0 }; static const struct pci_driver nc_fpga_driver __pci_driver = { .ops = &nc_fpga_ops, - .vendor = PCI_VENDOR_ID_SIEMENS, + .vendor = PCI_VID_SIEMENS, .devices = nc_fpga_device_ids, }; diff --git a/src/drivers/siemens/nc_fpga/nc_fpga_early.c b/src/drivers/siemens/nc_fpga/nc_fpga_early.c index 6ec0349922..a68beb2687 100644 --- a/src/drivers/siemens/nc_fpga/nc_fpga_early.c +++ b/src/drivers/siemens/nc_fpga/nc_fpga_early.c @@ -17,7 +17,7 @@ int pci_early_device_probe(u8 bus, u8 dev, u32 mmio_base) pci_devfn_t pci_dev = PCI_DEV(bus, dev, 0); uint32_t id = pci_s_read_config32(pci_dev, PCI_VENDOR_ID); - if (id != (0x4091 << 16 | PCI_VENDOR_ID_SIEMENS)) + if (id != (0x4091 << 16 | PCI_VID_SIEMENS)) return -1; /* Setup base address for BAR0. */ diff --git a/src/drivers/usb/pci_xhci/pci_xhci.c b/src/drivers/usb/pci_xhci/pci_xhci.c index 26bc9c0964..1952130e1a 100644 --- a/src/drivers/usb/pci_xhci/pci_xhci.c +++ b/src/drivers/usb/pci_xhci/pci_xhci.c @@ -253,15 +253,15 @@ static const struct device_operations xhci_pci_ops = { }; static const unsigned short amd_pci_device_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI0, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI1, - PCI_DEVICE_ID_AMD_FAM17H_MODEL20H_XHCI0, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_XHCI, + PCI_DID_AMD_FAM17H_MODEL18H_XHCI0, + PCI_DID_AMD_FAM17H_MODEL18H_XHCI1, + PCI_DID_AMD_FAM17H_MODEL20H_XHCI0, + PCI_DID_AMD_FAM17H_MODEL60H_XHCI, 0 }; static const struct pci_driver xhci_pci_driver __pci_driver = { .ops = &xhci_pci_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = amd_pci_device_ids, }; diff --git a/src/drivers/wifi/generic/acpi.c b/src/drivers/wifi/generic/acpi.c index 16c1839c23..63faae0176 100644 --- a/src/drivers/wifi/generic/acpi.c +++ b/src/drivers/wifi/generic/acpi.c @@ -470,7 +470,7 @@ static void emit_sar_acpi_structures(const struct device *dev) * If device type is PCI, ensure that the device has Intel vendor ID. CBFS SAR and SAR * ACPI tables are currently used only by Intel WiFi devices. */ - if (dev->path.type == DEVICE_PATH_PCI && dev->vendor != PCI_VENDOR_ID_INTEL) + if (dev->path.type == DEVICE_PATH_PCI && dev->vendor != PCI_VID_INTEL) return; /* Retrieve the sar limits data */ diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c index 1ee7ab23ee..de93741f27 100644 --- a/src/drivers/wifi/generic/generic.c +++ b/src/drivers/wifi/generic/generic.c @@ -59,44 +59,44 @@ struct chip_operations drivers_wifi_generic_ops = { }; static const unsigned short intel_pci_device_ids[] = { - PCI_DEVICE_ID_1000_SERIES_WIFI, - PCI_DEVICE_ID_6005_SERIES_WIFI, - PCI_DEVICE_ID_6005_I_SERIES_WIFI, - PCI_DEVICE_ID_1030_SERIES_WIFI, - PCI_DEVICE_ID_6030_I_SERIES_WIFI, - PCI_DEVICE_ID_6030_SERIES_WIFI, - PCI_DEVICE_ID_6150_SERIES_WIFI, - PCI_DEVICE_ID_2030_SERIES_WIFI, - PCI_DEVICE_ID_2000_SERIES_WIFI, - PCI_DEVICE_ID_0135_SERIES_WIFI, - PCI_DEVICE_ID_0105_SERIES_WIFI, - PCI_DEVICE_ID_6035_SERIES_WIFI, - PCI_DEVICE_ID_5300_SERIES_WIFI, - PCI_DEVICE_ID_5100_SERIES_WIFI, - PCI_DEVICE_ID_6000_SERIES_WIFI, - PCI_DEVICE_ID_6000_I_SERIES_WIFI, - PCI_DEVICE_ID_5350_SERIES_WIFI, - PCI_DEVICE_ID_5150_SERIES_WIFI, + PCI_DID_1000_SERIES_WIFI, + PCI_DID_6005_SERIES_WIFI, + PCI_DID_6005_I_SERIES_WIFI, + PCI_DID_1030_SERIES_WIFI, + PCI_DID_6030_I_SERIES_WIFI, + PCI_DID_6030_SERIES_WIFI, + PCI_DID_6150_SERIES_WIFI, + PCI_DID_2030_SERIES_WIFI, + PCI_DID_2000_SERIES_WIFI, + PCI_DID_0135_SERIES_WIFI, + PCI_DID_0105_SERIES_WIFI, + PCI_DID_6035_SERIES_WIFI, + PCI_DID_5300_SERIES_WIFI, + PCI_DID_5100_SERIES_WIFI, + PCI_DID_6000_SERIES_WIFI, + PCI_DID_6000_I_SERIES_WIFI, + PCI_DID_5350_SERIES_WIFI, + PCI_DID_5150_SERIES_WIFI, /* Wilkins Peak 2 */ - PCI_DEVICE_ID_WP_7260_SERIES_1_WIFI, - PCI_DEVICE_ID_WP_7260_SERIES_2_WIFI, + PCI_DID_WP_7260_SERIES_1_WIFI, + PCI_DID_WP_7260_SERIES_2_WIFI, /* Stone Peak 2 */ - PCI_DEVICE_ID_SP_7265_SERIES_1_WIFI, - PCI_DEVICE_ID_SP_7265_SERIES_2_WIFI, + PCI_DID_SP_7265_SERIES_1_WIFI, + PCI_DID_SP_7265_SERIES_2_WIFI, /* Stone Field Peak */ - PCI_DEVICE_ID_SFP_8260_SERIES_1_WIFI, - PCI_DEVICE_ID_SFP_8260_SERIES_2_WIFI, + PCI_DID_SFP_8260_SERIES_1_WIFI, + PCI_DID_SFP_8260_SERIES_2_WIFI, /* Windstorm Peak */ - PCI_DEVICE_ID_WSP_8275_SERIES_1_WIFI, + PCI_DID_WSP_8275_SERIES_1_WIFI, /* Thunder Peak 2 */ - PCI_DEVICE_ID_TP_9260_SERIES_WIFI, + PCI_DID_TP_9260_SERIES_WIFI, /* Cyclone Peak */ - PCI_DEVICE_ID_CyP_6SERIES_WIFI, + PCI_DID_CyP_6SERIES_WIFI, /* Typhoon Peak */ - PCI_DEVICE_ID_TyP_6SERIES_WIFI, + PCI_DID_TyP_6SERIES_WIFI, /* Garfield Peak */ - PCI_DEVICE_ID_GrP_6SERIES_1_WIFI, - PCI_DEVICE_ID_GrP_6SERIES_2_WIFI, + PCI_DID_GrP_6SERIES_1_WIFI, + PCI_DID_GrP_6SERIES_2_WIFI, 0 }; @@ -108,6 +108,6 @@ static const unsigned short intel_pci_device_ids[] = { */ static const struct pci_driver intel_wifi_pci_driver __pci_driver = { .ops = &wifi_pcie_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = intel_pci_device_ids, }; diff --git a/src/drivers/wifi/generic/smbios.c b/src/drivers/wifi/generic/smbios.c index 9c83df655e..82c96a52a8 100644 --- a/src/drivers/wifi/generic/smbios.c +++ b/src/drivers/wifi/generic/smbios.c @@ -8,7 +8,7 @@ static int smbios_write_intel_wifi(struct device *dev, int *handle, unsigned long *current) { - if (dev->vendor != PCI_VENDOR_ID_INTEL) + if (dev->vendor != PCI_VID_INTEL) return 0; struct smbios_type_intel_wifi { diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 43dbe5bafa..9fa487be2d 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -126,1725 +126,1725 @@ /* Vendors and devices. Sort key: vendor first, device next. */ -#define PCI_VENDOR_ID_DYNALINK 0x0675 -#define PCI_DEVICE_ID_DYNALINK_IS64PH 0x1702 +#define PCI_VID_DYNALINK 0x0675 +#define PCI_DID_DYNALINK_IS64PH 0x1702 -#define PCI_VENDOR_ID_BERKOM 0x0871 -#define PCI_DEVICE_ID_BERKOM_A1T 0xffa1 -#define PCI_DEVICE_ID_BERKOM_T_CONCEPT 0xffa2 -#define PCI_DEVICE_ID_BERKOM_A4T 0xffa4 -#define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO 0xffa8 +#define PCI_VID_BERKOM 0x0871 +#define PCI_DID_BERKOM_A1T 0xffa1 +#define PCI_DID_BERKOM_T_CONCEPT 0xffa2 +#define PCI_DID_BERKOM_A4T 0xffa4 +#define PCI_DID_BERKOM_SCITEL_QUADRO 0xffa8 #define PCI_VENDOR_CAVIUM 0x177d -#define PCI_DEVICE_ID_CAVIUM_THUNDERX_UART 0xa00f - -#define PCI_VENDOR_ID_COMPAQ 0x0e11 -#define PCI_DEVICE_ID_COMPAQ_TOKENRING 0x0508 -#define PCI_DEVICE_ID_COMPAQ_1280 0x3033 -#define PCI_DEVICE_ID_COMPAQ_TRIFLEX 0x4000 -#define PCI_DEVICE_ID_COMPAQ_6010 0x6010 -#define PCI_DEVICE_ID_COMPAQ_TACHYON 0xa0fc -#define PCI_DEVICE_ID_COMPAQ_SMART2P 0xae10 -#define PCI_DEVICE_ID_COMPAQ_NETEL100 0xae32 -#define PCI_DEVICE_ID_COMPAQ_NETEL10 0xae34 -#define PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE 0xae33 -#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I 0xae35 -#define PCI_DEVICE_ID_COMPAQ_NETEL100D 0xae40 -#define PCI_DEVICE_ID_COMPAQ_NETEL100PI 0xae43 -#define PCI_DEVICE_ID_COMPAQ_NETEL100I 0xb011 -#define PCI_DEVICE_ID_COMPAQ_CISS 0xb060 -#define PCI_DEVICE_ID_COMPAQ_CISSB 0xb178 -#define PCI_DEVICE_ID_COMPAQ_CISSC 0x46 -#define PCI_DEVICE_ID_COMPAQ_THUNDER 0xf130 -#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B 0xf150 - -#define PCI_VENDOR_ID_NCR 0x1000 -#define PCI_VENDOR_ID_LSI_LOGIC 0x1000 -#define PCI_DEVICE_ID_NCR_53C810 0x0001 -#define PCI_DEVICE_ID_NCR_53C820 0x0002 -#define PCI_DEVICE_ID_NCR_53C825 0x0003 -#define PCI_DEVICE_ID_NCR_53C815 0x0004 -#define PCI_DEVICE_ID_LSI_53C810AP 0x0005 -#define PCI_DEVICE_ID_NCR_53C860 0x0006 -#define PCI_DEVICE_ID_LSI_53C1510 0x000a -#define PCI_DEVICE_ID_NCR_53C896 0x000b -#define PCI_DEVICE_ID_NCR_53C895 0x000c -#define PCI_DEVICE_ID_NCR_53C885 0x000d -#define PCI_DEVICE_ID_NCR_53C875 0x000f -#define PCI_DEVICE_ID_NCR_53C1510 0x0010 -#define PCI_DEVICE_ID_LSI_53C895A 0x0012 -#define PCI_DEVICE_ID_LSI_53C875A 0x0013 -#define PCI_DEVICE_ID_LSI_53C1010_33 0x0020 -#define PCI_DEVICE_ID_LSI_53C1010_66 0x0021 -#define PCI_DEVICE_ID_LSI_53C1030 0x0030 -#define PCI_DEVICE_ID_LSI_1030_53C1035 0x0032 -#define PCI_DEVICE_ID_LSI_53C1035 0x0040 -#define PCI_DEVICE_ID_NCR_53C875J 0x008f -#define PCI_DEVICE_ID_LSI_FC909 0x0621 -#define PCI_DEVICE_ID_LSI_FC929 0x0622 -#define PCI_DEVICE_ID_LSI_FC929_LAN 0x0623 -#define PCI_DEVICE_ID_LSI_FC919 0x0624 -#define PCI_DEVICE_ID_LSI_FC919_LAN 0x0625 -#define PCI_DEVICE_ID_LSI_FC929X 0x0626 -#define PCI_DEVICE_ID_LSI_FC939X 0x0642 -#define PCI_DEVICE_ID_LSI_FC949X 0x0640 -#define PCI_DEVICE_ID_LSI_FC919X 0x0628 -#define PCI_DEVICE_ID_NCR_YELLOWFIN 0x0701 -#define PCI_DEVICE_ID_LSI_61C102 0x0901 -#define PCI_DEVICE_ID_LSI_63C815 0x1000 -#define PCI_DEVICE_ID_LSI_SAS1064 0x0050 -#define PCI_DEVICE_ID_LSI_SAS1066 0x005E -#define PCI_DEVICE_ID_LSI_SAS1068 0x0054 -#define PCI_DEVICE_ID_LSI_SAS1064A 0x005C -#define PCI_DEVICE_ID_LSI_SAS1064E 0x0056 -#define PCI_DEVICE_ID_LSI_SAS1066E 0x005A -#define PCI_DEVICE_ID_LSI_SAS1068E 0x0058 -#define PCI_DEVICE_ID_LSI_SAS1078 0x0060 - -#define PCI_VENDOR_ID_ATI 0x1002 +#define PCI_DID_CAVIUM_THUNDERX_UART 0xa00f + +#define PCI_VID_COMPAQ 0x0e11 +#define PCI_DID_COMPAQ_TOKENRING 0x0508 +#define PCI_DID_COMPAQ_1280 0x3033 +#define PCI_DID_COMPAQ_TRIFLEX 0x4000 +#define PCI_DID_COMPAQ_6010 0x6010 +#define PCI_DID_COMPAQ_TACHYON 0xa0fc +#define PCI_DID_COMPAQ_SMART2P 0xae10 +#define PCI_DID_COMPAQ_NETEL100 0xae32 +#define PCI_DID_COMPAQ_NETEL10 0xae34 +#define PCI_DID_COMPAQ_TRIFLEX_IDE 0xae33 +#define PCI_DID_COMPAQ_NETFLEX3I 0xae35 +#define PCI_DID_COMPAQ_NETEL100D 0xae40 +#define PCI_DID_COMPAQ_NETEL100PI 0xae43 +#define PCI_DID_COMPAQ_NETEL100I 0xb011 +#define PCI_DID_COMPAQ_CISS 0xb060 +#define PCI_DID_COMPAQ_CISSB 0xb178 +#define PCI_DID_COMPAQ_CISSC 0x46 +#define PCI_DID_COMPAQ_THUNDER 0xf130 +#define PCI_DID_COMPAQ_NETFLEX3B 0xf150 + +#define PCI_VID_NCR 0x1000 +#define PCI_VID_LSI_LOGIC 0x1000 +#define PCI_DID_NCR_53C810 0x0001 +#define PCI_DID_NCR_53C820 0x0002 +#define PCI_DID_NCR_53C825 0x0003 +#define PCI_DID_NCR_53C815 0x0004 +#define PCI_DID_LSI_53C810AP 0x0005 +#define PCI_DID_NCR_53C860 0x0006 +#define PCI_DID_LSI_53C1510 0x000a +#define PCI_DID_NCR_53C896 0x000b +#define PCI_DID_NCR_53C895 0x000c +#define PCI_DID_NCR_53C885 0x000d +#define PCI_DID_NCR_53C875 0x000f +#define PCI_DID_NCR_53C1510 0x0010 +#define PCI_DID_LSI_53C895A 0x0012 +#define PCI_DID_LSI_53C875A 0x0013 +#define PCI_DID_LSI_53C1010_33 0x0020 +#define PCI_DID_LSI_53C1010_66 0x0021 +#define PCI_DID_LSI_53C1030 0x0030 +#define PCI_DID_LSI_1030_53C1035 0x0032 +#define PCI_DID_LSI_53C1035 0x0040 +#define PCI_DID_NCR_53C875J 0x008f +#define PCI_DID_LSI_FC909 0x0621 +#define PCI_DID_LSI_FC929 0x0622 +#define PCI_DID_LSI_FC929_LAN 0x0623 +#define PCI_DID_LSI_FC919 0x0624 +#define PCI_DID_LSI_FC919_LAN 0x0625 +#define PCI_DID_LSI_FC929X 0x0626 +#define PCI_DID_LSI_FC939X 0x0642 +#define PCI_DID_LSI_FC949X 0x0640 +#define PCI_DID_LSI_FC919X 0x0628 +#define PCI_DID_NCR_YELLOWFIN 0x0701 +#define PCI_DID_LSI_61C102 0x0901 +#define PCI_DID_LSI_63C815 0x1000 +#define PCI_DID_LSI_SAS1064 0x0050 +#define PCI_DID_LSI_SAS1066 0x005E +#define PCI_DID_LSI_SAS1068 0x0054 +#define PCI_DID_LSI_SAS1064A 0x005C +#define PCI_DID_LSI_SAS1064E 0x0056 +#define PCI_DID_LSI_SAS1066E 0x005A +#define PCI_DID_LSI_SAS1068E 0x0058 +#define PCI_DID_LSI_SAS1078 0x0060 + +#define PCI_VID_ATI 0x1002 /* Mach64 */ -#define PCI_DEVICE_ID_ATI_68800 0x4158 -#define PCI_DEVICE_ID_ATI_215CT222 0x4354 -#define PCI_DEVICE_ID_ATI_210888CX 0x4358 -#define PCI_DEVICE_ID_ATI_215ET222 0x4554 +#define PCI_DID_ATI_68800 0x4158 +#define PCI_DID_ATI_215CT222 0x4354 +#define PCI_DID_ATI_210888CX 0x4358 +#define PCI_DID_ATI_215ET222 0x4554 /* Mach64 / Rage */ -#define PCI_DEVICE_ID_ATI_215GB 0x4742 -#define PCI_DEVICE_ID_ATI_215GD 0x4744 -#define PCI_DEVICE_ID_ATI_215GI 0x4749 -#define PCI_DEVICE_ID_ATI_215GP 0x4750 -#define PCI_DEVICE_ID_ATI_215GQ 0x4751 -#define PCI_DEVICE_ID_ATI_215XL 0x4752 -#define PCI_DEVICE_ID_ATI_215GT 0x4754 -#define PCI_DEVICE_ID_ATI_215GTB 0x4755 -#define PCI_DEVICE_ID_ATI_215_IV 0x4756 -#define PCI_DEVICE_ID_ATI_215_IW 0x4757 -#define PCI_DEVICE_ID_ATI_215_IZ 0x475A -#define PCI_DEVICE_ID_ATI_210888GX 0x4758 -#define PCI_DEVICE_ID_ATI_215_LB 0x4c42 -#define PCI_DEVICE_ID_ATI_215_LD 0x4c44 -#define PCI_DEVICE_ID_ATI_215_LG 0x4c47 -#define PCI_DEVICE_ID_ATI_215_LI 0x4c49 -#define PCI_DEVICE_ID_ATI_215_LM 0x4c4D -#define PCI_DEVICE_ID_ATI_215_LN 0x4c4E -#define PCI_DEVICE_ID_ATI_215_LR 0x4c52 -#define PCI_DEVICE_ID_ATI_215_LS 0x4c53 -#define PCI_DEVICE_ID_ATI_264_LT 0x4c54 -#define PCI_DEVICE_ID_ATI_215LG 0x4c47 -#define PCI_DEVICE_ID_ATI_264LT 0x4c54 +#define PCI_DID_ATI_215GB 0x4742 +#define PCI_DID_ATI_215GD 0x4744 +#define PCI_DID_ATI_215GI 0x4749 +#define PCI_DID_ATI_215GP 0x4750 +#define PCI_DID_ATI_215GQ 0x4751 +#define PCI_DID_ATI_215XL 0x4752 +#define PCI_DID_ATI_215GT 0x4754 +#define PCI_DID_ATI_215GTB 0x4755 +#define PCI_DID_ATI_215_IV 0x4756 +#define PCI_DID_ATI_215_IW 0x4757 +#define PCI_DID_ATI_215_IZ 0x475A +#define PCI_DID_ATI_210888GX 0x4758 +#define PCI_DID_ATI_215_LB 0x4c42 +#define PCI_DID_ATI_215_LD 0x4c44 +#define PCI_DID_ATI_215_LG 0x4c47 +#define PCI_DID_ATI_215_LI 0x4c49 +#define PCI_DID_ATI_215_LM 0x4c4D +#define PCI_DID_ATI_215_LN 0x4c4E +#define PCI_DID_ATI_215_LR 0x4c52 +#define PCI_DID_ATI_215_LS 0x4c53 +#define PCI_DID_ATI_264_LT 0x4c54 +#define PCI_DID_ATI_215LG 0x4c47 +#define PCI_DID_ATI_264LT 0x4c54 /* Mach64 VT */ -#define PCI_DEVICE_ID_ATI_264VT 0x5654 -#define PCI_DEVICE_ID_ATI_264VU 0x5655 -#define PCI_DEVICE_ID_ATI_264VV 0x5656 +#define PCI_DID_ATI_264VT 0x5654 +#define PCI_DID_ATI_264VU 0x5655 +#define PCI_DID_ATI_264VV 0x5656 /* Rage128 Pro GL */ -#define PCI_DEVICE_ID_ATI_Rage128_PA 0x5041 -#define PCI_DEVICE_ID_ATI_Rage128_PB 0x5042 -#define PCI_DEVICE_ID_ATI_Rage128_PC 0x5043 -#define PCI_DEVICE_ID_ATI_Rage128_PD 0x5044 -#define PCI_DEVICE_ID_ATI_Rage128_PE 0x5045 -#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046 +#define PCI_DID_ATI_Rage128_PA 0x5041 +#define PCI_DID_ATI_Rage128_PB 0x5042 +#define PCI_DID_ATI_Rage128_PC 0x5043 +#define PCI_DID_ATI_Rage128_PD 0x5044 +#define PCI_DID_ATI_Rage128_PE 0x5045 +#define PCI_DID_ATI_RAGE128_PF 0x5046 /* Rage128 Pro VR */ -#define PCI_DEVICE_ID_ATI_RAGE128_PG 0x5047 -#define PCI_DEVICE_ID_ATI_RAGE128_PH 0x5048 -#define PCI_DEVICE_ID_ATI_RAGE128_PI 0x5049 -#define PCI_DEVICE_ID_ATI_RAGE128_PJ 0x504A -#define PCI_DEVICE_ID_ATI_RAGE128_PK 0x504B -#define PCI_DEVICE_ID_ATI_RAGE128_PL 0x504C -#define PCI_DEVICE_ID_ATI_RAGE128_PM 0x504D -#define PCI_DEVICE_ID_ATI_RAGE128_PN 0x504E -#define PCI_DEVICE_ID_ATI_RAGE128_PO 0x504F -#define PCI_DEVICE_ID_ATI_RAGE128_PP 0x5050 -#define PCI_DEVICE_ID_ATI_RAGE128_PQ 0x5051 -#define PCI_DEVICE_ID_ATI_RAGE128_PR 0x5052 -#define PCI_DEVICE_ID_ATI_RAGE128_TR 0x5452 -#define PCI_DEVICE_ID_ATI_RAGE128_PS 0x5053 -#define PCI_DEVICE_ID_ATI_RAGE128_PT 0x5054 -#define PCI_DEVICE_ID_ATI_RAGE128_PU 0x5055 -#define PCI_DEVICE_ID_ATI_RAGE128_PV 0x5056 -#define PCI_DEVICE_ID_ATI_RAGE128_PW 0x5057 -#define PCI_DEVICE_ID_ATI_RAGE128_PX 0x5058 +#define PCI_DID_ATI_RAGE128_PG 0x5047 +#define PCI_DID_ATI_RAGE128_PH 0x5048 +#define PCI_DID_ATI_RAGE128_PI 0x5049 +#define PCI_DID_ATI_RAGE128_PJ 0x504A +#define PCI_DID_ATI_RAGE128_PK 0x504B +#define PCI_DID_ATI_RAGE128_PL 0x504C +#define PCI_DID_ATI_RAGE128_PM 0x504D +#define PCI_DID_ATI_RAGE128_PN 0x504E +#define PCI_DID_ATI_RAGE128_PO 0x504F +#define PCI_DID_ATI_RAGE128_PP 0x5050 +#define PCI_DID_ATI_RAGE128_PQ 0x5051 +#define PCI_DID_ATI_RAGE128_PR 0x5052 +#define PCI_DID_ATI_RAGE128_TR 0x5452 +#define PCI_DID_ATI_RAGE128_PS 0x5053 +#define PCI_DID_ATI_RAGE128_PT 0x5054 +#define PCI_DID_ATI_RAGE128_PU 0x5055 +#define PCI_DID_ATI_RAGE128_PV 0x5056 +#define PCI_DID_ATI_RAGE128_PW 0x5057 +#define PCI_DID_ATI_RAGE128_PX 0x5058 /* Rage128 GL */ -#define PCI_DEVICE_ID_ATI_RAGE128_RE 0x5245 -#define PCI_DEVICE_ID_ATI_RAGE128_RF 0x5246 -#define PCI_DEVICE_ID_ATI_RAGE128_RG 0x534b -#define PCI_DEVICE_ID_ATI_RAGE128_RH 0x534c -#define PCI_DEVICE_ID_ATI_RAGE128_RI 0x534d +#define PCI_DID_ATI_RAGE128_RE 0x5245 +#define PCI_DID_ATI_RAGE128_RF 0x5246 +#define PCI_DID_ATI_RAGE128_RG 0x534b +#define PCI_DID_ATI_RAGE128_RH 0x534c +#define PCI_DID_ATI_RAGE128_RI 0x534d /* Rage128 VR */ -#define PCI_DEVICE_ID_ATI_RAGE128_RK 0x524b -#define PCI_DEVICE_ID_ATI_RAGE128_RL 0x524c -#define PCI_DEVICE_ID_ATI_RAGE128_RM 0x5345 -#define PCI_DEVICE_ID_ATI_RAGE128_RN 0x5346 -#define PCI_DEVICE_ID_ATI_RAGE128_RO 0x5347 +#define PCI_DID_ATI_RAGE128_RK 0x524b +#define PCI_DID_ATI_RAGE128_RL 0x524c +#define PCI_DID_ATI_RAGE128_RM 0x5345 +#define PCI_DID_ATI_RAGE128_RN 0x5346 +#define PCI_DID_ATI_RAGE128_RO 0x5347 /* Rage128 M3 */ -#define PCI_DEVICE_ID_ATI_RAGE128_LE 0x4c45 -#define PCI_DEVICE_ID_ATI_RAGE128_LF 0x4c46 +#define PCI_DID_ATI_RAGE128_LE 0x4c45 +#define PCI_DID_ATI_RAGE128_LF 0x4c46 /* Rage128 Pro Ultra */ -#define PCI_DEVICE_ID_ATI_RAGE128_U1 0x5446 -#define PCI_DEVICE_ID_ATI_RAGE128_U2 0x544C -#define PCI_DEVICE_ID_ATI_RAGE128_U3 0x5452 +#define PCI_DID_ATI_RAGE128_U1 0x5446 +#define PCI_DID_ATI_RAGE128_U2 0x544C +#define PCI_DID_ATI_RAGE128_U3 0x5452 /* Radeon M4 */ -#define PCI_DEVICE_ID_ATI_RADEON_LE 0x4d45 -#define PCI_DEVICE_ID_ATI_RADEON_LF 0x4d46 +#define PCI_DID_ATI_RADEON_LE 0x4d45 +#define PCI_DID_ATI_RADEON_LF 0x4d46 /* Radeon NV-100 */ -#define PCI_DEVICE_ID_ATI_RADEON_N1 0x5159 -#define PCI_DEVICE_ID_ATI_RADEON_N2 0x515a +#define PCI_DID_ATI_RADEON_N1 0x5159 +#define PCI_DID_ATI_RADEON_N2 0x515a /* Radeon */ -#define PCI_DEVICE_ID_ATI_RADEON_RA 0x5144 -#define PCI_DEVICE_ID_ATI_RADEON_RB 0x5145 -#define PCI_DEVICE_ID_ATI_RADEON_RC 0x5146 -#define PCI_DEVICE_ID_ATI_RADEON_RD 0x5147 - -#define PCI_DEVICE_ID_ATI_SB600_LPC 0x438D -#define PCI_DEVICE_ID_ATI_SB600_SATA 0x4380 -#define PCI_DEVICE_ID_ATI_SB600_IDE 0x438C -#define PCI_DEVICE_ID_ATI_SB600_HDA 0x4383 -#define PCI_DEVICE_ID_ATI_SB600_ACI 0x4382 -#define PCI_DEVICE_ID_ATI_SB600_MCI 0x438E -#define PCI_DEVICE_ID_ATI_SB600_USB2 0x4386 -#define PCI_DEVICE_ID_ATI_SB600_PCI 0x4384 -#define PCI_DEVICE_ID_ATI_SB600_SM 0x4385 -#define PCI_DEVICE_ID_ATI_SB600_USB_0 0x4387 -#define PCI_DEVICE_ID_ATI_SB600_USB_1 0x4388 -#define PCI_DEVICE_ID_ATI_SB600_USB_2 0x4389 -#define PCI_DEVICE_ID_ATI_SB600_USB_3 0x438A -#define PCI_DEVICE_ID_ATI_SB600_USB_4 0x438B - -#define PCI_DEVICE_ID_ATI_SB700_LPC 0x439D -#define PCI_DEVICE_ID_ATI_SB700_SATA 0x4390 -#define PCI_DEVICE_ID_ATI_SB700_SATA_AHCI 0x4391 -#define PCI_DEVICE_ID_ATI_SB700_SATA_AHCI_AMD 0x4394 -#define PCI_DEVICE_ID_ATI_SB700_IDE 0x439C -#define PCI_DEVICE_ID_ATI_SB700_HDA 0x4383 -#define PCI_DEVICE_ID_ATI_SB700_PCI 0x4384 -#define PCI_DEVICE_ID_ATI_SB700_SM 0x4385 -#define PCI_DEVICE_ID_ATI_SB700_USB_18_0 0x4397 -#define PCI_DEVICE_ID_ATI_SB700_USB_18_1 0x4398 -#define PCI_DEVICE_ID_ATI_SB700_USB_18_2 0x4396 -#define PCI_DEVICE_ID_ATI_SB700_USB_19_0 0x4397 -#define PCI_DEVICE_ID_ATI_SB700_USB_19_1 0x4398 -#define PCI_DEVICE_ID_ATI_SB700_USB_19_2 0x4396 -#define PCI_DEVICE_ID_ATI_SB700_USB_20_5 0x4399 - -#define PCI_DEVICE_ID_ATI_SB800_LPC 0x439D -#define PCI_DEVICE_ID_ATI_SB800_SATA 0x4390 -#define PCI_DEVICE_ID_ATI_SB800_SATA_AHCI 0x4391 -#define PCI_DEVICE_ID_ATI_SB800_SATA_RAID 0x4392 -#define PCI_DEVICE_ID_ATI_SB800_SATA_RAID5 0x4393 -#define PCI_DEVICE_ID_ATI_SB800_IDE 0x439C -#define PCI_DEVICE_ID_ATI_SB800_HDA 0x4383 -#define PCI_DEVICE_ID_ATI_SB800_PCI 0x4384 -#define PCI_DEVICE_ID_ATI_SB800_PCIEA 0x43A0 -#define PCI_DEVICE_ID_ATI_SB800_PCIEB 0x43A1 -#define PCI_DEVICE_ID_ATI_SB800_PCIEC 0x43A2 -#define PCI_DEVICE_ID_ATI_SB800_PCIED 0x43A3 -#define PCI_DEVICE_ID_ATI_SB800_SM 0x4385 -#define PCI_DEVICE_ID_ATI_SB800_USB_18_0 0x4397 -#define PCI_DEVICE_ID_ATI_SB800_USB_18_2 0x4396 -#define PCI_DEVICE_ID_ATI_SB800_USB_19_0 0x4397 -#define PCI_DEVICE_ID_ATI_SB800_USB_19_2 0x4396 -#define PCI_DEVICE_ID_ATI_SB800_USB_20_5 0x4399 -#define PCI_DEVICE_ID_ATI_SB800_USB_22_0 0x4397 -#define PCI_DEVICE_ID_ATI_SB800_USB_22_2 0x4396 -#define PCI_DEVICE_ID_ATI_SB800_GEC 0x1699 - -#define PCI_DEVICE_ID_ATI_RS690_HT 0x7910 -#define PCI_DEVICE_ID_ATI_RS740_HT 0x7911 -#define PCI_DEVICE_ID_ATI_RS690_PCIE 0x7912 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV2 0x7913 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV3 0x791B -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV4 0x7914 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV5 0x7915 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV6 0x7916 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV7 0x7917 -#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV8 0x7918 -#define PCI_DEVICE_ID_ATI_RS690_INT_GFX 0x791e -#define PCI_DEVICE_ID_ATI_RS690MT_INT_GFX 0x791f -#define PCI_DEVICE_ID_ATI_RS740_INT_GFX 0x796e - -#define PCI_DEVICE_ID_ATI_RS780_INT_GFX 0x9610 -#define PCI_DEVICE_ID_ATI_RS780C_INT_GFX 0x9611 -#define PCI_DEVICE_ID_ATI_RS780M_INT_GFX 0x9612 -#define PCI_DEVICE_ID_ATI_RS780MC_INT_GFX 0x9613 -#define PCI_DEVICE_ID_ATI_RS780E_INT_GFX 0x9615 -#define PCI_DEVICE_ID_ATI_RS785G_INT_GFX 0x9710 -#define PCI_DEVICE_ID_ATI_RS785C_INT_GFX 0x9711 -#define PCI_DEVICE_ID_ATI_RS785M_INT_GFX 0x9712 -#define PCI_DEVICE_ID_ATI_RS785MC_INT_GFX 0x9713 -#define PCI_DEVICE_ID_ATI_RS785D_INT_GFX 0x9714 - -#define PCI_DEVICE_ID_ATI_FAM17H_MODEL18H_GPU 0x15D8 -#define PCI_DEVICE_ID_ATI_FAM17H_MODEL60H_GPU 0x1636 -#define PCI_DEVICE_ID_ATI_FAM17H_MODEL68H_GPU 0x164C -#define PCI_DEVICE_ID_ATI_FAM17H_MODELA0H_GPU 0x1506 -#define PCI_DEVICE_ID_ATI_FAM19H_MODEL51H_GPU_CEZANNE 0x1638 -#define PCI_DEVICE_ID_ATI_FAM19H_MODEL51H_GPU_BARCELO 0x15e7 -#define PCI_DEVICE_ID_ATI_FAM17H_MODEL18H_HDA0 0x15DE -#define PCI_DEVICE_ID_ATI_FAM17H_MODEL60H_HDA0 0x1637 -#define PCI_DEVICE_ID_ATI_FAM17H_MODELA0H_HDA0 0x1640 - -#define PCI_VENDOR_ID_VLSI 0x1004 -#define PCI_DEVICE_ID_VLSI_82C592 0x0005 -#define PCI_DEVICE_ID_VLSI_82C593 0x0006 -#define PCI_DEVICE_ID_VLSI_82C594 0x0007 -#define PCI_DEVICE_ID_VLSI_82C597 0x0009 -#define PCI_DEVICE_ID_VLSI_82C541 0x000c -#define PCI_DEVICE_ID_VLSI_82C543 0x000d -#define PCI_DEVICE_ID_VLSI_82C532 0x0101 -#define PCI_DEVICE_ID_VLSI_82C534 0x0102 -#define PCI_DEVICE_ID_VLSI_82C535 0x0104 -#define PCI_DEVICE_ID_VLSI_82C147 0x0105 -#define PCI_DEVICE_ID_VLSI_VAS96011 0x0702 - -#define PCI_VENDOR_ID_ADL 0x1005 -#define PCI_DEVICE_ID_ADL_2301 0x2301 - -#define PCI_VENDOR_ID_NS 0x100b -#define PCI_DEVICE_ID_NS_87415 0x0002 -#define PCI_DEVICE_ID_NS_87560_LIO 0x000e -#define PCI_DEVICE_ID_NS_87560_USB 0x0012 -#define PCI_DEVICE_ID_NS_83815 0x0020 -#define PCI_DEVICE_ID_NS_83820 0x0022 -#define PCI_DEVICE_ID_NS_GX2 0x0028 -#define PCI_DEVICE_ID_NS_CS5535 0x002a -#define PCI_DEVICE_ID_NS_CS5535_ISA 0x002b -#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d -#define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e -#define PCI_DEVICE_ID_NS_CS5535_USB 0x002f -#define PCI_DEVICE_ID_NS_CS5535_GX2VGA 0x0030 -#define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500 -#define PCI_DEVICE_ID_NS_SCx200_SMI 0x0501 -#define PCI_DEVICE_ID_NS_SCx200_IDE 0x0502 -#define PCI_DEVICE_ID_NS_SCx200_AUDIO 0x0503 -#define PCI_DEVICE_ID_NS_SCx200_VIDEO 0x0504 -#define PCI_DEVICE_ID_NS_SCx200_XBUS 0x0505 -#define PCI_DEVICE_ID_NS_87410 0xd001 - -#define PCI_VENDOR_ID_TSENG 0x100c -#define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 -#define PCI_DEVICE_ID_TSENG_W32P_b 0x3205 -#define PCI_DEVICE_ID_TSENG_W32P_c 0x3206 -#define PCI_DEVICE_ID_TSENG_W32P_d 0x3207 -#define PCI_DEVICE_ID_TSENG_ET6000 0x3208 - -#define PCI_VENDOR_ID_WEITEK 0x100e -#define PCI_DEVICE_ID_WEITEK_P9000 0x9001 -#define PCI_DEVICE_ID_WEITEK_P9100 0x9100 - -#define PCI_VENDOR_ID_DEC 0x1011 -#define PCI_DEVICE_ID_DEC_BRD 0x0001 -#define PCI_DEVICE_ID_DEC_TULIP 0x0002 -#define PCI_DEVICE_ID_DEC_TGA 0x0004 -#define PCI_DEVICE_ID_DEC_TULIP_FAST 0x0009 -#define PCI_DEVICE_ID_DEC_TGA2 0x000D -#define PCI_DEVICE_ID_DEC_FDDI 0x000F -#define PCI_DEVICE_ID_DEC_TULIP_PLUS 0x0014 -#define PCI_DEVICE_ID_DEC_21142 0x0019 -#define PCI_DEVICE_ID_DEC_21052 0x0021 -#define PCI_DEVICE_ID_DEC_21150 0x0022 -#define PCI_DEVICE_ID_DEC_21152 0x0024 -#define PCI_DEVICE_ID_DEC_21153 0x0025 -#define PCI_DEVICE_ID_DEC_21154 0x0026 -#define PCI_DEVICE_ID_DEC_21285 0x1065 -#define PCI_DEVICE_ID_COMPAQ_42XX 0x0046 - -#define PCI_VENDOR_ID_CIRRUS 0x1013 -#define PCI_DEVICE_ID_CIRRUS_7548 0x0038 -#define PCI_DEVICE_ID_CIRRUS_5430 0x00a0 -#define PCI_DEVICE_ID_CIRRUS_5434_4 0x00a4 -#define PCI_DEVICE_ID_CIRRUS_5434_8 0x00a8 -#define PCI_DEVICE_ID_CIRRUS_5436 0x00ac -#define PCI_DEVICE_ID_CIRRUS_5446 0x00b8 -#define PCI_DEVICE_ID_CIRRUS_5480 0x00bc -#define PCI_DEVICE_ID_CIRRUS_5462 0x00d0 -#define PCI_DEVICE_ID_CIRRUS_5464 0x00d4 -#define PCI_DEVICE_ID_CIRRUS_5465 0x00d6 -#define PCI_DEVICE_ID_CIRRUS_6729 0x1100 -#define PCI_DEVICE_ID_CIRRUS_6832 0x1110 -#define PCI_DEVICE_ID_CIRRUS_7542 0x1200 -#define PCI_DEVICE_ID_CIRRUS_7543 0x1202 -#define PCI_DEVICE_ID_CIRRUS_7541 0x1204 - -#define PCI_VENDOR_ID_IBM 0x1014 -#define PCI_DEVICE_ID_IBM_FIRE_CORAL 0x000a -#define PCI_DEVICE_ID_IBM_TR 0x0018 -#define PCI_DEVICE_ID_IBM_82G2675 0x001d -#define PCI_DEVICE_ID_IBM_MCA 0x0020 -#define PCI_DEVICE_ID_IBM_82351 0x0022 -#define PCI_DEVICE_ID_IBM_PYTHON 0x002d -#define PCI_DEVICE_ID_IBM_SERVERAID 0x002e -#define PCI_DEVICE_ID_IBM_TR_WAKE 0x003e -#define PCI_DEVICE_ID_IBM_MPIC 0x0046 -#define PCI_DEVICE_ID_IBM_3780IDSP 0x007d -#define PCI_DEVICE_ID_IBM_CHUKAR 0x0096 -#define PCI_DEVICE_ID_IBM_CPC710_PCI64 0x00fc -#define PCI_DEVICE_ID_IBM_CPC710_PCI32 0x0105 -#define PCI_DEVICE_ID_IBM_405GP 0x0156 -#define PCI_DEVICE_ID_IBM_SERVERAIDI960 0x01bd -#define PCI_DEVICE_ID_IBM_MPIC_2 0xffff - -#define PCI_VENDOR_ID_COMPEX2 0x101a // pci.ids says "AT&T GIS (NCR)" -#define PCI_DEVICE_ID_COMPEX2_100VG 0x0005 - -#define PCI_VENDOR_ID_WD 0x101c -#define PCI_DEVICE_ID_WD_7197 0x3296 -#define PCI_DEVICE_ID_WD_90C 0xc24a - -#define PCI_VENDOR_ID_AMI 0x101e -#define PCI_DEVICE_ID_AMI_MEGARAID3 0x1960 -#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010 -#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060 - -#define PCI_VENDOR_ID_AMD 0x1022 - -#define PCI_DEVICE_ID_AMD_10H_NB_HT 0x1200 -#define PCI_DEVICE_ID_AMD_15H_MODEL_000F_NB_HT 0x1600 -#define PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_HT 0x1400 -#define PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_HT 0x141A -#define PCI_DEVICE_ID_AMD_15H_MODEL_606F_NB_HT 0x1570 -#define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT 0x15B0 -#define PCI_DEVICE_ID_AMD_16H_MODEL_000F_NB_HT 0x1536 -#define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_HT 0x1566 -#define PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB 0x15d0 -#define PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB 0x1630 -#define PCI_DEVICE_ID_AMD_17H_MODEL_A0AF_NB 0x14B5 -#define PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_IOMMU 0x1419 -#define PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU 0x1423 -#define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU 0x1577 -#define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_IOMMU 0x1567 -#define PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU 0x15D1 -#define PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB_IOMMU 0x1631 -#define PCI_DEVICE_ID_AMD_17H_MODEL_A0AF_NB_IOMMU 0x14B6 - -#define PCI_DEVICE_ID_AMD_SB900_LPC 0x780E -#define PCI_DEVICE_ID_AMD_SB900_SATA 0x7800 -#define PCI_DEVICE_ID_AMD_SB900_SATA_AHCI 0x7801 -#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID 0x7802 -#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID5 0x7803 -#define PCI_DEVICE_ID_AMD_SB900_SATA_AMDAHCI 0x7804 -#define PCI_DEVICE_ID_AMD_SB900_IDE 0x780C -#define PCI_DEVICE_ID_AMD_SB900_HDA 0x780D -#define PCI_DEVICE_ID_AMD_SB900_PCI 0x780F -#define PCI_DEVICE_ID_AMD_SB900_PCIEA 0x43A0 -#define PCI_DEVICE_ID_AMD_SB900_PCIEB 0x43A1 -#define PCI_DEVICE_ID_AMD_SB900_PCIEC 0x43A2 -#define PCI_DEVICE_ID_AMD_SB900_PCIED 0x43A3 -#define PCI_DEVICE_ID_AMD_SB900_SM 0x780B -#define PCI_DEVICE_ID_AMD_SB900_USB_16_0 0x7812 -#define PCI_DEVICE_ID_AMD_SB900_USB_16_1 0x7812 -#define PCI_DEVICE_ID_AMD_SB900_USB_18_0 0x7807 -#define PCI_DEVICE_ID_AMD_SB900_USB_18_2 0x7808 -#define PCI_DEVICE_ID_AMD_SB900_USB_19_0 0x7807 -#define PCI_DEVICE_ID_AMD_SB900_USB_19_2 0x7808 -#define PCI_DEVICE_ID_AMD_SB900_USB_20_5 0x7809 -#define PCI_DEVICE_ID_AMD_SB900_GEC 0x7806 -#define PCI_DEVICE_ID_AMD_HUDSON_SD 0x7806 -#define PCI_DEVICE_ID_AMD_YANGTZE_SD 0x7813 - -#define PCI_DEVICE_ID_AMD_RS780_HT 0x9600 -#define PCI_DEVICE_ID_AMD_RS780_PCIE 0x9602 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV2 0x9603 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV3 0x960B -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV4 0x9604 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV5 0x9605 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV6 0x9606 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV7 0x9607 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV9 0x9608 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV10 0x9609 -#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV8 0x960A - -#define PCI_DEVICE_ID_AMD_RD890TV_HT 0x5956 -#define PCI_DEVICE_ID_AMD_RX780_HT 0x5957 -#define PCI_DEVICE_ID_AMD_RD780_HT 0x5958 -#define PCI_DEVICE_ID_AMD_SR5690_HT 0x5A10 -#define PCI_DEVICE_ID_AMD_RD890_HT 0x5A11 -#define PCI_DEVICE_ID_AMD_SR5670_HT 0x5A12 -#define PCI_DEVICE_ID_AMD_SR5650_HT 0x5A13 -#define PCI_DEVICE_ID_AMD_990FX_HT 0x5A14 -#define PCI_DEVICE_ID_AMD_SR5650_PCIE 0x5A12 -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV2 0x5A16 -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV3 0x5A17 -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV4 0x5A18 -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV5 0x5A19 -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV6 0x5A1A -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV7 0x5A1B -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV9 0x5A1C -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV10 0x5A1D -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV11 0x5A1F -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV12 0x5A20 -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV13 0x5A1E -#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV8 0x5A21 -#define PCI_DEVICE_ID_AMD_SR5650_IOMMU 0x5A23 - -#define PCI_DEVICE_ID_AMD_CZ_HDA 0x157A -#define PCI_DEVICE_ID_AMD_CZ_LPC 0x790E -#define PCI_DEVICE_ID_AMD_CZ_SATA 0x7900 -#define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI 0x7901 -#define PCI_DEVICE_ID_AMD_CZ_USB_0 0x7907 -#define PCI_DEVICE_ID_AMD_CZ_USB_1 0x7908 -#define PCI_DEVICE_ID_AMD_CZ_USB3_0 0x7914 -#define PCI_DEVICE_ID_AMD_CZ_SMBUS 0x790B - -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP 0x15D3 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1 0x1633 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2 0x1634 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP 0x14BA -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA 0x15DB -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB 0x15DC -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC 0x1635 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC 0x14B9 -#define PCI_DEVICE_ID_AMD_FAM17H_ACP 0x15E2 -#define PCI_DEVICE_ID_AMD_FAM17H_HDA1 0x15E3 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI0 0x15E0 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI1 0x15E1 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL20H_XHCI0 0x15E5 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_XHCI 0x1639 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_XHCI0 0x1503 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_XHCI1 0x1504 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_XHCI2 0x1505 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0 0x15E8 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1 0x15E9 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2 0x15EA -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3 0x15EB -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4 0x15EC -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5 0x15ED -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6 0x15EE -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF7 0x15EF -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0 0x1448 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1 0x1449 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2 0x144A -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3 0x144B -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4 0x144C -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5 0x144D -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6 0x144E -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7 0x144F -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF0 0x1724 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF1 0x1725 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF2 0x1726 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF3 0x1727 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF4 0x1728 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF5 0x1729 -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF6 0x172A -#define PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF7 0x172B -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0 0x166A -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1 0x166B -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2 0x166C -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3 0x166D -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4 0x166E -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5 0x166F -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6 0x1670 -#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7 0x1671 -#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER0 0x7901 -#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER1 0x7904 -#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0 0x7916 -#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1 0x7917 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_SD 0x7906 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_GBE 0x1458 -#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_GBE 0x1641 -#define PCI_DEVICE_ID_AMD_FAM17H_I2S_AC97 0x1644 - -#define PCI_DEVICE_ID_AMD_LANCE 0x2000 -#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 -#define PCI_DEVICE_ID_AMD_LX 0x1054 -#define PCI_DEVICE_ID_AMD_LXBRIDGE 0x2080 -#define PCI_DEVICE_ID_AMD_SCSI 0x2020 -#define PCI_DEVICE_ID_AMD_FE_GATE_7006 0x7006 -#define PCI_DEVICE_ID_AMD_FE_GATE_7007 0x7007 -#define PCI_DEVICE_ID_AMD_FE_GATE_700C 0x700C -#define PCI_DEVICE_ID_AMD_FE_GATE_700D 0x700D -#define PCI_DEVICE_ID_AMD_FE_GATE_700E 0x700E -#define PCI_DEVICE_ID_AMD_FE_GATE_700F 0x700F -#define PCI_DEVICE_ID_AMD_COBRA_7400 0x7400 -#define PCI_DEVICE_ID_AMD_COBRA_7401 0x7401 -#define PCI_DEVICE_ID_AMD_COBRA_7403 0x7403 -#define PCI_DEVICE_ID_AMD_COBRA_7404 0x7404 -#define PCI_DEVICE_ID_AMD_VIPER_7408 0x7408 -#define PCI_DEVICE_ID_AMD_VIPER_7409 0x7409 -#define PCI_DEVICE_ID_AMD_VIPER_740B 0x740B -#define PCI_DEVICE_ID_AMD_VIPER_740C 0x740C -#define PCI_DEVICE_ID_AMD_VIPER_7410 0x7410 -#define PCI_DEVICE_ID_AMD_VIPER_7411 0x7411 - -#define PCI_DEVICE_ID_AMD_SB768_7440 0x7440 -#define PCI_DEVICE_ID_AMD_SB768_7441 0x7441 -#define PCI_DEVICE_ID_AMD_SB768_7443 0x7443 -#define PCI_DEVICE_ID_AMD_SB768_7448 0x7448 -#define PCI_DEVICE_ID_AMD_SB768_7449 0x7449 - -#define PCI_DEVICE_ID_AMD_VIPER_7413 0x7413 -#define PCI_DEVICE_ID_AMD_VIPER_7414 0x7414 -#define PCI_DEVICE_ID_AMD_VIPER_7440 0x7440 -#define PCI_DEVICE_ID_AMD_VIPER_7441 0x7441 -#define PCI_DEVICE_ID_AMD_VIPER_7443 0x7443 -#define PCI_DEVICE_ID_AMD_VIPER_7448 0x7448 -#define PCI_DEVICE_ID_AMD_VIPER_7449 0x7449 - -#define PCI_DEVICE_ID_AMD_8151_SYSCTRL 0x7454 -#define PCI_DEVICE_ID_AMD_8151_AGP 0x7455 -#define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 -#define PCI_DEVICE_ID_AMD_8111_USB 0x7464 -#define PCI_DEVICE_ID_AMD_8111_ISA 0x7468 -#define PCI_DEVICE_ID_AMD_8111_IDE 0x7469 -#define PCI_DEVICE_ID_AMD_8111_SMB 0x746a -#define PCI_DEVICE_ID_AMD_8111_ACPI 0x746b -#define PCI_DEVICE_ID_AMD_8111_NIC 0x7462 - -#define PCI_DEVICE_ID_AMD_8111_USB2 0x7463 -#define PCI_DEVICE_ID_AMD_8131_PCIX 0x7450 -#define PCI_DEVICE_ID_AMD_8131_IOAPIC 0x7451 - -#define PCI_DEVICE_ID_AMD_8132_PCIX 0x7458 -#define PCI_DEVICE_ID_AMD_8132_IOAPIC 0x7459 -#define PCI_DEVICE_ID_AMD_AES 0x2082 -#define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090 -#define PCI_DEVICE_ID_AMD_CS5536_FLASH 0x2091 -#define PCI_DEVICE_ID_AMD_CS5536_A0_IDE 0x2092 -#define PCI_DEVICE_ID_AMD_CS5536_AUDIO 0x2093 -#define PCI_DEVICE_ID_AMD_CS5536_OHCI 0x2094 -#define PCI_DEVICE_ID_AMD_CS5536_EHCI 0x2095 -#define PCI_DEVICE_ID_AMD_CS5536_UDC 0x2096 -#define PCI_DEVICE_ID_AMD_CS5536_OTG 0x2097 -#define PCI_DEVICE_ID_AMD_CS5536_B0_IDE 0x209A - -#define PCI_VENDOR_ID_TRIDENT 0x1023 -#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 -#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 -#define PCI_DEVICE_ID_TRIDENT_9320 0x9320 -#define PCI_DEVICE_ID_TRIDENT_9388 0x9388 -#define PCI_DEVICE_ID_TRIDENT_9397 0x9397 -#define PCI_DEVICE_ID_TRIDENT_939A 0x939A -#define PCI_DEVICE_ID_TRIDENT_9520 0x9520 -#define PCI_DEVICE_ID_TRIDENT_9525 0x9525 -#define PCI_DEVICE_ID_TRIDENT_9420 0x9420 -#define PCI_DEVICE_ID_TRIDENT_9440 0x9440 -#define PCI_DEVICE_ID_TRIDENT_9660 0x9660 -#define PCI_DEVICE_ID_TRIDENT_9750 0x9750 -#define PCI_DEVICE_ID_TRIDENT_9850 0x9850 -#define PCI_DEVICE_ID_TRIDENT_9880 0x9880 -#define PCI_DEVICE_ID_TRIDENT_8400 0x8400 -#define PCI_DEVICE_ID_TRIDENT_8420 0x8420 -#define PCI_DEVICE_ID_TRIDENT_8500 0x8500 - -#define PCI_VENDOR_ID_AI 0x1025 -#define PCI_DEVICE_ID_AI_M1435 0x1435 - -#define PCI_VENDOR_ID_DELL 0x1028 - -#define PCI_VENDOR_ID_MATROX 0x102B -#define PCI_DEVICE_ID_MATROX_MGA_2 0x0518 -#define PCI_DEVICE_ID_MATROX_MIL 0x0519 -#define PCI_DEVICE_ID_MATROX_MYS 0x051A -#define PCI_DEVICE_ID_MATROX_MIL_2 0x051b -#define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f -#define PCI_DEVICE_ID_MATROX_MGA_IMP 0x0d10 -#define PCI_DEVICE_ID_MATROX_G100_MM 0x1000 -#define PCI_DEVICE_ID_MATROX_G100_AGP 0x1001 -#define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520 -#define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521 -#define PCI_DEVICE_ID_MATROX_G400 0x0525 -#define PCI_DEVICE_ID_MATROX_G550 0x2527 -#define PCI_DEVICE_ID_MATROX_VIA 0x4536 - -#define PCI_VENDOR_ID_CT 0x102c -#define PCI_DEVICE_ID_CT_65545 0x00d8 -#define PCI_DEVICE_ID_CT_65548 0x00dc -#define PCI_DEVICE_ID_CT_65550 0x00e0 -#define PCI_DEVICE_ID_CT_65554 0x00e4 -#define PCI_DEVICE_ID_CT_65555 0x00e5 - -#define PCI_VENDOR_ID_MIRO 0x1031 -#define PCI_DEVICE_ID_MIRO_36050 0x5601 - -#define PCI_VENDOR_ID_NEC 0x1033 -#define PCI_DEVICE_ID_NEC_PCX2 0x0046 -#define PCI_DEVICE_ID_NEC_NILE4 0x005a -#define PCI_DEVICE_ID_NEC_VRC5476 0x009b -#define PCI_DEVICE_ID_NEC_VRC5477_AC97 0x00a6 - -#define PCI_VENDOR_ID_FD 0x1036 -#define PCI_DEVICE_ID_FD_36C70 0x0000 - -#define PCI_VENDOR_ID_SI 0x1039 -#define PCI_DEVICE_ID_SI_5591_AGP 0x0001 -#define PCI_DEVICE_ID_SI_6202 0x0002 -#define PCI_DEVICE_ID_SI_503 0x0008 -#define PCI_DEVICE_ID_SI_ACPI 0x0009 -#define PCI_DEVICE_ID_SI_5597_VGA 0x0200 -#define PCI_DEVICE_ID_SI_6205 0x0205 -#define PCI_DEVICE_ID_SI_501 0x0406 -#define PCI_DEVICE_ID_SI_496 0x0496 -#define PCI_DEVICE_ID_SI_300 0x0300 -#define PCI_DEVICE_ID_SI_315H 0x0310 -#define PCI_DEVICE_ID_SI_315 0x0315 -#define PCI_DEVICE_ID_SI_315PRO 0x0325 -#define PCI_DEVICE_ID_SI_530 0x0530 -#define PCI_DEVICE_ID_SI_540 0x0540 -#define PCI_DEVICE_ID_SI_550 0x0550 -#define PCI_DEVICE_ID_SI_540_VGA 0x5300 -#define PCI_DEVICE_ID_SI_550_VGA 0x5315 -#define PCI_DEVICE_ID_SI_601 0x0601 -#define PCI_DEVICE_ID_SI_620 0x0620 -#define PCI_DEVICE_ID_SI_630 0x0630 -#define PCI_DEVICE_ID_SI_635 0x0635 -#define PCI_DEVICE_ID_SI_640 0x0640 -#define PCI_DEVICE_ID_SI_645 0x0645 -#define PCI_DEVICE_ID_SI_650 0x0650 -#define PCI_DEVICE_ID_SI_730 0x0730 -#define PCI_DEVICE_ID_SI_630_VGA 0x6300 -#define PCI_DEVICE_ID_SI_730_VGA 0x7300 -#define PCI_DEVICE_ID_SI_735 0x0735 -#define PCI_DEVICE_ID_SI_740 0x0740 -#define PCI_DEVICE_ID_SI_745 0x0745 -#define PCI_DEVICE_ID_SI_750 0x0750 -#define PCI_DEVICE_ID_SI_900 0x0900 -#define PCI_DEVICE_ID_SI_5107 0x5107 -#define PCI_DEVICE_ID_SI_5300 0x5300 -#define PCI_DEVICE_ID_SI_5511 0x5511 -#define PCI_DEVICE_ID_SI_5513 0x5513 -#define PCI_DEVICE_ID_SI_5571 0x5571 -#define PCI_DEVICE_ID_SI_5591 0x5591 -#define PCI_DEVICE_ID_SI_5597 0x5597 -#define PCI_DEVICE_ID_SI_5598 0x5598 -#define PCI_DEVICE_ID_SI_5600 0x5600 -#define PCI_DEVICE_ID_SI_6300 0x6300 -#define PCI_DEVICE_ID_SI_6306 0x6306 -#define PCI_DEVICE_ID_SI_6326 0x6326 -#define PCI_DEVICE_ID_SI_7001 0x7001 -#define PCI_DEVICE_ID_SI_7016 0x7016 - -#define PCI_VENDOR_ID_HP 0x103c -#define PCI_DEVICE_ID_HP_DONNER_GFX 0x1008 -#define PCI_DEVICE_ID_HP_TACHYON 0x1028 -#define PCI_DEVICE_ID_HP_TACHLITE 0x1029 -#define PCI_DEVICE_ID_HP_J2585A 0x1030 -#define PCI_DEVICE_ID_HP_J2585B 0x1031 -#define PCI_DEVICE_ID_HP_SAS 0x1048 -#define PCI_DEVICE_ID_HP_DIVA1 0x1049 -#define PCI_DEVICE_ID_HP_DIVA2 0x104A -#define PCI_DEVICE_ID_HP_SP2_0 0x104B -#define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229 -#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a -#define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e - -#define PCI_VENDOR_ID_PCTECH 0x1042 -#define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000 -#define PCI_DEVICE_ID_PCTECH_RZ1001 0x1001 -#define PCI_DEVICE_ID_PCTECH_SAMURAI_0 0x3000 -#define PCI_DEVICE_ID_PCTECH_SAMURAI_1 0x3010 -#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020 - -#define PCI_VENDOR_ID_ASUSTEK 0x1043 -#define PCI_DEVICE_ID_ASUSTEK_0675 0x0675 - -#define PCI_VENDOR_ID_DPT 0x1044 -#define PCI_DEVICE_ID_DPT 0xa400 - -#define PCI_VENDOR_ID_OPTI 0x1045 -#define PCI_DEVICE_ID_OPTI_92C178 0xc178 -#define PCI_DEVICE_ID_OPTI_82C557 0xc557 -#define PCI_DEVICE_ID_OPTI_82C558 0xc558 -#define PCI_DEVICE_ID_OPTI_82C621 0xc621 -#define PCI_DEVICE_ID_OPTI_82C700 0xc700 -#define PCI_DEVICE_ID_OPTI_82C701 0xc701 -#define PCI_DEVICE_ID_OPTI_82C814 0xc814 -#define PCI_DEVICE_ID_OPTI_82C822 0xc822 -#define PCI_DEVICE_ID_OPTI_82C861 0xc861 -#define PCI_DEVICE_ID_OPTI_82C825 0xd568 - -#define PCI_VENDOR_ID_ELSA 0x1048 -#define PCI_DEVICE_ID_ELSA_MICROLINK 0x1000 -#define PCI_DEVICE_ID_ELSA_QS3000 0x3000 - -#define PCI_VENDOR_ID_SGS 0x104a -#define PCI_DEVICE_ID_SGS_2000 0x0008 -#define PCI_DEVICE_ID_SGS_1764 0x0009 - -#define PCI_VENDOR_ID_BUSLOGIC 0x104B -#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140 -#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER 0x1040 -#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT 0x8130 - -#define PCI_VENDOR_ID_TI 0x104c -#define PCI_DEVICE_ID_TI_TVP4010 0x3d04 -#define PCI_DEVICE_ID_TI_TVP4020 0x3d07 -#define PCI_DEVICE_ID_TI_XIO2001 0x8240 -#define PCI_DEVICE_ID_TI_1130 0xac12 -#define PCI_DEVICE_ID_TI_1031 0xac13 -#define PCI_DEVICE_ID_TI_1131 0xac15 -#define PCI_DEVICE_ID_TI_1250 0xac16 -#define PCI_DEVICE_ID_TI_1220 0xac17 -#define PCI_DEVICE_ID_TI_1221 0xac19 -#define PCI_DEVICE_ID_TI_1210 0xac1a -#define PCI_DEVICE_ID_TI_1410 0xac50 -#define PCI_DEVICE_ID_TI_1450 0xac1b -#define PCI_DEVICE_ID_TI_1225 0xac1c -#define PCI_DEVICE_ID_TI_1251A 0xac1d -#define PCI_DEVICE_ID_TI_1211 0xac1e -#define PCI_DEVICE_ID_TI_1251B 0xac1f -#define PCI_DEVICE_ID_TI_4410 0xac41 -#define PCI_DEVICE_ID_TI_4451 0xac42 -#define PCI_DEVICE_ID_TI_1420 0xac51 -#define PCI_DEVICE_ID_TI_1520 0xac55 -#define PCI_DEVICE_ID_TI_1510 0xac56 - -#define PCI_VENDOR_ID_SONY 0x104d -#define PCI_DEVICE_ID_SONY_CXD3222 0x8039 - -#define PCI_VENDOR_ID_OAK 0x104e -#define PCI_DEVICE_ID_OAK_OTI107 0x0107 +#define PCI_DID_ATI_RADEON_RA 0x5144 +#define PCI_DID_ATI_RADEON_RB 0x5145 +#define PCI_DID_ATI_RADEON_RC 0x5146 +#define PCI_DID_ATI_RADEON_RD 0x5147 + +#define PCI_DID_ATI_SB600_LPC 0x438D +#define PCI_DID_ATI_SB600_SATA 0x4380 +#define PCI_DID_ATI_SB600_IDE 0x438C +#define PCI_DID_ATI_SB600_HDA 0x4383 +#define PCI_DID_ATI_SB600_ACI 0x4382 +#define PCI_DID_ATI_SB600_MCI 0x438E +#define PCI_DID_ATI_SB600_USB2 0x4386 +#define PCI_DID_ATI_SB600_PCI 0x4384 +#define PCI_DID_ATI_SB600_SM 0x4385 +#define PCI_DID_ATI_SB600_USB_0 0x4387 +#define PCI_DID_ATI_SB600_USB_1 0x4388 +#define PCI_DID_ATI_SB600_USB_2 0x4389 +#define PCI_DID_ATI_SB600_USB_3 0x438A +#define PCI_DID_ATI_SB600_USB_4 0x438B + +#define PCI_DID_ATI_SB700_LPC 0x439D +#define PCI_DID_ATI_SB700_SATA 0x4390 +#define PCI_DID_ATI_SB700_SATA_AHCI 0x4391 +#define PCI_DID_ATI_SB700_SATA_AHCI_AMD 0x4394 +#define PCI_DID_ATI_SB700_IDE 0x439C +#define PCI_DID_ATI_SB700_HDA 0x4383 +#define PCI_DID_ATI_SB700_PCI 0x4384 +#define PCI_DID_ATI_SB700_SM 0x4385 +#define PCI_DID_ATI_SB700_USB_18_0 0x4397 +#define PCI_DID_ATI_SB700_USB_18_1 0x4398 +#define PCI_DID_ATI_SB700_USB_18_2 0x4396 +#define PCI_DID_ATI_SB700_USB_19_0 0x4397 +#define PCI_DID_ATI_SB700_USB_19_1 0x4398 +#define PCI_DID_ATI_SB700_USB_19_2 0x4396 +#define PCI_DID_ATI_SB700_USB_20_5 0x4399 + +#define PCI_DID_ATI_SB800_LPC 0x439D +#define PCI_DID_ATI_SB800_SATA 0x4390 +#define PCI_DID_ATI_SB800_SATA_AHCI 0x4391 +#define PCI_DID_ATI_SB800_SATA_RAID 0x4392 +#define PCI_DID_ATI_SB800_SATA_RAID5 0x4393 +#define PCI_DID_ATI_SB800_IDE 0x439C +#define PCI_DID_ATI_SB800_HDA 0x4383 +#define PCI_DID_ATI_SB800_PCI 0x4384 +#define PCI_DID_ATI_SB800_PCIEA 0x43A0 +#define PCI_DID_ATI_SB800_PCIEB 0x43A1 +#define PCI_DID_ATI_SB800_PCIEC 0x43A2 +#define PCI_DID_ATI_SB800_PCIED 0x43A3 +#define PCI_DID_ATI_SB800_SM 0x4385 +#define PCI_DID_ATI_SB800_USB_18_0 0x4397 +#define PCI_DID_ATI_SB800_USB_18_2 0x4396 +#define PCI_DID_ATI_SB800_USB_19_0 0x4397 +#define PCI_DID_ATI_SB800_USB_19_2 0x4396 +#define PCI_DID_ATI_SB800_USB_20_5 0x4399 +#define PCI_DID_ATI_SB800_USB_22_0 0x4397 +#define PCI_DID_ATI_SB800_USB_22_2 0x4396 +#define PCI_DID_ATI_SB800_GEC 0x1699 + +#define PCI_DID_ATI_RS690_HT 0x7910 +#define PCI_DID_ATI_RS740_HT 0x7911 +#define PCI_DID_ATI_RS690_PCIE 0x7912 +#define PCI_DID_ATI_RS690_PCIE_DEV2 0x7913 +#define PCI_DID_ATI_RS690_PCIE_DEV3 0x791B +#define PCI_DID_ATI_RS690_PCIE_DEV4 0x7914 +#define PCI_DID_ATI_RS690_PCIE_DEV5 0x7915 +#define PCI_DID_ATI_RS690_PCIE_DEV6 0x7916 +#define PCI_DID_ATI_RS690_PCIE_DEV7 0x7917 +#define PCI_DID_ATI_RS690_PCIE_DEV8 0x7918 +#define PCI_DID_ATI_RS690_INT_GFX 0x791e +#define PCI_DID_ATI_RS690MT_INT_GFX 0x791f +#define PCI_DID_ATI_RS740_INT_GFX 0x796e + +#define PCI_DID_ATI_RS780_INT_GFX 0x9610 +#define PCI_DID_ATI_RS780C_INT_GFX 0x9611 +#define PCI_DID_ATI_RS780M_INT_GFX 0x9612 +#define PCI_DID_ATI_RS780MC_INT_GFX 0x9613 +#define PCI_DID_ATI_RS780E_INT_GFX 0x9615 +#define PCI_DID_ATI_RS785G_INT_GFX 0x9710 +#define PCI_DID_ATI_RS785C_INT_GFX 0x9711 +#define PCI_DID_ATI_RS785M_INT_GFX 0x9712 +#define PCI_DID_ATI_RS785MC_INT_GFX 0x9713 +#define PCI_DID_ATI_RS785D_INT_GFX 0x9714 + +#define PCI_DID_ATI_FAM17H_MODEL18H_GPU 0x15D8 +#define PCI_DID_ATI_FAM17H_MODEL60H_GPU 0x1636 +#define PCI_DID_ATI_FAM17H_MODEL68H_GPU 0x164C +#define PCI_DID_ATI_FAM17H_MODELA0H_GPU 0x1506 +#define PCI_DID_ATI_FAM19H_MODEL51H_GPU_CEZANNE 0x1638 +#define PCI_DID_ATI_FAM19H_MODEL51H_GPU_BARCELO 0x15e7 +#define PCI_DID_ATI_FAM17H_MODEL18H_HDA0 0x15DE +#define PCI_DID_ATI_FAM17H_MODEL60H_HDA0 0x1637 +#define PCI_DID_ATI_FAM17H_MODELA0H_HDA0 0x1640 + +#define PCI_VID_VLSI 0x1004 +#define PCI_DID_VLSI_82C592 0x0005 +#define PCI_DID_VLSI_82C593 0x0006 +#define PCI_DID_VLSI_82C594 0x0007 +#define PCI_DID_VLSI_82C597 0x0009 +#define PCI_DID_VLSI_82C541 0x000c +#define PCI_DID_VLSI_82C543 0x000d +#define PCI_DID_VLSI_82C532 0x0101 +#define PCI_DID_VLSI_82C534 0x0102 +#define PCI_DID_VLSI_82C535 0x0104 +#define PCI_DID_VLSI_82C147 0x0105 +#define PCI_DID_VLSI_VAS96011 0x0702 + +#define PCI_VID_ADL 0x1005 +#define PCI_DID_ADL_2301 0x2301 + +#define PCI_VID_NS 0x100b +#define PCI_DID_NS_87415 0x0002 +#define PCI_DID_NS_87560_LIO 0x000e +#define PCI_DID_NS_87560_USB 0x0012 +#define PCI_DID_NS_83815 0x0020 +#define PCI_DID_NS_83820 0x0022 +#define PCI_DID_NS_GX2 0x0028 +#define PCI_DID_NS_CS5535 0x002a +#define PCI_DID_NS_CS5535_ISA 0x002b +#define PCI_DID_NS_CS5535_IDE 0x002d +#define PCI_DID_NS_CS5535_AUDIO 0x002e +#define PCI_DID_NS_CS5535_USB 0x002f +#define PCI_DID_NS_CS5535_GX2VGA 0x0030 +#define PCI_DID_NS_SCx200_BRIDGE 0x0500 +#define PCI_DID_NS_SCx200_SMI 0x0501 +#define PCI_DID_NS_SCx200_IDE 0x0502 +#define PCI_DID_NS_SCx200_AUDIO 0x0503 +#define PCI_DID_NS_SCx200_VIDEO 0x0504 +#define PCI_DID_NS_SCx200_XBUS 0x0505 +#define PCI_DID_NS_87410 0xd001 + +#define PCI_VID_TSENG 0x100c +#define PCI_DID_TSENG_W32P_2 0x3202 +#define PCI_DID_TSENG_W32P_b 0x3205 +#define PCI_DID_TSENG_W32P_c 0x3206 +#define PCI_DID_TSENG_W32P_d 0x3207 +#define PCI_DID_TSENG_ET6000 0x3208 + +#define PCI_VID_WEITEK 0x100e +#define PCI_DID_WEITEK_P9000 0x9001 +#define PCI_DID_WEITEK_P9100 0x9100 + +#define PCI_VID_DEC 0x1011 +#define PCI_DID_DEC_BRD 0x0001 +#define PCI_DID_DEC_TULIP 0x0002 +#define PCI_DID_DEC_TGA 0x0004 +#define PCI_DID_DEC_TULIP_FAST 0x0009 +#define PCI_DID_DEC_TGA2 0x000D +#define PCI_DID_DEC_FDDI 0x000F +#define PCI_DID_DEC_TULIP_PLUS 0x0014 +#define PCI_DID_DEC_21142 0x0019 +#define PCI_DID_DEC_21052 0x0021 +#define PCI_DID_DEC_21150 0x0022 +#define PCI_DID_DEC_21152 0x0024 +#define PCI_DID_DEC_21153 0x0025 +#define PCI_DID_DEC_21154 0x0026 +#define PCI_DID_DEC_21285 0x1065 +#define PCI_DID_COMPAQ_42XX 0x0046 + +#define PCI_VID_CIRRUS 0x1013 +#define PCI_DID_CIRRUS_7548 0x0038 +#define PCI_DID_CIRRUS_5430 0x00a0 +#define PCI_DID_CIRRUS_5434_4 0x00a4 +#define PCI_DID_CIRRUS_5434_8 0x00a8 +#define PCI_DID_CIRRUS_5436 0x00ac +#define PCI_DID_CIRRUS_5446 0x00b8 +#define PCI_DID_CIRRUS_5480 0x00bc +#define PCI_DID_CIRRUS_5462 0x00d0 +#define PCI_DID_CIRRUS_5464 0x00d4 +#define PCI_DID_CIRRUS_5465 0x00d6 +#define PCI_DID_CIRRUS_6729 0x1100 +#define PCI_DID_CIRRUS_6832 0x1110 +#define PCI_DID_CIRRUS_7542 0x1200 +#define PCI_DID_CIRRUS_7543 0x1202 +#define PCI_DID_CIRRUS_7541 0x1204 + +#define PCI_VID_IBM 0x1014 +#define PCI_DID_IBM_FIRE_CORAL 0x000a +#define PCI_DID_IBM_TR 0x0018 +#define PCI_DID_IBM_82G2675 0x001d +#define PCI_DID_IBM_MCA 0x0020 +#define PCI_DID_IBM_82351 0x0022 +#define PCI_DID_IBM_PYTHON 0x002d +#define PCI_DID_IBM_SERVERAID 0x002e +#define PCI_DID_IBM_TR_WAKE 0x003e +#define PCI_DID_IBM_MPIC 0x0046 +#define PCI_DID_IBM_3780IDSP 0x007d +#define PCI_DID_IBM_CHUKAR 0x0096 +#define PCI_DID_IBM_CPC710_PCI64 0x00fc +#define PCI_DID_IBM_CPC710_PCI32 0x0105 +#define PCI_DID_IBM_405GP 0x0156 +#define PCI_DID_IBM_SERVERAIDI960 0x01bd +#define PCI_DID_IBM_MPIC_2 0xffff + +#define PCI_VID_COMPEX2 0x101a // pci.ids says "AT&T GIS (NCR)" +#define PCI_DID_COMPEX2_100VG 0x0005 + +#define PCI_VID_WD 0x101c +#define PCI_DID_WD_7197 0x3296 +#define PCI_DID_WD_90C 0xc24a + +#define PCI_VID_AMI 0x101e +#define PCI_DID_AMI_MEGARAID3 0x1960 +#define PCI_DID_AMI_MEGARAID 0x9010 +#define PCI_DID_AMI_MEGARAID2 0x9060 + +#define PCI_VID_AMD 0x1022 + +#define PCI_DID_AMD_10H_NB_HT 0x1200 +#define PCI_DID_AMD_15H_MODEL_000F_NB_HT 0x1600 +#define PCI_DID_AMD_15H_MODEL_101F_NB_HT 0x1400 +#define PCI_DID_AMD_15H_MODEL_303F_NB_HT 0x141A +#define PCI_DID_AMD_15H_MODEL_606F_NB_HT 0x1570 +#define PCI_DID_AMD_15H_MODEL_707F_NB_HT 0x15B0 +#define PCI_DID_AMD_16H_MODEL_000F_NB_HT 0x1536 +#define PCI_DID_AMD_16H_MODEL_303F_NB_HT 0x1566 +#define PCI_DID_AMD_17H_MODEL_101F_NB 0x15d0 +#define PCI_DID_AMD_17H_MODEL_606F_NB 0x1630 +#define PCI_DID_AMD_17H_MODEL_A0AF_NB 0x14B5 +#define PCI_DID_AMD_15H_MODEL_101F_NB_IOMMU 0x1419 +#define PCI_DID_AMD_15H_MODEL_303F_NB_IOMMU 0x1423 +#define PCI_DID_AMD_15H_MODEL_707F_NB_IOMMU 0x1577 +#define PCI_DID_AMD_16H_MODEL_303F_NB_IOMMU 0x1567 +#define PCI_DID_AMD_17H_MODEL_1020_NB_IOMMU 0x15D1 +#define PCI_DID_AMD_17H_MODEL_606F_NB_IOMMU 0x1631 +#define PCI_DID_AMD_17H_MODEL_A0AF_NB_IOMMU 0x14B6 + +#define PCI_DID_AMD_SB900_LPC 0x780E +#define PCI_DID_AMD_SB900_SATA 0x7800 +#define PCI_DID_AMD_SB900_SATA_AHCI 0x7801 +#define PCI_DID_AMD_SB900_SATA_RAID 0x7802 +#define PCI_DID_AMD_SB900_SATA_RAID5 0x7803 +#define PCI_DID_AMD_SB900_SATA_AMDAHCI 0x7804 +#define PCI_DID_AMD_SB900_IDE 0x780C +#define PCI_DID_AMD_SB900_HDA 0x780D +#define PCI_DID_AMD_SB900_PCI 0x780F +#define PCI_DID_AMD_SB900_PCIEA 0x43A0 +#define PCI_DID_AMD_SB900_PCIEB 0x43A1 +#define PCI_DID_AMD_SB900_PCIEC 0x43A2 +#define PCI_DID_AMD_SB900_PCIED 0x43A3 +#define PCI_DID_AMD_SB900_SM 0x780B +#define PCI_DID_AMD_SB900_USB_16_0 0x7812 +#define PCI_DID_AMD_SB900_USB_16_1 0x7812 +#define PCI_DID_AMD_SB900_USB_18_0 0x7807 +#define PCI_DID_AMD_SB900_USB_18_2 0x7808 +#define PCI_DID_AMD_SB900_USB_19_0 0x7807 +#define PCI_DID_AMD_SB900_USB_19_2 0x7808 +#define PCI_DID_AMD_SB900_USB_20_5 0x7809 +#define PCI_DID_AMD_SB900_GEC 0x7806 +#define PCI_DID_AMD_HUDSON_SD 0x7806 +#define PCI_DID_AMD_YANGTZE_SD 0x7813 + +#define PCI_DID_AMD_RS780_HT 0x9600 +#define PCI_DID_AMD_RS780_PCIE 0x9602 +#define PCI_DID_AMD_RS780_PCIE_DEV2 0x9603 +#define PCI_DID_AMD_RS780_PCIE_DEV3 0x960B +#define PCI_DID_AMD_RS780_PCIE_DEV4 0x9604 +#define PCI_DID_AMD_RS780_PCIE_DEV5 0x9605 +#define PCI_DID_AMD_RS780_PCIE_DEV6 0x9606 +#define PCI_DID_AMD_RS780_PCIE_DEV7 0x9607 +#define PCI_DID_AMD_RS780_PCIE_DEV9 0x9608 +#define PCI_DID_AMD_RS780_PCIE_DEV10 0x9609 +#define PCI_DID_AMD_RS780_PCIE_DEV8 0x960A + +#define PCI_DID_AMD_RD890TV_HT 0x5956 +#define PCI_DID_AMD_RX780_HT 0x5957 +#define PCI_DID_AMD_RD780_HT 0x5958 +#define PCI_DID_AMD_SR5690_HT 0x5A10 +#define PCI_DID_AMD_RD890_HT 0x5A11 +#define PCI_DID_AMD_SR5670_HT 0x5A12 +#define PCI_DID_AMD_SR5650_HT 0x5A13 +#define PCI_DID_AMD_990FX_HT 0x5A14 +#define PCI_DID_AMD_SR5650_PCIE 0x5A12 +#define PCI_DID_AMD_SR5650_PCIE_DEV2 0x5A16 +#define PCI_DID_AMD_SR5650_PCIE_DEV3 0x5A17 +#define PCI_DID_AMD_SR5650_PCIE_DEV4 0x5A18 +#define PCI_DID_AMD_SR5650_PCIE_DEV5 0x5A19 +#define PCI_DID_AMD_SR5650_PCIE_DEV6 0x5A1A +#define PCI_DID_AMD_SR5650_PCIE_DEV7 0x5A1B +#define PCI_DID_AMD_SR5650_PCIE_DEV9 0x5A1C +#define PCI_DID_AMD_SR5650_PCIE_DEV10 0x5A1D +#define PCI_DID_AMD_SR5650_PCIE_DEV11 0x5A1F +#define PCI_DID_AMD_SR5650_PCIE_DEV12 0x5A20 +#define PCI_DID_AMD_SR5650_PCIE_DEV13 0x5A1E +#define PCI_DID_AMD_SR5650_PCIE_DEV8 0x5A21 +#define PCI_DID_AMD_SR5650_IOMMU 0x5A23 + +#define PCI_DID_AMD_CZ_HDA 0x157A +#define PCI_DID_AMD_CZ_LPC 0x790E +#define PCI_DID_AMD_CZ_SATA 0x7900 +#define PCI_DID_AMD_CZ_SATA_AHCI 0x7901 +#define PCI_DID_AMD_CZ_USB_0 0x7907 +#define PCI_DID_AMD_CZ_USB_1 0x7908 +#define PCI_DID_AMD_CZ_USB3_0 0x7914 +#define PCI_DID_AMD_CZ_SMBUS 0x790B + +#define PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP 0x15D3 +#define PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1 0x1633 +#define PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2 0x1634 +#define PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP 0x14BA +#define PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA 0x15DB +#define PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB 0x15DC +#define PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC 0x1635 +#define PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC 0x14B9 +#define PCI_DID_AMD_FAM17H_ACP 0x15E2 +#define PCI_DID_AMD_FAM17H_HDA1 0x15E3 +#define PCI_DID_AMD_FAM17H_MODEL18H_XHCI0 0x15E0 +#define PCI_DID_AMD_FAM17H_MODEL18H_XHCI1 0x15E1 +#define PCI_DID_AMD_FAM17H_MODEL20H_XHCI0 0x15E5 +#define PCI_DID_AMD_FAM17H_MODEL60H_XHCI 0x1639 +#define PCI_DID_AMD_FAM17H_MODELA0H_XHCI0 0x1503 +#define PCI_DID_AMD_FAM17H_MODELA0H_XHCI1 0x1504 +#define PCI_DID_AMD_FAM17H_MODELA0H_XHCI2 0x1505 +#define PCI_DID_AMD_FAM17H_MODEL18H_DF0 0x15E8 +#define PCI_DID_AMD_FAM17H_MODEL18H_DF1 0x15E9 +#define PCI_DID_AMD_FAM17H_MODEL18H_DF2 0x15EA +#define PCI_DID_AMD_FAM17H_MODEL18H_DF3 0x15EB +#define PCI_DID_AMD_FAM17H_MODEL18H_DF4 0x15EC +#define PCI_DID_AMD_FAM17H_MODEL18H_DF5 0x15ED +#define PCI_DID_AMD_FAM17H_MODEL18H_DF6 0x15EE +#define PCI_DID_AMD_FAM17H_MODEL18H_DF7 0x15EF +#define PCI_DID_AMD_FAM17H_MODEL60H_DF0 0x1448 +#define PCI_DID_AMD_FAM17H_MODEL60H_DF1 0x1449 +#define PCI_DID_AMD_FAM17H_MODEL60H_DF2 0x144A +#define PCI_DID_AMD_FAM17H_MODEL60H_DF3 0x144B +#define PCI_DID_AMD_FAM17H_MODEL60H_DF4 0x144C +#define PCI_DID_AMD_FAM17H_MODEL60H_DF5 0x144D +#define PCI_DID_AMD_FAM17H_MODEL60H_DF6 0x144E +#define PCI_DID_AMD_FAM17H_MODEL60H_DF7 0x144F +#define PCI_DID_AMD_FAM17H_MODELA0H_DF0 0x1724 +#define PCI_DID_AMD_FAM17H_MODELA0H_DF1 0x1725 +#define PCI_DID_AMD_FAM17H_MODELA0H_DF2 0x1726 +#define PCI_DID_AMD_FAM17H_MODELA0H_DF3 0x1727 +#define PCI_DID_AMD_FAM17H_MODELA0H_DF4 0x1728 +#define PCI_DID_AMD_FAM17H_MODELA0H_DF5 0x1729 +#define PCI_DID_AMD_FAM17H_MODELA0H_DF6 0x172A +#define PCI_DID_AMD_FAM17H_MODELA0H_DF7 0x172B +#define PCI_DID_AMD_FAM19H_MODEL51H_DF0 0x166A +#define PCI_DID_AMD_FAM19H_MODEL51H_DF1 0x166B +#define PCI_DID_AMD_FAM19H_MODEL51H_DF2 0x166C +#define PCI_DID_AMD_FAM19H_MODEL51H_DF3 0x166D +#define PCI_DID_AMD_FAM19H_MODEL51H_DF4 0x166E +#define PCI_DID_AMD_FAM19H_MODEL51H_DF5 0x166F +#define PCI_DID_AMD_FAM19H_MODEL51H_DF6 0x1670 +#define PCI_DID_AMD_FAM19H_MODEL51H_DF7 0x1671 +#define PCI_DID_AMD_FAM17H_SATA_AHCI_VER0 0x7901 +#define PCI_DID_AMD_FAM17H_SATA_AHCI_VER1 0x7904 +#define PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER0 0x7916 +#define PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER1 0x7917 +#define PCI_DID_AMD_FAM17H_MODEL18H_SD 0x7906 +#define PCI_DID_AMD_FAM17H_MODEL18H_GBE 0x1458 +#define PCI_DID_AMD_FAM17H_MODEL60H_GBE 0x1641 +#define PCI_DID_AMD_FAM17H_I2S_AC97 0x1644 + +#define PCI_DID_AMD_LANCE 0x2000 +#define PCI_DID_AMD_LANCE_HOME 0x2001 +#define PCI_DID_AMD_LX 0x1054 +#define PCI_DID_AMD_LXBRIDGE 0x2080 +#define PCI_DID_AMD_SCSI 0x2020 +#define PCI_DID_AMD_FE_GATE_7006 0x7006 +#define PCI_DID_AMD_FE_GATE_7007 0x7007 +#define PCI_DID_AMD_FE_GATE_700C 0x700C +#define PCI_DID_AMD_FE_GATE_700D 0x700D +#define PCI_DID_AMD_FE_GATE_700E 0x700E +#define PCI_DID_AMD_FE_GATE_700F 0x700F +#define PCI_DID_AMD_COBRA_7400 0x7400 +#define PCI_DID_AMD_COBRA_7401 0x7401 +#define PCI_DID_AMD_COBRA_7403 0x7403 +#define PCI_DID_AMD_COBRA_7404 0x7404 +#define PCI_DID_AMD_VIPER_7408 0x7408 +#define PCI_DID_AMD_VIPER_7409 0x7409 +#define PCI_DID_AMD_VIPER_740B 0x740B +#define PCI_DID_AMD_VIPER_740C 0x740C +#define PCI_DID_AMD_VIPER_7410 0x7410 +#define PCI_DID_AMD_VIPER_7411 0x7411 + +#define PCI_DID_AMD_SB768_7440 0x7440 +#define PCI_DID_AMD_SB768_7441 0x7441 +#define PCI_DID_AMD_SB768_7443 0x7443 +#define PCI_DID_AMD_SB768_7448 0x7448 +#define PCI_DID_AMD_SB768_7449 0x7449 + +#define PCI_DID_AMD_VIPER_7413 0x7413 +#define PCI_DID_AMD_VIPER_7414 0x7414 +#define PCI_DID_AMD_VIPER_7440 0x7440 +#define PCI_DID_AMD_VIPER_7441 0x7441 +#define PCI_DID_AMD_VIPER_7443 0x7443 +#define PCI_DID_AMD_VIPER_7448 0x7448 +#define PCI_DID_AMD_VIPER_7449 0x7449 + +#define PCI_DID_AMD_8151_SYSCTRL 0x7454 +#define PCI_DID_AMD_8151_AGP 0x7455 +#define PCI_DID_AMD_8111_PCI 0x7460 +#define PCI_DID_AMD_8111_USB 0x7464 +#define PCI_DID_AMD_8111_ISA 0x7468 +#define PCI_DID_AMD_8111_IDE 0x7469 +#define PCI_DID_AMD_8111_SMB 0x746a +#define PCI_DID_AMD_8111_ACPI 0x746b +#define PCI_DID_AMD_8111_NIC 0x7462 + +#define PCI_DID_AMD_8111_USB2 0x7463 +#define PCI_DID_AMD_8131_PCIX 0x7450 +#define PCI_DID_AMD_8131_IOAPIC 0x7451 + +#define PCI_DID_AMD_8132_PCIX 0x7458 +#define PCI_DID_AMD_8132_IOAPIC 0x7459 +#define PCI_DID_AMD_AES 0x2082 +#define PCI_DID_AMD_CS5536_ISA 0x2090 +#define PCI_DID_AMD_CS5536_FLASH 0x2091 +#define PCI_DID_AMD_CS5536_A0_IDE 0x2092 +#define PCI_DID_AMD_CS5536_AUDIO 0x2093 +#define PCI_DID_AMD_CS5536_OHCI 0x2094 +#define PCI_DID_AMD_CS5536_EHCI 0x2095 +#define PCI_DID_AMD_CS5536_UDC 0x2096 +#define PCI_DID_AMD_CS5536_OTG 0x2097 +#define PCI_DID_AMD_CS5536_B0_IDE 0x209A + +#define PCI_VID_TRIDENT 0x1023 +#define PCI_DID_TRIDENT_4DWAVE_DX 0x2000 +#define PCI_DID_TRIDENT_4DWAVE_NX 0x2001 +#define PCI_DID_TRIDENT_9320 0x9320 +#define PCI_DID_TRIDENT_9388 0x9388 +#define PCI_DID_TRIDENT_9397 0x9397 +#define PCI_DID_TRIDENT_939A 0x939A +#define PCI_DID_TRIDENT_9520 0x9520 +#define PCI_DID_TRIDENT_9525 0x9525 +#define PCI_DID_TRIDENT_9420 0x9420 +#define PCI_DID_TRIDENT_9440 0x9440 +#define PCI_DID_TRIDENT_9660 0x9660 +#define PCI_DID_TRIDENT_9750 0x9750 +#define PCI_DID_TRIDENT_9850 0x9850 +#define PCI_DID_TRIDENT_9880 0x9880 +#define PCI_DID_TRIDENT_8400 0x8400 +#define PCI_DID_TRIDENT_8420 0x8420 +#define PCI_DID_TRIDENT_8500 0x8500 + +#define PCI_VID_AI 0x1025 +#define PCI_DID_AI_M1435 0x1435 + +#define PCI_VID_DELL 0x1028 + +#define PCI_VID_MATROX 0x102B +#define PCI_DID_MATROX_MGA_2 0x0518 +#define PCI_DID_MATROX_MIL 0x0519 +#define PCI_DID_MATROX_MYS 0x051A +#define PCI_DID_MATROX_MIL_2 0x051b +#define PCI_DID_MATROX_MIL_2_AGP 0x051f +#define PCI_DID_MATROX_MGA_IMP 0x0d10 +#define PCI_DID_MATROX_G100_MM 0x1000 +#define PCI_DID_MATROX_G100_AGP 0x1001 +#define PCI_DID_MATROX_G200_PCI 0x0520 +#define PCI_DID_MATROX_G200_AGP 0x0521 +#define PCI_DID_MATROX_G400 0x0525 +#define PCI_DID_MATROX_G550 0x2527 +#define PCI_DID_MATROX_VIA 0x4536 + +#define PCI_VID_CT 0x102c +#define PCI_DID_CT_65545 0x00d8 +#define PCI_DID_CT_65548 0x00dc +#define PCI_DID_CT_65550 0x00e0 +#define PCI_DID_CT_65554 0x00e4 +#define PCI_DID_CT_65555 0x00e5 + +#define PCI_VID_MIRO 0x1031 +#define PCI_DID_MIRO_36050 0x5601 + +#define PCI_VID_NEC 0x1033 +#define PCI_DID_NEC_PCX2 0x0046 +#define PCI_DID_NEC_NILE4 0x005a +#define PCI_DID_NEC_VRC5476 0x009b +#define PCI_DID_NEC_VRC5477_AC97 0x00a6 + +#define PCI_VID_FD 0x1036 +#define PCI_DID_FD_36C70 0x0000 + +#define PCI_VID_SI 0x1039 +#define PCI_DID_SI_5591_AGP 0x0001 +#define PCI_DID_SI_6202 0x0002 +#define PCI_DID_SI_503 0x0008 +#define PCI_DID_SI_ACPI 0x0009 +#define PCI_DID_SI_5597_VGA 0x0200 +#define PCI_DID_SI_6205 0x0205 +#define PCI_DID_SI_501 0x0406 +#define PCI_DID_SI_496 0x0496 +#define PCI_DID_SI_300 0x0300 +#define PCI_DID_SI_315H 0x0310 +#define PCI_DID_SI_315 0x0315 +#define PCI_DID_SI_315PRO 0x0325 +#define PCI_DID_SI_530 0x0530 +#define PCI_DID_SI_540 0x0540 +#define PCI_DID_SI_550 0x0550 +#define PCI_DID_SI_540_VGA 0x5300 +#define PCI_DID_SI_550_VGA 0x5315 +#define PCI_DID_SI_601 0x0601 +#define PCI_DID_SI_620 0x0620 +#define PCI_DID_SI_630 0x0630 +#define PCI_DID_SI_635 0x0635 +#define PCI_DID_SI_640 0x0640 +#define PCI_DID_SI_645 0x0645 +#define PCI_DID_SI_650 0x0650 +#define PCI_DID_SI_730 0x0730 +#define PCI_DID_SI_630_VGA 0x6300 +#define PCI_DID_SI_730_VGA 0x7300 +#define PCI_DID_SI_735 0x0735 +#define PCI_DID_SI_740 0x0740 +#define PCI_DID_SI_745 0x0745 +#define PCI_DID_SI_750 0x0750 +#define PCI_DID_SI_900 0x0900 +#define PCI_DID_SI_5107 0x5107 +#define PCI_DID_SI_5300 0x5300 +#define PCI_DID_SI_5511 0x5511 +#define PCI_DID_SI_5513 0x5513 +#define PCI_DID_SI_5571 0x5571 +#define PCI_DID_SI_5591 0x5591 +#define PCI_DID_SI_5597 0x5597 +#define PCI_DID_SI_5598 0x5598 +#define PCI_DID_SI_5600 0x5600 +#define PCI_DID_SI_6300 0x6300 +#define PCI_DID_SI_6306 0x6306 +#define PCI_DID_SI_6326 0x6326 +#define PCI_DID_SI_7001 0x7001 +#define PCI_DID_SI_7016 0x7016 + +#define PCI_VID_HP 0x103c +#define PCI_DID_HP_DONNER_GFX 0x1008 +#define PCI_DID_HP_TACHYON 0x1028 +#define PCI_DID_HP_TACHLITE 0x1029 +#define PCI_DID_HP_J2585A 0x1030 +#define PCI_DID_HP_J2585B 0x1031 +#define PCI_DID_HP_SAS 0x1048 +#define PCI_DID_HP_DIVA1 0x1049 +#define PCI_DID_HP_DIVA2 0x104A +#define PCI_DID_HP_SP2_0 0x104B +#define PCI_DID_HP_ZX1_SBA 0x1229 +#define PCI_DID_HP_ZX1_IOC 0x122a +#define PCI_DID_HP_ZX1_LBA 0x122e + +#define PCI_VID_PCTECH 0x1042 +#define PCI_DID_PCTECH_RZ1000 0x1000 +#define PCI_DID_PCTECH_RZ1001 0x1001 +#define PCI_DID_PCTECH_SAMURAI_0 0x3000 +#define PCI_DID_PCTECH_SAMURAI_1 0x3010 +#define PCI_DID_PCTECH_SAMURAI_IDE 0x3020 + +#define PCI_VID_ASUSTEK 0x1043 +#define PCI_DID_ASUSTEK_0675 0x0675 + +#define PCI_VID_DPT 0x1044 +#define PCI_DID_DPT 0xa400 + +#define PCI_VID_OPTI 0x1045 +#define PCI_DID_OPTI_92C178 0xc178 +#define PCI_DID_OPTI_82C557 0xc557 +#define PCI_DID_OPTI_82C558 0xc558 +#define PCI_DID_OPTI_82C621 0xc621 +#define PCI_DID_OPTI_82C700 0xc700 +#define PCI_DID_OPTI_82C701 0xc701 +#define PCI_DID_OPTI_82C814 0xc814 +#define PCI_DID_OPTI_82C822 0xc822 +#define PCI_DID_OPTI_82C861 0xc861 +#define PCI_DID_OPTI_82C825 0xd568 + +#define PCI_VID_ELSA 0x1048 +#define PCI_DID_ELSA_MICROLINK 0x1000 +#define PCI_DID_ELSA_QS3000 0x3000 + +#define PCI_VID_SGS 0x104a +#define PCI_DID_SGS_2000 0x0008 +#define PCI_DID_SGS_1764 0x0009 + +#define PCI_VID_BUSLOGIC 0x104B +#define PCI_DID_BUSLOGIC_MULTIMASTER_NC 0x0140 +#define PCI_DID_BUSLOGIC_MULTIMASTER 0x1040 +#define PCI_DID_BUSLOGIC_FLASHPOINT 0x8130 + +#define PCI_VID_TI 0x104c +#define PCI_DID_TI_TVP4010 0x3d04 +#define PCI_DID_TI_TVP4020 0x3d07 +#define PCI_DID_TI_XIO2001 0x8240 +#define PCI_DID_TI_1130 0xac12 +#define PCI_DID_TI_1031 0xac13 +#define PCI_DID_TI_1131 0xac15 +#define PCI_DID_TI_1250 0xac16 +#define PCI_DID_TI_1220 0xac17 +#define PCI_DID_TI_1221 0xac19 +#define PCI_DID_TI_1210 0xac1a +#define PCI_DID_TI_1410 0xac50 +#define PCI_DID_TI_1450 0xac1b +#define PCI_DID_TI_1225 0xac1c +#define PCI_DID_TI_1251A 0xac1d +#define PCI_DID_TI_1211 0xac1e +#define PCI_DID_TI_1251B 0xac1f +#define PCI_DID_TI_4410 0xac41 +#define PCI_DID_TI_4451 0xac42 +#define PCI_DID_TI_1420 0xac51 +#define PCI_DID_TI_1520 0xac55 +#define PCI_DID_TI_1510 0xac56 + +#define PCI_VID_SONY 0x104d +#define PCI_DID_SONY_CXD3222 0x8039 + +#define PCI_VID_OAK 0x104e +#define PCI_DID_OAK_OTI107 0x0107 /* Winbond have two vendor IDs! See 0x10ad as well */ -#define PCI_VENDOR_ID_WINBOND2 0x1050 -#define PCI_DEVICE_ID_WINBOND2_89C940 0x0940 -#define PCI_DEVICE_ID_WINBOND2_89C940F 0x5a5a -#define PCI_DEVICE_ID_WINBOND2_6692 0x6692 - -#define PCI_VENDOR_ID_ANIGMA 0x1051 -#define PCI_DEVICE_ID_ANIGMA_MC145575 0x0100 - -#define PCI_VENDOR_ID_EFAR 0x1055 -#define PCI_DEVICE_ID_EFAR_SLC90E66_1 0x9130 -#define PCI_DEVICE_ID_EFAR_SLC90E66_0 0x9460 -#define PCI_DEVICE_ID_EFAR_SLC90E66_2 0x9462 -#define PCI_DEVICE_ID_EFAR_SLC90E66_3 0x9463 - -#define PCI_VENDOR_ID_MOTOROLA 0x1057 -#define PCI_VENDOR_ID_MOTOROLA_OOPS 0x1507 -#define PCI_DEVICE_ID_MOTOROLA_MPC105 0x0001 -#define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 -#define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 -#define PCI_DEVICE_ID_MOTOROLA_FALCON 0x4802 -#define PCI_DEVICE_ID_MOTOROLA_HAWK 0x4803 -#define PCI_DEVICE_ID_MOTOROLA_CPX8216 0x4806 - -#define PCI_VENDOR_ID_PROMISE 0x105a -#define PCI_DEVICE_ID_PROMISE_20265 0x0d30 -#define PCI_DEVICE_ID_PROMISE_20267 0x4d30 -#define PCI_DEVICE_ID_PROMISE_20246 0x4d33 -#define PCI_DEVICE_ID_PROMISE_20262 0x4d38 -#define PCI_DEVICE_ID_PROMISE_20263 0x0D38 -#define PCI_DEVICE_ID_PROMISE_20268 0x4d68 -#define PCI_DEVICE_ID_PROMISE_20270 0x6268 -#define PCI_DEVICE_ID_PROMISE_20269 0x4d69 -#define PCI_DEVICE_ID_PROMISE_20271 0x6269 -#define PCI_DEVICE_ID_PROMISE_20275 0x1275 -#define PCI_DEVICE_ID_PROMISE_20276 0x5275 -#define PCI_DEVICE_ID_PROMISE_20277 0x7275 -#define PCI_DEVICE_ID_PROMISE_5300 0x5300 -#define PCI_DEVICE_ID_PROMISE_20378 0x3373 - -#define PCI_VENDOR_ID_N9 0x105d -#define PCI_DEVICE_ID_N9_I128 0x2309 -#define PCI_DEVICE_ID_N9_I128_2 0x2339 -#define PCI_DEVICE_ID_N9_I128_T2R 0x493d - -#define PCI_VENDOR_ID_UMC 0x1060 -#define PCI_DEVICE_ID_UMC_UM8673F 0x0101 -#define PCI_DEVICE_ID_UMC_UM8891A 0x0891 -#define PCI_DEVICE_ID_UMC_UM8886BF 0x673a -#define PCI_DEVICE_ID_UMC_UM8886A 0x886a -#define PCI_DEVICE_ID_UMC_UM8881F 0x8881 -#define PCI_DEVICE_ID_UMC_UM8886F 0x8886 -#define PCI_DEVICE_ID_UMC_UM9017F 0x9017 -#define PCI_DEVICE_ID_UMC_UM8886N 0xe886 -#define PCI_DEVICE_ID_UMC_UM8891N 0xe891 - -#define PCI_VENDOR_ID_X 0x1061 -#define PCI_DEVICE_ID_X_AGX016 0x0001 - -#define PCI_VENDOR_ID_MYLEX 0x1069 -#define PCI_DEVICE_ID_MYLEX_DAC960P_V2 0x0001 -#define PCI_DEVICE_ID_MYLEX_DAC960P_V3 0x0002 -#define PCI_DEVICE_ID_MYLEX_DAC960P_V4 0x0010 -#define PCI_DEVICE_ID_MYLEX_DAC960P_V5 0x0020 -#define PCI_DEVICE_ID_MYLEX_DAC960_P 0x0001 -#define PCI_DEVICE_ID_MYLEX_DAC960_PD 0x0002 -#define PCI_DEVICE_ID_MYLEX_DAC960_PG 0x0010 -#define PCI_DEVICE_ID_MYLEX_DAC960_LA 0x0020 -#define PCI_DEVICE_ID_MYLEX_DAC960_LP 0x0050 -#define PCI_DEVICE_ID_MYLEX_DAC960_BA 0xBA56 - -#define PCI_VENDOR_ID_PICOP 0x1066 -#define PCI_DEVICE_ID_PICOP_PT86C52X 0x0001 -#define PCI_DEVICE_ID_PICOP_PT80C524 0x8002 - -#define PCI_VENDOR_ID_APPLE 0x106b -#define PCI_DEVICE_ID_APPLE_BANDIT 0x0001 -#define PCI_DEVICE_ID_APPLE_GC 0x0002 -#define PCI_DEVICE_ID_APPLE_HYDRA 0x000e -#define PCI_DEVICE_ID_APPLE_UNI_N_FW 0x0018 -#define PCI_DEVICE_ID_APPLE_KL_USB 0x0019 -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 -#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC 0x0021 -#define PCI_DEVICE_ID_APPLE_KEYLARGO 0x0022 -#define PCI_DEVICE_ID_APPLE_UNI_N_GMACP 0x0024 -#define PCI_DEVICE_ID_APPLE_KEYLARGO_P 0x0025 -#define PCI_DEVICE_ID_APPLE_KL_USB_P 0x0026 -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P 0x0027 -#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15 0x002d -#define PCI_DEVICE_ID_APPLE_UNI_N_FW2 0x0030 - -#define PCI_VENDOR_ID_YAMAHA 0x1073 -#define PCI_DEVICE_ID_YAMAHA_724 0x0004 -#define PCI_DEVICE_ID_YAMAHA_724F 0x000d -#define PCI_DEVICE_ID_YAMAHA_740 0x000a -#define PCI_DEVICE_ID_YAMAHA_740C 0x000c -#define PCI_DEVICE_ID_YAMAHA_744 0x0010 -#define PCI_DEVICE_ID_YAMAHA_754 0x0012 - -#define PCI_VENDOR_ID_NEXGEN 0x1074 -#define PCI_DEVICE_ID_NEXGEN_82C501 0x4e78 - -#define PCI_VENDOR_ID_QLOGIC 0x1077 -#define PCI_DEVICE_ID_QLOGIC_ISP1020 0x1020 -#define PCI_DEVICE_ID_QLOGIC_ISP1022 0x1022 -#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100 -#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 - -#define PCI_VENDOR_ID_CYRIX 0x1078 -#define PCI_DEVICE_ID_CYRIX_5510 0x0000 -#define PCI_DEVICE_ID_CYRIX_PCI_MASTER 0x0001 -#define PCI_DEVICE_ID_CYRIX_5520 0x0002 -#define PCI_DEVICE_ID_CYRIX_5530_LEGACY 0x0100 -#define PCI_DEVICE_ID_CYRIX_5530_SMI 0x0101 -#define PCI_DEVICE_ID_CYRIX_5530_IDE 0x0102 -#define PCI_DEVICE_ID_CYRIX_5530_AUDIO 0x0103 -#define PCI_DEVICE_ID_CYRIX_5530_VIDEO 0x0104 - -#define PCI_VENDOR_ID_LEADTEK 0x107d -#define PCI_DEVICE_ID_LEADTEK_805 0x0000 - -#define PCI_VENDOR_ID_INTERPHASE 0x107e -#define PCI_DEVICE_ID_INTERPHASE_5526 0x0004 -#define PCI_DEVICE_ID_INTERPHASE_55x6 0x0005 -#define PCI_DEVICE_ID_INTERPHASE_5575 0x0008 - -#define PCI_VENDOR_ID_CONTAQ 0x1080 -#define PCI_DEVICE_ID_CONTAQ_82C599 0x0600 -#define PCI_DEVICE_ID_CONTAQ_82C693 0xc693 - -#define PCI_VENDOR_ID_FOREX 0x1083 - -#define PCI_VENDOR_ID_OLICOM 0x108d -#define PCI_DEVICE_ID_OLICOM_OC3136 0x0001 -#define PCI_DEVICE_ID_OLICOM_OC2315 0x0011 -#define PCI_DEVICE_ID_OLICOM_OC2325 0x0012 -#define PCI_DEVICE_ID_OLICOM_OC2183 0x0013 -#define PCI_DEVICE_ID_OLICOM_OC2326 0x0014 -#define PCI_DEVICE_ID_OLICOM_OC6151 0x0021 - -#define PCI_VENDOR_ID_SUN 0x108e -#define PCI_DEVICE_ID_SUN_EBUS 0x1000 -#define PCI_DEVICE_ID_SUN_HAPPYMEAL 0x1001 -#define PCI_DEVICE_ID_SUN_RIO_EBUS 0x1100 -#define PCI_DEVICE_ID_SUN_RIO_GEM 0x1101 -#define PCI_DEVICE_ID_SUN_RIO_1394 0x1102 -#define PCI_DEVICE_ID_SUN_RIO_USB 0x1103 -#define PCI_DEVICE_ID_SUN_GEM 0x2bad -#define PCI_DEVICE_ID_SUN_SIMBA 0x5000 -#define PCI_DEVICE_ID_SUN_PBM 0x8000 -#define PCI_DEVICE_ID_SUN_SCHIZO 0x8001 -#define PCI_DEVICE_ID_SUN_SABRE 0xa000 -#define PCI_DEVICE_ID_SUN_HUMMINGBIRD 0xa001 - -#define PCI_VENDOR_ID_CMD 0x1095 -#define PCI_DEVICE_ID_CMD_640 0x0640 -#define PCI_DEVICE_ID_CMD_643 0x0643 -#define PCI_DEVICE_ID_CMD_646 0x0646 -#define PCI_DEVICE_ID_CMD_647 0x0647 -#define PCI_DEVICE_ID_CMD_648 0x0648 -#define PCI_DEVICE_ID_CMD_649 0x0649 -#define PCI_DEVICE_ID_CMD_670 0x0670 -#define PCI_DEVICE_ID_CMD_680 0x0680 - -#define PCI_VENDOR_ID_VISION 0x1098 -#define PCI_DEVICE_ID_VISION_QD8500 0x0001 -#define PCI_DEVICE_ID_VISION_QD8580 0x0002 - -#define PCI_VENDOR_ID_BROOKTREE 0x109e -#define PCI_DEVICE_ID_BROOKTREE_848 0x0350 -#define PCI_DEVICE_ID_BROOKTREE_849A 0x0351 -#define PCI_DEVICE_ID_BROOKTREE_878_1 0x036e -#define PCI_DEVICE_ID_BROOKTREE_878 0x0878 -#define PCI_DEVICE_ID_BROOKTREE_8474 0x8474 - -#define PCI_VENDOR_ID_SIERRA 0x10a8 -#define PCI_DEVICE_ID_SIERRA_STB 0x0000 - -#define PCI_VENDOR_ID_SGI 0x10a9 -#define PCI_DEVICE_ID_SGI_IOC3 0x0003 - -#define PCI_VENDOR_ID_ACC 0x10aa -#define PCI_DEVICE_ID_ACC_2056 0x0000 - -#define PCI_VENDOR_ID_WINBOND 0x10ad -#define PCI_DEVICE_ID_WINBOND_83769 0x0001 -#define PCI_DEVICE_ID_WINBOND_82C105 0x0105 -#define PCI_DEVICE_ID_WINBOND_83C553 0x0565 - -#define PCI_VENDOR_ID_DATABOOK 0x10b3 -#define PCI_DEVICE_ID_DATABOOK_87144 0xb106 - -#define PCI_VENDOR_ID_PLX 0x10b5 -#define PCI_VENDOR_ID_PLX_ROMULUS 0x106a -#define PCI_DEVICE_ID_PLX_R685 0x1030 -#define PCI_DEVICE_ID_PLX_ROMULUS 0x106a -#define PCI_DEVICE_ID_PLX_SPCOM800 0x1076 -#define PCI_DEVICE_ID_PLX_1077 0x1077 -#define PCI_DEVICE_ID_PLX_SPCOM200 0x1103 -#define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 -#define PCI_DEVICE_ID_PLX_R753 0x1152 -#define PCI_DEVICE_ID_PLX_9050 0x9050 -#define PCI_DEVICE_ID_PLX_9060 0x9060 -#define PCI_DEVICE_ID_PLX_9060ES 0x906E -#define PCI_DEVICE_ID_PLX_9060SD 0x906D -#define PCI_DEVICE_ID_PLX_9080 0x9080 -#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001 - -#define PCI_VENDOR_ID_MADGE 0x10b6 -#define PCI_DEVICE_ID_MADGE_MK2 0x0002 -#define PCI_DEVICE_ID_MADGE_C155S 0x1001 - -#define PCI_VENDOR_ID_3COM 0x10b7 -#define PCI_DEVICE_ID_3COM_3C985 0x0001 -#define PCI_DEVICE_ID_3COM_3C339 0x3390 -#define PCI_DEVICE_ID_3COM_3C590 0x5900 -#define PCI_DEVICE_ID_3COM_3C595TX 0x5950 -#define PCI_DEVICE_ID_3COM_3C595T4 0x5951 -#define PCI_DEVICE_ID_3COM_3C595MII 0x5952 -#define PCI_DEVICE_ID_3COM_3C900TPO 0x9000 -#define PCI_DEVICE_ID_3COM_3C900COMBO 0x9001 -#define PCI_DEVICE_ID_3COM_3C905TX 0x9050 -#define PCI_DEVICE_ID_3COM_3C905T4 0x9051 -#define PCI_DEVICE_ID_3COM_3C905B_TX 0x9055 - -#define PCI_VENDOR_ID_SMC 0x10b8 -#define PCI_DEVICE_ID_SMC_EPIC100 0x0005 - -#define PCI_VENDOR_ID_AL 0x10b9 -#define PCI_DEVICE_ID_AL_M1445 0x1445 -#define PCI_DEVICE_ID_AL_M1449 0x1449 -#define PCI_DEVICE_ID_AL_M1451 0x1451 -#define PCI_DEVICE_ID_AL_M1461 0x1461 -#define PCI_DEVICE_ID_AL_M1489 0x1489 -#define PCI_DEVICE_ID_AL_M1511 0x1511 -#define PCI_DEVICE_ID_AL_M1513 0x1513 -#define PCI_DEVICE_ID_AL_M1521 0x1521 -#define PCI_DEVICE_ID_AL_M1523 0x1523 -#define PCI_DEVICE_ID_AL_M1531 0x1531 -#define PCI_DEVICE_ID_AL_M1533 0x1533 -#define PCI_DEVICE_ID_AL_M1541 0x1541 -#define PCI_DEVICE_ID_AL_M1621 0x1621 -#define PCI_DEVICE_ID_AL_M1631 0x1631 -#define PCI_DEVICE_ID_AL_M1641 0x1641 -#define PCI_DEVICE_ID_AL_M1644 0x1644 -#define PCI_DEVICE_ID_AL_M1647 0x1647 -#define PCI_DEVICE_ID_AL_M1651 0x1651 -#define PCI_DEVICE_ID_AL_M1543 0x1543 -#define PCI_DEVICE_ID_AL_M3307 0x3307 -#define PCI_DEVICE_ID_AL_M4803 0x5215 -#define PCI_DEVICE_ID_AL_M5219 0x5219 -#define PCI_DEVICE_ID_AL_M5229 0x5229 -#define PCI_DEVICE_ID_AL_M5237 0x5237 -#define PCI_DEVICE_ID_AL_M5243 0x5243 -#define PCI_DEVICE_ID_AL_M5451 0x5451 -#define PCI_DEVICE_ID_AL_M7101 0x7101 - -#define PCI_VENDOR_ID_MITSUBISHI 0x10ba - -#define PCI_VENDOR_ID_SURECOM 0x10bd -#define PCI_DEVICE_ID_SURECOM_NE34 0x0e34 - -#define PCI_VENDOR_ID_NEOMAGIC 0x10c8 -#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2070 0x0001 -#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128V 0x0002 -#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZV 0x0003 -#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2160 0x0004 -#define PCI_DEVICE_ID_NEOMAGIC_MAGICMEDIA_256AV 0x0005 -#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZVPLUS 0x0083 - -#define PCI_VENDOR_ID_ASP 0x10cd -#define PCI_DEVICE_ID_ASP_ABP940 0x1200 -#define PCI_DEVICE_ID_ASP_ABP940U 0x1300 -#define PCI_DEVICE_ID_ASP_ABP940UW 0x2300 - -#define PCI_VENDOR_ID_MACRONIX 0x10d9 -#define PCI_DEVICE_ID_MACRONIX_MX98713 0x0512 -#define PCI_DEVICE_ID_MACRONIX_MX987x5 0x0531 - -#define PCI_VENDOR_ID_TCONRAD 0x10da -#define PCI_DEVICE_ID_TCONRAD_TOKENRING 0x0508 - -#define PCI_VENDOR_ID_CERN 0x10dc -#define PCI_DEVICE_ID_CERN_SPSB_PMC 0x0001 -#define PCI_DEVICE_ID_CERN_SPSB_PCI 0x0002 -#define PCI_DEVICE_ID_CERN_HIPPI_DST 0x0021 -#define PCI_DEVICE_ID_CERN_HIPPI_SRC 0x0022 - -#define PCI_DEVICE_ID_NVIDIA_CK8S_HT 0x00e1 -#define PCI_DEVICE_ID_NVIDIA_CK8S_LPC 0x00e0 -#define PCI_DEVICE_ID_NVIDIA_CK8S_SM 0x00e4 -#define PCI_DEVICE_ID_NVIDIA_CK8S_USB 0x00e7 -#define PCI_DEVICE_ID_NVIDIA_CK8S_USB2 0x00e8 -#define PCI_DEVICE_ID_NVIDIA_CK8S_NIC 0x00e6 -#define PCI_DEVICE_ID_NVIDIA_CK8S_ACI 0x00ea -#define PCI_DEVICE_ID_NVIDIA_CK8S_MCI 0x00e9 -#define PCI_DEVICE_ID_NVIDIA_CK8S_IDE 0x00e5 -#define PCI_DEVICE_ID_NVIDIA_CK8S_SATA0 0x00ee -#define PCI_DEVICE_ID_NVIDIA_CK8S_SATA1 0x00e3 -#define PCI_DEVICE_ID_NVIDIA_CK8S_PCI 0x00ed -#define PCI_DEVICE_ID_NVIDIA_CK8S_PCI_AGP 0x00e2 - -#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC 0x0360 -#define PCI_DEVICE_ID_NVIDIA_MCP55_SLAVE 0x0361 -#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_2 0x0362 -#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_3 0x0363 -#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_4 0x0364 -#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_5 0x0365 -#define PCI_DEVICE_ID_NVIDIA_MCP55_LPC_6 0x0366 -#define PCI_DEVICE_ID_NVIDIA_MCP55_PRO 0x0367 -#define PCI_DEVICE_ID_NVIDIA_MCP55_SM2 0x0368 -#define PCI_DEVICE_ID_NVIDIA_MCP55_IDE 0x036E -#define PCI_DEVICE_ID_NVIDIA_MCP55_SATA0 0x037E -#define PCI_DEVICE_ID_NVIDIA_MCP55_SATA1 0x037F -#define PCI_DEVICE_ID_NVIDIA_MCP55_NIC 0x0372 -#define PCI_DEVICE_ID_NVIDIA_MCP55_NIC_BRIDGE 0x0373 -#define PCI_DEVICE_ID_NVIDIA_MCP55_AZA 0x0371 -#define PCI_DEVICE_ID_NVIDIA_MCP55_USB 0x036C -#define PCI_DEVICE_ID_NVIDIA_MCP55_USB2 0x036D -#define PCI_DEVICE_ID_NVIDIA_MCP55_PCI 0x0370 -#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_B_C 0x0374 -#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_E 0x0375 -#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_A 0x0376 -#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_F 0x0377 -#define PCI_DEVICE_ID_NVIDIA_MCP55_PCIE_D 0x0378 -#define PCI_DEVICE_ID_NVIDIA_MCP55_HT 0x0369 -#define PCI_DEVICE_ID_NVIDIA_MCP55_TRIM 0x036A -#define PCI_DEVICE_ID_NVIDIA_MCP55_PMU 0x036B - -#define PCI_VENDOR_ID_NVIDIA 0x10de -#define PCI_DEVICE_ID_NVIDIA_TNT 0x0020 -#define PCI_DEVICE_ID_NVIDIA_TNT2 0x0028 -#define PCI_DEVICE_ID_NVIDIA_UTNT2 0x0029 -#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C -#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D -#define PCI_DEVICE_ID_NVIDIA_CK804_LPC 0x0050 -#define PCI_DEVICE_ID_NVIDIA_CK804_PRO 0x0051 -#define PCI_DEVICE_ID_NVIDIA_CK804_ISA 0x0051 -#define PCI_DEVICE_ID_NVIDIA_CK804_SMB 0x0052 -#define PCI_DEVICE_ID_NVIDIA_CK804_SM 0x0052 -#define PCI_DEVICE_ID_NVIDIA_CK804_ACPI 0x0052 -#define PCI_DEVICE_ID_NVIDIA_CK804_IDE 0x0053 -#define PCI_DEVICE_ID_NVIDIA_CK804_SATA0 0x0054 -#define PCI_DEVICE_ID_NVIDIA_CK804_SATA1 0x0055 -#define PCI_DEVICE_ID_NVIDIA_CK804_ENET 0x0056 -#define PCI_DEVICE_ID_NVIDIA_CK804_NIC 0x0056 -#define PCI_DEVICE_ID_NVIDIA_CK804_ENET2 0x0057 -#define PCI_DEVICE_ID_NVIDIA_CK804_NIC_BRIDGE 0x0057 -#define PCI_DEVICE_ID_NVIDIA_CK804_MODEM 0x0058 -#define PCI_DEVICE_ID_NVIDIA_CK804_MCI 0x0058 -#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059 -#define PCI_DEVICE_ID_NVIDIA_CK804_ACI 0x0059 -#define PCI_DEVICE_ID_NVIDIA_CK804_USB 0x005A -#define PCI_DEVICE_ID_NVIDIA_CK804_USB2 0x005B -#define PCI_DEVICE_ID_NVIDIA_CK804_PCI 0x005C -#define PCI_DEVICE_ID_NVIDIA_CK804_PCIE 0x005D -#define PCI_DEVICE_ID_NVIDIA_CK804_PCI_E 0x005D -#define PCI_DEVICE_ID_NVIDIA_CK804_MEM 0x005E -#define PCI_DEVICE_ID_NVIDIA_CK804_HT 0x005E -#define PCI_DEVICE_ID_NVIDIA_CK804_TRIM 0x005f -#define PCI_DEVICE_ID_NVIDIA_CK804_SLAVE 0x00d3 -#define PCI_DEVICE_ID_NVIDIA_ITNT2 0x00A0 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR 0x0100 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR 0x0101 -#define PCI_DEVICE_ID_NVIDIA_QUADRO 0x0103 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX 0x0110 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2 0x0111 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO 0x0112 -#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR 0x0113 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS 0x0150 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2 0x0151 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA 0x0152 -#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO 0x0153 -#define PCI_DEVICE_ID_NVIDIA_IGEFORCE2 0x01a0 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE3 0x0200 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1 0x0201 -#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2 0x0202 -#define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC 0x0203 - -#define PCI_VENDOR_ID_IMS 0x10e0 -#define PCI_DEVICE_ID_IMS_8849 0x8849 -#define PCI_DEVICE_ID_IMS_TT128 0x9128 -#define PCI_DEVICE_ID_IMS_TT3D 0x9135 - -#define PCI_VENDOR_ID_TEKRAM2 0x10e1 -#define PCI_DEVICE_ID_TEKRAM2_690c 0x690c - -#define PCI_VENDOR_ID_TUNDRA 0x10e3 -#define PCI_DEVICE_ID_TUNDRA_CA91C042 0x0000 - -#define PCI_VENDOR_ID_AMCC 0x10e8 -#define PCI_DEVICE_ID_AMCC_MYRINET 0x8043 -#define PCI_DEVICE_ID_AMCC_PARASTATION 0x8062 -#define PCI_DEVICE_ID_AMCC_S5933 0x807d -#define PCI_DEVICE_ID_AMCC_S5933_HEPC3 0x809c - -#define PCI_VENDOR_ID_INTERG 0x10ea -#define PCI_DEVICE_ID_INTERG_1680 0x1680 -#define PCI_DEVICE_ID_INTERG_1682 0x1682 -#define PCI_DEVICE_ID_INTERG_2000 0x2000 -#define PCI_DEVICE_ID_INTERG_2010 0x2010 -#define PCI_DEVICE_ID_INTERG_5000 0x5000 -#define PCI_DEVICE_ID_INTERG_5050 0x5050 - -#define PCI_VENDOR_ID_REALTEK 0x10ec -#define PCI_DEVICE_ID_REALTEK_5261 0x5261 -#define PCI_DEVICE_ID_REALTEK_8029 0x8029 -#define PCI_DEVICE_ID_REALTEK_8125 0x8125 -#define PCI_DEVICE_ID_REALTEK_8129 0x8129 -#define PCI_DEVICE_ID_REALTEK_8139 0x8139 -#define PCI_DEVICE_ID_REALTEK_8168 0x8168 - -#define PCI_VENDOR_ID_TYAN 0x10f1 -#define PCI_VENDOR_ID_XILINX 0x10ee -#define PCI_DEVICE_ID_TURBOPAM 0x4020 - -#define PCI_VENDOR_ID_TRUEVISION 0x10fa -#define PCI_DEVICE_ID_TRUEVISION_T1000 0x000c - -#define PCI_VENDOR_ID_INIT 0x1101 -#define PCI_DEVICE_ID_INIT_320P 0x9100 -#define PCI_DEVICE_ID_INIT_360P 0x9500 - -#define PCI_VENDOR_ID_CREATIVE 0x1102 // duplicate: ECTIVA -#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002 - -#define PCI_VENDOR_ID_ECTIVA 0x1102 // duplicate: CREATIVE -#define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938 - -#define PCI_VENDOR_ID_TTI 0x1103 -#define PCI_DEVICE_ID_TTI_HPT343 0x0003 -#define PCI_DEVICE_ID_TTI_HPT366 0x0004 -#define PCI_DEVICE_ID_TTI_HPT372 0x0005 -#define PCI_DEVICE_ID_TTI_HPT302 0x0006 -#define PCI_DEVICE_ID_TTI_HPT371 0x0007 -#define PCI_DEVICE_ID_TTI_HPT374 0x0008 - -#define PCI_VENDOR_ID_VIA 0x1106 -#define PCI_DEVICE_ID_VIA_8363_0 0x0305 -#define PCI_DEVICE_ID_VIA_8371_0 0x0391 -#define PCI_DEVICE_ID_VIA_8501_0 0x0501 - -#define PCI_DEVICE_ID_VIA_82C505 0x0505 -#define PCI_DEVICE_ID_VIA_82C561 0x0561 -#define PCI_DEVICE_ID_VIA_82C586_1 0x0571 -#define PCI_DEVICE_ID_VIA_82C576 0x0576 -#define PCI_DEVICE_ID_VIA_82C585 0x0585 -#define PCI_DEVICE_ID_VIA_82C586_0 0x0586 -#define PCI_DEVICE_ID_VIA_82C595 0x0595 -#define PCI_DEVICE_ID_VIA_82C596 0x0596 -#define PCI_DEVICE_ID_VIA_82C597_0 0x0597 -#define PCI_DEVICE_ID_VIA_82C598_0 0x0598 -#define PCI_DEVICE_ID_VIA_8601_0 0x0601 -#define PCI_DEVICE_ID_VIA_8605_0 0x0605 -#define PCI_DEVICE_ID_VIA_82C680 0x0680 -#define PCI_DEVICE_ID_VIA_82C686 0x0686 -#define PCI_DEVICE_ID_VIA_82C691 0x0691 -#define PCI_DEVICE_ID_VIA_82C693 0x0693 -#define PCI_DEVICE_ID_VIA_82C693_1 0x0698 -#define PCI_DEVICE_ID_VIA_82C926 0x0926 -#define PCI_DEVICE_ID_VIA_82C576_1 0x1571 -#define PCI_DEVICE_ID_VIA_82C416 0x1571 -#define PCI_DEVICE_ID_VIA_82C595_97 0x1595 -#define PCI_DEVICE_ID_VIA_82C586_2 0x3038 -#define PCI_DEVICE_ID_VIA_82C586_3 0x3040 -#define PCI_DEVICE_ID_VIA_6305 0x3044 -#define PCI_DEVICE_ID_VIA_82C596_3 0x3050 -#define PCI_DEVICE_ID_VIA_82C596B_3 0x3051 -#define PCI_DEVICE_ID_VIA_82C686_4 0x3057 -#define PCI_DEVICE_ID_VIA_82C686_5 0x3058 -#define PCI_DEVICE_ID_VIA_8233_5 0x3059 -#define PCI_DEVICE_ID_VIA_8233_7 0x3065 -#define PCI_DEVICE_ID_VIA_82C686_6 0x3068 -#define PCI_DEVICE_ID_VIA_8233_0 0x3074 -#define PCI_DEVICE_ID_VIA_8633_0 0x3091 -#define PCI_DEVICE_ID_VIA_8367_0 0x3099 -#define PCI_DEVICE_ID_VIA_8622 0x3102 -#define PCI_DEVICE_ID_VIA_8233C_0 0x3109 -#define PCI_DEVICE_ID_VIA_8361 0x3112 -#define PCI_DEVICE_ID_VIA_8233A 0x3147 -#define PCI_DEVICE_ID_VIA_CLE266_VGA 0x3122 -#define PCI_DEVICE_ID_VIA_8623 0x3123 -#define PCI_DEVICE_ID_VIA_86C100A 0x6100 -#define PCI_DEVICE_ID_VIA_8231 0x8231 -#define PCI_DEVICE_ID_VIA_8231_4 0x8235 -#define PCI_DEVICE_ID_VIA_8235 0x3177 -#define PCI_DEVICE_ID_VIA_8365_1 0x8305 -#define PCI_DEVICE_ID_VIA_8371_1 0x8391 -#define PCI_DEVICE_ID_VIA_8501_1 0x8501 -#define PCI_DEVICE_ID_VIA_82C597_1 0x8597 -#define PCI_DEVICE_ID_VIA_82C598_1 0x8598 -#define PCI_DEVICE_ID_VIA_8601_1 0x8601 -#define PCI_DEVICE_ID_VIA_8505_1 0x8605 -#define PCI_DEVICE_ID_VIA_8633_1 0xB091 -#define PCI_DEVICE_ID_VIA_8367_1 0xB099 -#define PCI_DEVICE_ID_VIA_K8T800_HT_AGP_CTR 0x0282 -#define PCI_DEVICE_ID_VIA_K8T800_ERR 0x1282 -#define PCI_DEVICE_ID_VIA_K8T800_HOST_CTR 0x2282 -#define PCI_DEVICE_ID_VIA_K8T800_DRAM 0x3282 -#define PCI_DEVICE_ID_VIA_K8T800_PWR 0x4282 -#define PCI_DEVICE_ID_VIA_K8T800_5 0x5282 -#define PCI_DEVICE_ID_VIA_K8T800_6 0x6282 -#define PCI_DEVICE_ID_VIA_K8T800_NB_SB_CTR 0x7282 -#define PCI_DEVICE_ID_VIA_K8M800_HT_AGP_CTR 0x0204 -#define PCI_DEVICE_ID_VIA_K8M800_ERR 0x1204 -#define PCI_DEVICE_ID_VIA_K8M800_HOST_CTR 0x2204 -#define PCI_DEVICE_ID_VIA_K8M800_DRAM 0x3204 -#define PCI_DEVICE_ID_VIA_K8M800_PWR 0x4204 -#define PCI_DEVICE_ID_VIA_K8M800_5 0x5204 -#define PCI_DEVICE_ID_VIA_K8M800_6 0x6204 -#define PCI_DEVICE_ID_VIA_K8M800_NB_SB_CTR 0x7204 -#define PCI_DEVICE_ID_VIA_K8M800_CHROME 0x3108 -#define PCI_DEVICE_ID_VIA_K8T800_AGP 0x3188 -#define PCI_DEVICE_ID_VIA_K8T800_BR 0xb188 -#define PCI_DEVICE_ID_VIA_K8T890CE_0 0x0238 -#define PCI_DEVICE_ID_VIA_K8T890CE_1 0x1238 -#define PCI_DEVICE_ID_VIA_K8T890CE_2 0x2238 -#define PCI_DEVICE_ID_VIA_K8T890CE_3 0x3238 -#define PCI_DEVICE_ID_VIA_K8T890CE_4 0x4238 -#define PCI_DEVICE_ID_VIA_K8T890CE_5 0x5238 -#define PCI_DEVICE_ID_VIA_K8T890CE_7 0x7238 -#define PCI_DEVICE_ID_VIA_K8T890CF_0 0x0351 -#define PCI_DEVICE_ID_VIA_K8T890CF_1 0x1351 -#define PCI_DEVICE_ID_VIA_K8T890CF_2 0x2351 -#define PCI_DEVICE_ID_VIA_K8T890CF_3 0x3351 -#define PCI_DEVICE_ID_VIA_K8T890CF_4 0x4351 -#define PCI_DEVICE_ID_VIA_K8T890CF_5 0x5351 -#define PCI_DEVICE_ID_VIA_K8T890CF_7 0x7351 -#define PCI_DEVICE_ID_VIA_K8M890CE_0 0x0336 -#define PCI_DEVICE_ID_VIA_K8M890CE_1 0x1336 -#define PCI_DEVICE_ID_VIA_K8M890CE_2 0x2336 -#define PCI_DEVICE_ID_VIA_K8M890CE_3 0x3336 -#define PCI_DEVICE_ID_VIA_K8M890CE_4 0x4336 -#define PCI_DEVICE_ID_VIA_K8M890CE_5 0x5336 -#define PCI_DEVICE_ID_VIA_K8M890CE_7 0x7336 -#define PCI_DEVICE_ID_VIA_K8M890_CHROME 0x3230 -#define PCI_DEVICE_ID_VIA_K8T890CE_PEG 0xa238 -#define PCI_DEVICE_ID_VIA_K8T890CE_PEX0 0xc238 -#define PCI_DEVICE_ID_VIA_K8T890CE_PEX1 0xd238 -#define PCI_DEVICE_ID_VIA_K8T890CE_PEX2 0xe238 -#define PCI_DEVICE_ID_VIA_K8T890CE_PEX3 0xf238 -#define PCI_DEVICE_ID_VIA_K8T890CE_BR 0xb188 -#define PCI_DEVICE_ID_VIA_VT6420_SATA 0x3149 -#define PCI_DEVICE_ID_VIA_VT8237R_LPC 0x3227 -#define PCI_DEVICE_ID_VIA_VT8237A_LPC 0x3337 -#define PCI_DEVICE_ID_VIA_VT8237S_LPC 0x3372 -#define PCI_DEVICE_ID_VIA_VT8237_SATA 0x5372 -#define PCI_DEVICE_ID_VIA_VT8237A_SATA 0x0591 -#define PCI_DEVICE_ID_VIA_VT8237_VLINK 0x287e -#define PCI_DEVICE_ID_VIA_VT8237R_UHCI 0x3038 -#define PCI_DEVICE_ID_VIA_VT8237R_EHCI 0x3104 -#define PCI_DEVICE_ID_VIA_VX855_LPC 0x8353 -#define PCI_DEVICE_ID_VIA_VX855_IDE 0x5324 -#define PCI_DEVICE_ID_VIA_VX855_VGA 0x5122 -#define PCI_DEVICE_ID_VIA_VX855_VLINK 0x7409 -#define PCI_DEVICE_ID_VIA_VX855_MEMCTRL 0x3409 +#define PCI_VID_WINBOND2 0x1050 +#define PCI_DID_WINBOND2_89C940 0x0940 +#define PCI_DID_WINBOND2_89C940F 0x5a5a +#define PCI_DID_WINBOND2_6692 0x6692 + +#define PCI_VID_ANIGMA 0x1051 +#define PCI_DID_ANIGMA_MC145575 0x0100 + +#define PCI_VID_EFAR 0x1055 +#define PCI_DID_EFAR_SLC90E66_1 0x9130 +#define PCI_DID_EFAR_SLC90E66_0 0x9460 +#define PCI_DID_EFAR_SLC90E66_2 0x9462 +#define PCI_DID_EFAR_SLC90E66_3 0x9463 + +#define PCI_VID_MOTOROLA 0x1057 +#define PCI_VID_MOTOROLA_OOPS 0x1507 +#define PCI_DID_MOTOROLA_MPC105 0x0001 +#define PCI_DID_MOTOROLA_MPC106 0x0002 +#define PCI_DID_MOTOROLA_RAVEN 0x4801 +#define PCI_DID_MOTOROLA_FALCON 0x4802 +#define PCI_DID_MOTOROLA_HAWK 0x4803 +#define PCI_DID_MOTOROLA_CPX8216 0x4806 + +#define PCI_VID_PROMISE 0x105a +#define PCI_DID_PROMISE_20265 0x0d30 +#define PCI_DID_PROMISE_20267 0x4d30 +#define PCI_DID_PROMISE_20246 0x4d33 +#define PCI_DID_PROMISE_20262 0x4d38 +#define PCI_DID_PROMISE_20263 0x0D38 +#define PCI_DID_PROMISE_20268 0x4d68 +#define PCI_DID_PROMISE_20270 0x6268 +#define PCI_DID_PROMISE_20269 0x4d69 +#define PCI_DID_PROMISE_20271 0x6269 +#define PCI_DID_PROMISE_20275 0x1275 +#define PCI_DID_PROMISE_20276 0x5275 +#define PCI_DID_PROMISE_20277 0x7275 +#define PCI_DID_PROMISE_5300 0x5300 +#define PCI_DID_PROMISE_20378 0x3373 + +#define PCI_VID_N9 0x105d +#define PCI_DID_N9_I128 0x2309 +#define PCI_DID_N9_I128_2 0x2339 +#define PCI_DID_N9_I128_T2R 0x493d + +#define PCI_VID_UMC 0x1060 +#define PCI_DID_UMC_UM8673F 0x0101 +#define PCI_DID_UMC_UM8891A 0x0891 +#define PCI_DID_UMC_UM8886BF 0x673a +#define PCI_DID_UMC_UM8886A 0x886a +#define PCI_DID_UMC_UM8881F 0x8881 +#define PCI_DID_UMC_UM8886F 0x8886 +#define PCI_DID_UMC_UM9017F 0x9017 +#define PCI_DID_UMC_UM8886N 0xe886 +#define PCI_DID_UMC_UM8891N 0xe891 + +#define PCI_VID_X 0x1061 +#define PCI_DID_X_AGX016 0x0001 + +#define PCI_VID_MYLEX 0x1069 +#define PCI_DID_MYLEX_DAC960P_V2 0x0001 +#define PCI_DID_MYLEX_DAC960P_V3 0x0002 +#define PCI_DID_MYLEX_DAC960P_V4 0x0010 +#define PCI_DID_MYLEX_DAC960P_V5 0x0020 +#define PCI_DID_MYLEX_DAC960_P 0x0001 +#define PCI_DID_MYLEX_DAC960_PD 0x0002 +#define PCI_DID_MYLEX_DAC960_PG 0x0010 +#define PCI_DID_MYLEX_DAC960_LA 0x0020 +#define PCI_DID_MYLEX_DAC960_LP 0x0050 +#define PCI_DID_MYLEX_DAC960_BA 0xBA56 + +#define PCI_VID_PICOP 0x1066 +#define PCI_DID_PICOP_PT86C52X 0x0001 +#define PCI_DID_PICOP_PT80C524 0x8002 + +#define PCI_VID_APPLE 0x106b +#define PCI_DID_APPLE_BANDIT 0x0001 +#define PCI_DID_APPLE_GC 0x0002 +#define PCI_DID_APPLE_HYDRA 0x000e +#define PCI_DID_APPLE_UNI_N_FW 0x0018 +#define PCI_DID_APPLE_KL_USB 0x0019 +#define PCI_DID_APPLE_UNI_N_AGP 0x0020 +#define PCI_DID_APPLE_UNI_N_GMAC 0x0021 +#define PCI_DID_APPLE_KEYLARGO 0x0022 +#define PCI_DID_APPLE_UNI_N_GMACP 0x0024 +#define PCI_DID_APPLE_KEYLARGO_P 0x0025 +#define PCI_DID_APPLE_KL_USB_P 0x0026 +#define PCI_DID_APPLE_UNI_N_AGP_P 0x0027 +#define PCI_DID_APPLE_UNI_N_AGP15 0x002d +#define PCI_DID_APPLE_UNI_N_FW2 0x0030 + +#define PCI_VID_YAMAHA 0x1073 +#define PCI_DID_YAMAHA_724 0x0004 +#define PCI_DID_YAMAHA_724F 0x000d +#define PCI_DID_YAMAHA_740 0x000a +#define PCI_DID_YAMAHA_740C 0x000c +#define PCI_DID_YAMAHA_744 0x0010 +#define PCI_DID_YAMAHA_754 0x0012 + +#define PCI_VID_NEXGEN 0x1074 +#define PCI_DID_NEXGEN_82C501 0x4e78 + +#define PCI_VID_QLOGIC 0x1077 +#define PCI_DID_QLOGIC_ISP1020 0x1020 +#define PCI_DID_QLOGIC_ISP1022 0x1022 +#define PCI_DID_QLOGIC_ISP2100 0x2100 +#define PCI_DID_QLOGIC_ISP2200 0x2200 + +#define PCI_VID_CYRIX 0x1078 +#define PCI_DID_CYRIX_5510 0x0000 +#define PCI_DID_CYRIX_PCI_MASTER 0x0001 +#define PCI_DID_CYRIX_5520 0x0002 +#define PCI_DID_CYRIX_5530_LEGACY 0x0100 +#define PCI_DID_CYRIX_5530_SMI 0x0101 +#define PCI_DID_CYRIX_5530_IDE 0x0102 +#define PCI_DID_CYRIX_5530_AUDIO 0x0103 +#define PCI_DID_CYRIX_5530_VIDEO 0x0104 + +#define PCI_VID_LEADTEK 0x107d +#define PCI_DID_LEADTEK_805 0x0000 + +#define PCI_VID_INTERPHASE 0x107e +#define PCI_DID_INTERPHASE_5526 0x0004 +#define PCI_DID_INTERPHASE_55x6 0x0005 +#define PCI_DID_INTERPHASE_5575 0x0008 + +#define PCI_VID_CONTAQ 0x1080 +#define PCI_DID_CONTAQ_82C599 0x0600 +#define PCI_DID_CONTAQ_82C693 0xc693 + +#define PCI_VID_FOREX 0x1083 + +#define PCI_VID_OLICOM 0x108d +#define PCI_DID_OLICOM_OC3136 0x0001 +#define PCI_DID_OLICOM_OC2315 0x0011 +#define PCI_DID_OLICOM_OC2325 0x0012 +#define PCI_DID_OLICOM_OC2183 0x0013 +#define PCI_DID_OLICOM_OC2326 0x0014 +#define PCI_DID_OLICOM_OC6151 0x0021 + +#define PCI_VID_SUN 0x108e +#define PCI_DID_SUN_EBUS 0x1000 +#define PCI_DID_SUN_HAPPYMEAL 0x1001 +#define PCI_DID_SUN_RIO_EBUS 0x1100 +#define PCI_DID_SUN_RIO_GEM 0x1101 +#define PCI_DID_SUN_RIO_1394 0x1102 +#define PCI_DID_SUN_RIO_USB 0x1103 +#define PCI_DID_SUN_GEM 0x2bad +#define PCI_DID_SUN_SIMBA 0x5000 +#define PCI_DID_SUN_PBM 0x8000 +#define PCI_DID_SUN_SCHIZO 0x8001 +#define PCI_DID_SUN_SABRE 0xa000 +#define PCI_DID_SUN_HUMMINGBIRD 0xa001 + +#define PCI_VID_CMD 0x1095 +#define PCI_DID_CMD_640 0x0640 +#define PCI_DID_CMD_643 0x0643 +#define PCI_DID_CMD_646 0x0646 +#define PCI_DID_CMD_647 0x0647 +#define PCI_DID_CMD_648 0x0648 +#define PCI_DID_CMD_649 0x0649 +#define PCI_DID_CMD_670 0x0670 +#define PCI_DID_CMD_680 0x0680 + +#define PCI_VID_VISION 0x1098 +#define PCI_DID_VISION_QD8500 0x0001 +#define PCI_DID_VISION_QD8580 0x0002 + +#define PCI_VID_BROOKTREE 0x109e +#define PCI_DID_BROOKTREE_848 0x0350 +#define PCI_DID_BROOKTREE_849A 0x0351 +#define PCI_DID_BROOKTREE_878_1 0x036e +#define PCI_DID_BROOKTREE_878 0x0878 +#define PCI_DID_BROOKTREE_8474 0x8474 + +#define PCI_VID_SIERRA 0x10a8 +#define PCI_DID_SIERRA_STB 0x0000 + +#define PCI_VID_SGI 0x10a9 +#define PCI_DID_SGI_IOC3 0x0003 + +#define PCI_VID_ACC 0x10aa +#define PCI_DID_ACC_2056 0x0000 + +#define PCI_VID_WINBOND 0x10ad +#define PCI_DID_WINBOND_83769 0x0001 +#define PCI_DID_WINBOND_82C105 0x0105 +#define PCI_DID_WINBOND_83C553 0x0565 + +#define PCI_VID_DATABOOK 0x10b3 +#define PCI_DID_DATABOOK_87144 0xb106 + +#define PCI_VID_PLX 0x10b5 +#define PCI_VID_PLX_ROMULUS 0x106a +#define PCI_DID_PLX_R685 0x1030 +#define PCI_DID_PLX_ROMULUS 0x106a +#define PCI_DID_PLX_SPCOM800 0x1076 +#define PCI_DID_PLX_1077 0x1077 +#define PCI_DID_PLX_SPCOM200 0x1103 +#define PCI_DID_PLX_DJINN_ITOO 0x1151 +#define PCI_DID_PLX_R753 0x1152 +#define PCI_DID_PLX_9050 0x9050 +#define PCI_DID_PLX_9060 0x9060 +#define PCI_DID_PLX_9060ES 0x906E +#define PCI_DID_PLX_9060SD 0x906D +#define PCI_DID_PLX_9080 0x9080 +#define PCI_DID_PLX_GTEK_SERIAL2 0xa001 + +#define PCI_VID_MADGE 0x10b6 +#define PCI_DID_MADGE_MK2 0x0002 +#define PCI_DID_MADGE_C155S 0x1001 + +#define PCI_VID_3COM 0x10b7 +#define PCI_DID_3COM_3C985 0x0001 +#define PCI_DID_3COM_3C339 0x3390 +#define PCI_DID_3COM_3C590 0x5900 +#define PCI_DID_3COM_3C595TX 0x5950 +#define PCI_DID_3COM_3C595T4 0x5951 +#define PCI_DID_3COM_3C595MII 0x5952 +#define PCI_DID_3COM_3C900TPO 0x9000 +#define PCI_DID_3COM_3C900COMBO 0x9001 +#define PCI_DID_3COM_3C905TX 0x9050 +#define PCI_DID_3COM_3C905T4 0x9051 +#define PCI_DID_3COM_3C905B_TX 0x9055 + +#define PCI_VID_SMC 0x10b8 +#define PCI_DID_SMC_EPIC100 0x0005 + +#define PCI_VID_AL 0x10b9 +#define PCI_DID_AL_M1445 0x1445 +#define PCI_DID_AL_M1449 0x1449 +#define PCI_DID_AL_M1451 0x1451 +#define PCI_DID_AL_M1461 0x1461 +#define PCI_DID_AL_M1489 0x1489 +#define PCI_DID_AL_M1511 0x1511 +#define PCI_DID_AL_M1513 0x1513 +#define PCI_DID_AL_M1521 0x1521 +#define PCI_DID_AL_M1523 0x1523 +#define PCI_DID_AL_M1531 0x1531 +#define PCI_DID_AL_M1533 0x1533 +#define PCI_DID_AL_M1541 0x1541 +#define PCI_DID_AL_M1621 0x1621 +#define PCI_DID_AL_M1631 0x1631 +#define PCI_DID_AL_M1641 0x1641 +#define PCI_DID_AL_M1644 0x1644 +#define PCI_DID_AL_M1647 0x1647 +#define PCI_DID_AL_M1651 0x1651 +#define PCI_DID_AL_M1543 0x1543 +#define PCI_DID_AL_M3307 0x3307 +#define PCI_DID_AL_M4803 0x5215 +#define PCI_DID_AL_M5219 0x5219 +#define PCI_DID_AL_M5229 0x5229 +#define PCI_DID_AL_M5237 0x5237 +#define PCI_DID_AL_M5243 0x5243 +#define PCI_DID_AL_M5451 0x5451 +#define PCI_DID_AL_M7101 0x7101 + +#define PCI_VID_MITSUBISHI 0x10ba + +#define PCI_VID_SURECOM 0x10bd +#define PCI_DID_SURECOM_NE34 0x0e34 + +#define PCI_VID_NEOMAGIC 0x10c8 +#define PCI_DID_NEOMAGIC_MAGICGRAPH_NM2070 0x0001 +#define PCI_DID_NEOMAGIC_MAGICGRAPH_128V 0x0002 +#define PCI_DID_NEOMAGIC_MAGICGRAPH_128ZV 0x0003 +#define PCI_DID_NEOMAGIC_MAGICGRAPH_NM2160 0x0004 +#define PCI_DID_NEOMAGIC_MAGICMEDIA_256AV 0x0005 +#define PCI_DID_NEOMAGIC_MAGICGRAPH_128ZVPLUS 0x0083 + +#define PCI_VID_ASP 0x10cd +#define PCI_DID_ASP_ABP940 0x1200 +#define PCI_DID_ASP_ABP940U 0x1300 +#define PCI_DID_ASP_ABP940UW 0x2300 + +#define PCI_VID_MACRONIX 0x10d9 +#define PCI_DID_MACRONIX_MX98713 0x0512 +#define PCI_DID_MACRONIX_MX987x5 0x0531 + +#define PCI_VID_TCONRAD 0x10da +#define PCI_DID_TCONRAD_TOKENRING 0x0508 + +#define PCI_VID_CERN 0x10dc +#define PCI_DID_CERN_SPSB_PMC 0x0001 +#define PCI_DID_CERN_SPSB_PCI 0x0002 +#define PCI_DID_CERN_HIPPI_DST 0x0021 +#define PCI_DID_CERN_HIPPI_SRC 0x0022 + +#define PCI_DID_NVIDIA_CK8S_HT 0x00e1 +#define PCI_DID_NVIDIA_CK8S_LPC 0x00e0 +#define PCI_DID_NVIDIA_CK8S_SM 0x00e4 +#define PCI_DID_NVIDIA_CK8S_USB 0x00e7 +#define PCI_DID_NVIDIA_CK8S_USB2 0x00e8 +#define PCI_DID_NVIDIA_CK8S_NIC 0x00e6 +#define PCI_DID_NVIDIA_CK8S_ACI 0x00ea +#define PCI_DID_NVIDIA_CK8S_MCI 0x00e9 +#define PCI_DID_NVIDIA_CK8S_IDE 0x00e5 +#define PCI_DID_NVIDIA_CK8S_SATA0 0x00ee +#define PCI_DID_NVIDIA_CK8S_SATA1 0x00e3 +#define PCI_DID_NVIDIA_CK8S_PCI 0x00ed +#define PCI_DID_NVIDIA_CK8S_PCI_AGP 0x00e2 + +#define PCI_DID_NVIDIA_MCP55_LPC 0x0360 +#define PCI_DID_NVIDIA_MCP55_SLAVE 0x0361 +#define PCI_DID_NVIDIA_MCP55_LPC_2 0x0362 +#define PCI_DID_NVIDIA_MCP55_LPC_3 0x0363 +#define PCI_DID_NVIDIA_MCP55_LPC_4 0x0364 +#define PCI_DID_NVIDIA_MCP55_LPC_5 0x0365 +#define PCI_DID_NVIDIA_MCP55_LPC_6 0x0366 +#define PCI_DID_NVIDIA_MCP55_PRO 0x0367 +#define PCI_DID_NVIDIA_MCP55_SM2 0x0368 +#define PCI_DID_NVIDIA_MCP55_IDE 0x036E +#define PCI_DID_NVIDIA_MCP55_SATA0 0x037E +#define PCI_DID_NVIDIA_MCP55_SATA1 0x037F +#define PCI_DID_NVIDIA_MCP55_NIC 0x0372 +#define PCI_DID_NVIDIA_MCP55_NIC_BRIDGE 0x0373 +#define PCI_DID_NVIDIA_MCP55_AZA 0x0371 +#define PCI_DID_NVIDIA_MCP55_USB 0x036C +#define PCI_DID_NVIDIA_MCP55_USB2 0x036D +#define PCI_DID_NVIDIA_MCP55_PCI 0x0370 +#define PCI_DID_NVIDIA_MCP55_PCIE_B_C 0x0374 +#define PCI_DID_NVIDIA_MCP55_PCIE_E 0x0375 +#define PCI_DID_NVIDIA_MCP55_PCIE_A 0x0376 +#define PCI_DID_NVIDIA_MCP55_PCIE_F 0x0377 +#define PCI_DID_NVIDIA_MCP55_PCIE_D 0x0378 +#define PCI_DID_NVIDIA_MCP55_HT 0x0369 +#define PCI_DID_NVIDIA_MCP55_TRIM 0x036A +#define PCI_DID_NVIDIA_MCP55_PMU 0x036B + +#define PCI_VID_NVIDIA 0x10de +#define PCI_DID_NVIDIA_TNT 0x0020 +#define PCI_DID_NVIDIA_TNT2 0x0028 +#define PCI_DID_NVIDIA_UTNT2 0x0029 +#define PCI_DID_NVIDIA_VTNT2 0x002C +#define PCI_DID_NVIDIA_UVTNT2 0x002D +#define PCI_DID_NVIDIA_CK804_LPC 0x0050 +#define PCI_DID_NVIDIA_CK804_PRO 0x0051 +#define PCI_DID_NVIDIA_CK804_ISA 0x0051 +#define PCI_DID_NVIDIA_CK804_SMB 0x0052 +#define PCI_DID_NVIDIA_CK804_SM 0x0052 +#define PCI_DID_NVIDIA_CK804_ACPI 0x0052 +#define PCI_DID_NVIDIA_CK804_IDE 0x0053 +#define PCI_DID_NVIDIA_CK804_SATA0 0x0054 +#define PCI_DID_NVIDIA_CK804_SATA1 0x0055 +#define PCI_DID_NVIDIA_CK804_ENET 0x0056 +#define PCI_DID_NVIDIA_CK804_NIC 0x0056 +#define PCI_DID_NVIDIA_CK804_ENET2 0x0057 +#define PCI_DID_NVIDIA_CK804_NIC_BRIDGE 0x0057 +#define PCI_DID_NVIDIA_CK804_MODEM 0x0058 +#define PCI_DID_NVIDIA_CK804_MCI 0x0058 +#define PCI_DID_NVIDIA_CK804_AUDIO 0x0059 +#define PCI_DID_NVIDIA_CK804_ACI 0x0059 +#define PCI_DID_NVIDIA_CK804_USB 0x005A +#define PCI_DID_NVIDIA_CK804_USB2 0x005B +#define PCI_DID_NVIDIA_CK804_PCI 0x005C +#define PCI_DID_NVIDIA_CK804_PCIE 0x005D +#define PCI_DID_NVIDIA_CK804_PCI_E 0x005D +#define PCI_DID_NVIDIA_CK804_MEM 0x005E +#define PCI_DID_NVIDIA_CK804_HT 0x005E +#define PCI_DID_NVIDIA_CK804_TRIM 0x005f +#define PCI_DID_NVIDIA_CK804_SLAVE 0x00d3 +#define PCI_DID_NVIDIA_ITNT2 0x00A0 +#define PCI_DID_NVIDIA_GEFORCE_SDR 0x0100 +#define PCI_DID_NVIDIA_GEFORCE_DDR 0x0101 +#define PCI_DID_NVIDIA_QUADRO 0x0103 +#define PCI_DID_NVIDIA_GEFORCE2_MX 0x0110 +#define PCI_DID_NVIDIA_GEFORCE2_MX2 0x0111 +#define PCI_DID_NVIDIA_GEFORCE2_GO 0x0112 +#define PCI_DID_NVIDIA_QUADRO2_MXR 0x0113 +#define PCI_DID_NVIDIA_GEFORCE2_GTS 0x0150 +#define PCI_DID_NVIDIA_GEFORCE2_GTS2 0x0151 +#define PCI_DID_NVIDIA_GEFORCE2_ULTRA 0x0152 +#define PCI_DID_NVIDIA_QUADRO2_PRO 0x0153 +#define PCI_DID_NVIDIA_IGEFORCE2 0x01a0 +#define PCI_DID_NVIDIA_GEFORCE3 0x0200 +#define PCI_DID_NVIDIA_GEFORCE3_1 0x0201 +#define PCI_DID_NVIDIA_GEFORCE3_2 0x0202 +#define PCI_DID_NVIDIA_QUADRO_DDC 0x0203 + +#define PCI_VID_IMS 0x10e0 +#define PCI_DID_IMS_8849 0x8849 +#define PCI_DID_IMS_TT128 0x9128 +#define PCI_DID_IMS_TT3D 0x9135 + +#define PCI_VID_TEKRAM2 0x10e1 +#define PCI_DID_TEKRAM2_690c 0x690c + +#define PCI_VID_TUNDRA 0x10e3 +#define PCI_DID_TUNDRA_CA91C042 0x0000 + +#define PCI_VID_AMCC 0x10e8 +#define PCI_DID_AMCC_MYRINET 0x8043 +#define PCI_DID_AMCC_PARASTATION 0x8062 +#define PCI_DID_AMCC_S5933 0x807d +#define PCI_DID_AMCC_S5933_HEPC3 0x809c + +#define PCI_VID_INTERG 0x10ea +#define PCI_DID_INTERG_1680 0x1680 +#define PCI_DID_INTERG_1682 0x1682 +#define PCI_DID_INTERG_2000 0x2000 +#define PCI_DID_INTERG_2010 0x2010 +#define PCI_DID_INTERG_5000 0x5000 +#define PCI_DID_INTERG_5050 0x5050 + +#define PCI_VID_REALTEK 0x10ec +#define PCI_DID_REALTEK_5261 0x5261 +#define PCI_DID_REALTEK_8029 0x8029 +#define PCI_DID_REALTEK_8125 0x8125 +#define PCI_DID_REALTEK_8129 0x8129 +#define PCI_DID_REALTEK_8139 0x8139 +#define PCI_DID_REALTEK_8168 0x8168 + +#define PCI_VID_TYAN 0x10f1 +#define PCI_VID_XILINX 0x10ee +#define PCI_DID_TURBOPAM 0x4020 + +#define PCI_VID_TRUEVISION 0x10fa +#define PCI_DID_TRUEVISION_T1000 0x000c + +#define PCI_VID_INIT 0x1101 +#define PCI_DID_INIT_320P 0x9100 +#define PCI_DID_INIT_360P 0x9500 + +#define PCI_VID_CREATIVE 0x1102 // duplicate: ECTIVA +#define PCI_DID_CREATIVE_EMU10K1 0x0002 + +#define PCI_VID_ECTIVA 0x1102 // duplicate: CREATIVE +#define PCI_DID_ECTIVA_EV1938 0x8938 + +#define PCI_VID_TTI 0x1103 +#define PCI_DID_TTI_HPT343 0x0003 +#define PCI_DID_TTI_HPT366 0x0004 +#define PCI_DID_TTI_HPT372 0x0005 +#define PCI_DID_TTI_HPT302 0x0006 +#define PCI_DID_TTI_HPT371 0x0007 +#define PCI_DID_TTI_HPT374 0x0008 + +#define PCI_VID_VIA 0x1106 +#define PCI_DID_VIA_8363_0 0x0305 +#define PCI_DID_VIA_8371_0 0x0391 +#define PCI_DID_VIA_8501_0 0x0501 + +#define PCI_DID_VIA_82C505 0x0505 +#define PCI_DID_VIA_82C561 0x0561 +#define PCI_DID_VIA_82C586_1 0x0571 +#define PCI_DID_VIA_82C576 0x0576 +#define PCI_DID_VIA_82C585 0x0585 +#define PCI_DID_VIA_82C586_0 0x0586 +#define PCI_DID_VIA_82C595 0x0595 +#define PCI_DID_VIA_82C596 0x0596 +#define PCI_DID_VIA_82C597_0 0x0597 +#define PCI_DID_VIA_82C598_0 0x0598 +#define PCI_DID_VIA_8601_0 0x0601 +#define PCI_DID_VIA_8605_0 0x0605 +#define PCI_DID_VIA_82C680 0x0680 +#define PCI_DID_VIA_82C686 0x0686 +#define PCI_DID_VIA_82C691 0x0691 +#define PCI_DID_VIA_82C693 0x0693 +#define PCI_DID_VIA_82C693_1 0x0698 +#define PCI_DID_VIA_82C926 0x0926 +#define PCI_DID_VIA_82C576_1 0x1571 +#define PCI_DID_VIA_82C416 0x1571 +#define PCI_DID_VIA_82C595_97 0x1595 +#define PCI_DID_VIA_82C586_2 0x3038 +#define PCI_DID_VIA_82C586_3 0x3040 +#define PCI_DID_VIA_6305 0x3044 +#define PCI_DID_VIA_82C596_3 0x3050 +#define PCI_DID_VIA_82C596B_3 0x3051 +#define PCI_DID_VIA_82C686_4 0x3057 +#define PCI_DID_VIA_82C686_5 0x3058 +#define PCI_DID_VIA_8233_5 0x3059 +#define PCI_DID_VIA_8233_7 0x3065 +#define PCI_DID_VIA_82C686_6 0x3068 +#define PCI_DID_VIA_8233_0 0x3074 +#define PCI_DID_VIA_8633_0 0x3091 +#define PCI_DID_VIA_8367_0 0x3099 +#define PCI_DID_VIA_8622 0x3102 +#define PCI_DID_VIA_8233C_0 0x3109 +#define PCI_DID_VIA_8361 0x3112 +#define PCI_DID_VIA_8233A 0x3147 +#define PCI_DID_VIA_CLE266_VGA 0x3122 +#define PCI_DID_VIA_8623 0x3123 +#define PCI_DID_VIA_86C100A 0x6100 +#define PCI_DID_VIA_8231 0x8231 +#define PCI_DID_VIA_8231_4 0x8235 +#define PCI_DID_VIA_8235 0x3177 +#define PCI_DID_VIA_8365_1 0x8305 +#define PCI_DID_VIA_8371_1 0x8391 +#define PCI_DID_VIA_8501_1 0x8501 +#define PCI_DID_VIA_82C597_1 0x8597 +#define PCI_DID_VIA_82C598_1 0x8598 +#define PCI_DID_VIA_8601_1 0x8601 +#define PCI_DID_VIA_8505_1 0x8605 +#define PCI_DID_VIA_8633_1 0xB091 +#define PCI_DID_VIA_8367_1 0xB099 +#define PCI_DID_VIA_K8T800_HT_AGP_CTR 0x0282 +#define PCI_DID_VIA_K8T800_ERR 0x1282 +#define PCI_DID_VIA_K8T800_HOST_CTR 0x2282 +#define PCI_DID_VIA_K8T800_DRAM 0x3282 +#define PCI_DID_VIA_K8T800_PWR 0x4282 +#define PCI_DID_VIA_K8T800_5 0x5282 +#define PCI_DID_VIA_K8T800_6 0x6282 +#define PCI_DID_VIA_K8T800_NB_SB_CTR 0x7282 +#define PCI_DID_VIA_K8M800_HT_AGP_CTR 0x0204 +#define PCI_DID_VIA_K8M800_ERR 0x1204 +#define PCI_DID_VIA_K8M800_HOST_CTR 0x2204 +#define PCI_DID_VIA_K8M800_DRAM 0x3204 +#define PCI_DID_VIA_K8M800_PWR 0x4204 +#define PCI_DID_VIA_K8M800_5 0x5204 +#define PCI_DID_VIA_K8M800_6 0x6204 +#define PCI_DID_VIA_K8M800_NB_SB_CTR 0x7204 +#define PCI_DID_VIA_K8M800_CHROME 0x3108 +#define PCI_DID_VIA_K8T800_AGP 0x3188 +#define PCI_DID_VIA_K8T800_BR 0xb188 +#define PCI_DID_VIA_K8T890CE_0 0x0238 +#define PCI_DID_VIA_K8T890CE_1 0x1238 +#define PCI_DID_VIA_K8T890CE_2 0x2238 +#define PCI_DID_VIA_K8T890CE_3 0x3238 +#define PCI_DID_VIA_K8T890CE_4 0x4238 +#define PCI_DID_VIA_K8T890CE_5 0x5238 +#define PCI_DID_VIA_K8T890CE_7 0x7238 +#define PCI_DID_VIA_K8T890CF_0 0x0351 +#define PCI_DID_VIA_K8T890CF_1 0x1351 +#define PCI_DID_VIA_K8T890CF_2 0x2351 +#define PCI_DID_VIA_K8T890CF_3 0x3351 +#define PCI_DID_VIA_K8T890CF_4 0x4351 +#define PCI_DID_VIA_K8T890CF_5 0x5351 +#define PCI_DID_VIA_K8T890CF_7 0x7351 +#define PCI_DID_VIA_K8M890CE_0 0x0336 +#define PCI_DID_VIA_K8M890CE_1 0x1336 +#define PCI_DID_VIA_K8M890CE_2 0x2336 +#define PCI_DID_VIA_K8M890CE_3 0x3336 +#define PCI_DID_VIA_K8M890CE_4 0x4336 +#define PCI_DID_VIA_K8M890CE_5 0x5336 +#define PCI_DID_VIA_K8M890CE_7 0x7336 +#define PCI_DID_VIA_K8M890_CHROME 0x3230 +#define PCI_DID_VIA_K8T890CE_PEG 0xa238 +#define PCI_DID_VIA_K8T890CE_PEX0 0xc238 +#define PCI_DID_VIA_K8T890CE_PEX1 0xd238 +#define PCI_DID_VIA_K8T890CE_PEX2 0xe238 +#define PCI_DID_VIA_K8T890CE_PEX3 0xf238 +#define PCI_DID_VIA_K8T890CE_BR 0xb188 +#define PCI_DID_VIA_VT6420_SATA 0x3149 +#define PCI_DID_VIA_VT8237R_LPC 0x3227 +#define PCI_DID_VIA_VT8237A_LPC 0x3337 +#define PCI_DID_VIA_VT8237S_LPC 0x3372 +#define PCI_DID_VIA_VT8237_SATA 0x5372 +#define PCI_DID_VIA_VT8237A_SATA 0x0591 +#define PCI_DID_VIA_VT8237_VLINK 0x287e +#define PCI_DID_VIA_VT8237R_UHCI 0x3038 +#define PCI_DID_VIA_VT8237R_EHCI 0x3104 +#define PCI_DID_VIA_VX855_LPC 0x8353 +#define PCI_DID_VIA_VX855_IDE 0x5324 +#define PCI_DID_VIA_VX855_VGA 0x5122 +#define PCI_DID_VIA_VX855_VLINK 0x7409 +#define PCI_DID_VIA_VX855_MEMCTRL 0x3409 /* VIA VX900 PCI IDs */ -#define PCI_DEVICE_ID_VIA_VX900_HOST_BR 0x0410 -#define PCI_DEVICE_ID_VIA_VX900_ERR 0x1410 -#define PCI_DEVICE_ID_VIA_VX900_CPU_CTR 0x2410 -#define PCI_DEVICE_ID_VIA_VX900_MEMCTRL 0x3410 -#define PCI_DEVICE_ID_VIA_VX900_PM 0x4410 -#define PCI_DEVICE_ID_VIA_VX900_TRAF 0x5410 -#define PCI_DEVICE_ID_VIA_VX900_SCRATCH 0x6410 -#define PCI_DEVICE_ID_VIA_VX900_NBRIDGE 0x7410 -#define PCI_DEVICE_ID_VIA_VX900_LPC 0x8410 -#define PCI_DEVICE_ID_VIA_VX900_PEX1 0xa410 -#define PCI_DEVICE_ID_VIA_VX900_PEX2 0xb410 -#define PCI_DEVICE_ID_VIA_VX900_PEX3 0xc410 -#define PCI_DEVICE_ID_VIA_VX900_PEX4 0xd410 -#define PCI_DEVICE_ID_VIA_VX900_PEX_CTR 0xe410 -#define PCI_DEVICE_ID_VIA_VX900_SNMIC 0xa353 -#define PCI_DEVICE_ID_VIA_VX900_PCI_BR 0xb353 -#define PCI_DEVICE_ID_VIA_VX900_VGA 0x7122 -#define PCI_DEVICE_ID_VIA_VX900_VID_DEC 0x9170 -#define PCI_DEVICE_ID_VIA_VX900_HDAC 0x3288 -#define PCI_DEVICE_ID_VIA_VX900_ETH 0x3119 -#define PCI_DEVICE_ID_VIA_VX900_SATA 0x9001 +#define PCI_DID_VIA_VX900_HOST_BR 0x0410 +#define PCI_DID_VIA_VX900_ERR 0x1410 +#define PCI_DID_VIA_VX900_CPU_CTR 0x2410 +#define PCI_DID_VIA_VX900_MEMCTRL 0x3410 +#define PCI_DID_VIA_VX900_PM 0x4410 +#define PCI_DID_VIA_VX900_TRAF 0x5410 +#define PCI_DID_VIA_VX900_SCRATCH 0x6410 +#define PCI_DID_VIA_VX900_NBRIDGE 0x7410 +#define PCI_DID_VIA_VX900_LPC 0x8410 +#define PCI_DID_VIA_VX900_PEX1 0xa410 +#define PCI_DID_VIA_VX900_PEX2 0xb410 +#define PCI_DID_VIA_VX900_PEX3 0xc410 +#define PCI_DID_VIA_VX900_PEX4 0xd410 +#define PCI_DID_VIA_VX900_PEX_CTR 0xe410 +#define PCI_DID_VIA_VX900_SNMIC 0xa353 +#define PCI_DID_VIA_VX900_PCI_BR 0xb353 +#define PCI_DID_VIA_VX900_VGA 0x7122 +#define PCI_DID_VIA_VX900_VID_DEC 0x9170 +#define PCI_DID_VIA_VX900_HDAC 0x3288 +#define PCI_DID_VIA_VX900_ETH 0x3119 +#define PCI_DID_VIA_VX900_SATA 0x9001 /* VIA CN700 */ -#define PCI_DEVICE_ID_VIA_CN700_AGP 0x0314 -#define PCI_DEVICE_ID_VIA_CN700_ERR 0x1314 -#define PCI_DEVICE_ID_VIA_CN700_HOST 0x2314 -#define PCI_DEVICE_ID_VIA_CN700_MEMCTRL 0x3208 -#define PCI_DEVICE_ID_VIA_CN700_PM 0x4314 -#define PCI_DEVICE_ID_VIA_CN700_VLINK 0x7314 -#define PCI_DEVICE_ID_VIA_CN700_BRIDGE 0xB198 -#define PCI_DEVICE_ID_VIA_CN700_VGA 0x3344 -#define PCI_DEVICE_ID_VIA_CN400_AGP 0x0259 -#define PCI_DEVICE_ID_VIA_CN400_ERR 0x1259 -#define PCI_DEVICE_ID_VIA_CN400_HOST 0x2259 -#define PCI_DEVICE_ID_VIA_CN400_MEMCTRL 0x3259 -#define PCI_DEVICE_ID_VIA_CN400_PM 0x4259 -#define PCI_DEVICE_ID_VIA_CN400_VLINK 0x7259 -#define PCI_DEVICE_ID_VIA_CN400_BRIDGE 0xB198 -#define PCI_DEVICE_ID_VIA_CN400_VGA 0x3118 - -#define PCI_VENDOR_ID_SIEMENS 0x110A -#define PCI_DEVICE_ID_SIEMENS_DSCC4 0x2102 - -#define PCI_VENDOR_ID_SMC2 0x1113 -#define PCI_DEVICE_ID_SMC2_1211TX 0x1211 - -#define PCI_VENDOR_ID_VORTEX 0x1119 -#define PCI_DEVICE_ID_VORTEX_GDT60x0 0x0000 -#define PCI_DEVICE_ID_VORTEX_GDT6000B 0x0001 -#define PCI_DEVICE_ID_VORTEX_GDT6x10 0x0002 -#define PCI_DEVICE_ID_VORTEX_GDT6x20 0x0003 -#define PCI_DEVICE_ID_VORTEX_GDT6530 0x0004 -#define PCI_DEVICE_ID_VORTEX_GDT6550 0x0005 -#define PCI_DEVICE_ID_VORTEX_GDT6x17 0x0006 -#define PCI_DEVICE_ID_VORTEX_GDT6x27 0x0007 -#define PCI_DEVICE_ID_VORTEX_GDT6537 0x0008 -#define PCI_DEVICE_ID_VORTEX_GDT6557 0x0009 -#define PCI_DEVICE_ID_VORTEX_GDT6x15 0x000a -#define PCI_DEVICE_ID_VORTEX_GDT6x25 0x000b -#define PCI_DEVICE_ID_VORTEX_GDT6535 0x000c -#define PCI_DEVICE_ID_VORTEX_GDT6555 0x000d -#define PCI_DEVICE_ID_VORTEX_GDT6x17RP 0x0100 -#define PCI_DEVICE_ID_VORTEX_GDT6x27RP 0x0101 -#define PCI_DEVICE_ID_VORTEX_GDT6537RP 0x0102 -#define PCI_DEVICE_ID_VORTEX_GDT6557RP 0x0103 -#define PCI_DEVICE_ID_VORTEX_GDT6x11RP 0x0104 -#define PCI_DEVICE_ID_VORTEX_GDT6x21RP 0x0105 -#define PCI_DEVICE_ID_VORTEX_GDT6x17RP1 0x0110 -#define PCI_DEVICE_ID_VORTEX_GDT6x27RP1 0x0111 -#define PCI_DEVICE_ID_VORTEX_GDT6537RP1 0x0112 -#define PCI_DEVICE_ID_VORTEX_GDT6557RP1 0x0113 -#define PCI_DEVICE_ID_VORTEX_GDT6x11RP1 0x0114 -#define PCI_DEVICE_ID_VORTEX_GDT6x21RP1 0x0115 -#define PCI_DEVICE_ID_VORTEX_GDT6x17RP2 0x0120 -#define PCI_DEVICE_ID_VORTEX_GDT6x27RP2 0x0121 -#define PCI_DEVICE_ID_VORTEX_GDT6537RP2 0x0122 -#define PCI_DEVICE_ID_VORTEX_GDT6557RP2 0x0123 -#define PCI_DEVICE_ID_VORTEX_GDT6x11RP2 0x0124 -#define PCI_DEVICE_ID_VORTEX_GDT6x21RP2 0x0125 - -#define PCI_VENDOR_ID_EF 0x111a -#define PCI_DEVICE_ID_EF_ATM_FPGA 0x0000 -#define PCI_DEVICE_ID_EF_ATM_ASIC 0x0002 - -#define PCI_VENDOR_ID_IDT 0x111d -#define PCI_DEVICE_ID_IDT_IDT77201 0x0001 - -#define PCI_VENDOR_ID_FORE 0x1127 -#define PCI_DEVICE_ID_FORE_PCA200PC 0x0210 -#define PCI_DEVICE_ID_FORE_PCA200E 0x0300 - -#define PCI_VENDOR_ID_IMAGINGTECH 0x112f -#define PCI_DEVICE_ID_IMAGINGTECH_ICPCI 0x0000 - -#define PCI_VENDOR_ID_PHILIPS 0x1131 -#define PCI_DEVICE_ID_PHILIPS_SAA7145 0x7145 -#define PCI_DEVICE_ID_PHILIPS_SAA7146 0x7146 -#define PCI_DEVICE_ID_PHILIPS_SAA9730 0x9730 - -#define PCI_VENDOR_ID_EICON 0x1133 -#define PCI_DEVICE_ID_EICON_DIVA20PRO 0xe001 -#define PCI_DEVICE_ID_EICON_DIVA20 0xe002 -#define PCI_DEVICE_ID_EICON_DIVA20PRO_U 0xe003 -#define PCI_DEVICE_ID_EICON_DIVA20_U 0xe004 -#define PCI_DEVICE_ID_EICON_DIVA201 0xe005 -#define PCI_DEVICE_ID_EICON_MAESTRA 0xe010 -#define PCI_DEVICE_ID_EICON_MAESTRAQ 0xe012 -#define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013 -#define PCI_DEVICE_ID_EICON_MAESTRAP 0xe014 - -#define PCI_VENDOR_ID_CYCLONE 0x113c -#define PCI_DEVICE_ID_CYCLONE_SDK 0x0001 - -#define PCI_VENDOR_ID_ALLIANCE 0x1142 -#define PCI_DEVICE_ID_ALLIANCE_PROMOTIO 0x3210 -#define PCI_DEVICE_ID_ALLIANCE_PROVIDEO 0x6422 -#define PCI_DEVICE_ID_ALLIANCE_AT24 0x6424 -#define PCI_DEVICE_ID_ALLIANCE_AT3D 0x643d - -#define PCI_VENDOR_ID_SYSKONNECT 0x1148 -#define PCI_DEVICE_ID_SYSKONNECT_FP 0x4000 -#define PCI_DEVICE_ID_SYSKONNECT_TR 0x4200 -#define PCI_DEVICE_ID_SYSKONNECT_GE 0x4300 - -#define PCI_VENDOR_ID_VMIC 0x114a -#define PCI_DEVICE_ID_VMIC_VME 0x7587 - -#define PCI_VENDOR_ID_DIGI 0x114f -#define PCI_DEVICE_ID_DIGI_EPC 0x0002 -#define PCI_DEVICE_ID_DIGI_RIGHTSWITCH 0x0003 -#define PCI_DEVICE_ID_DIGI_XEM 0x0004 -#define PCI_DEVICE_ID_DIGI_XR 0x0005 -#define PCI_DEVICE_ID_DIGI_CX 0x0006 -#define PCI_DEVICE_ID_DIGI_XRJ 0x0009 -#define PCI_DEVICE_ID_DIGI_EPCJ 0x000a -#define PCI_DEVICE_ID_DIGI_XR_920 0x0027 -#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E 0x0070 -#define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 -#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 -#define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073 - -#define PCI_VENDOR_ID_MUTECH 0x1159 -#define PCI_DEVICE_ID_MUTECH_MV1000 0x0001 - -#define PCI_VENDOR_ID_XIRCOM 0x115d -#define PCI_DEVICE_ID_XIRCOM_X3201_ETH 0x0003 -#define PCI_DEVICE_ID_XIRCOM_X3201_MDM 0x0103 - -#define PCI_VENDOR_ID_RENDITION 0x1163 -#define PCI_DEVICE_ID_RENDITION_VERITE 0x0001 -#define PCI_DEVICE_ID_RENDITION_VERITE2100 0x2000 - -#define PCI_VENDOR_ID_SERVERWORKS 0x1166 -#define PCI_DEVICE_ID_SERVERWORKS_HE 0x0008 -#define PCI_DEVICE_ID_SERVERWORKS_LE 0x0009 -#define PCI_DEVICE_ID_SERVERWORKS_CIOB30 0x0010 -#define PCI_DEVICE_ID_SERVERWORKS_CMIC_HE 0x0011 -#define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017 -#define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200 -#define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201 -#define PCI_DEVICE_ID_SERVERWORKS_CSB6 0x0203 -#define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211 -#define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212 -#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213 -#define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220 -#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB -#define PCI_DEVICE_ID_SERVERWORKS_CSB6USB 0x0221 -#define PCI_DEVICE_ID_SERVERWORKS_GCLE 0x0225 -#define PCI_DEVICE_ID_SERVERWORKS_GCLE2 0x0227 -#define PCI_DEVICE_ID_SERVERWORKS_CSB5ISA 0x0230 - -#define PCI_DEVICE_ID_SERVERWORKS_BCM5780_PXB 0x0130 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5780_PCIE 0x0132 -#define PCI_DEVICE_ID_BROADCOM_BCM5780_NIC 0x1668 -#define PCI_DEVICE_ID_BROADCOM_BCM5780_NIC1 0x1669 - -#define PCI_DEVICE_ID_SERVERWORKS_BCM21000_EXB0 0x140 -#define PCI_DEVICE_ID_SERVERWORKS_BCM21000_EXB1 0x142 -#define PCI_DEVICE_ID_SERVERWORKS_BCM21000_EXB2 0x144 - -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_HT_PXB 0x0036 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_PXBX 0x0104 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_SATA 0x024a -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_SB_PCI_MAIN 0x0205 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_IDE 0x0214 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_LPC 0x0234 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_WDT 0x0238 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_XIOAPIC 0x0235 -#define PCI_DEVICE_ID_SERVERWORKS_BCM5785_USB 0x0223 - -#define PCI_VENDOR_ID_SBE 0x1176 -#define PCI_DEVICE_ID_SBE_WANXL100 0x0301 -#define PCI_DEVICE_ID_SBE_WANXL200 0x0302 -#define PCI_DEVICE_ID_SBE_WANXL400 0x0104 - -#define PCI_VENDOR_ID_TOSHIBA 0x1179 -#define PCI_DEVICE_ID_TOSHIBA_601 0x0601 -#define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a -#define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f - -#define PCI_VENDOR_ID_TOSHIBA_2 0x102f -#define PCI_DEVICE_ID_TOSHIBA_TX3927 0x000a -#define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 -#define PCI_DEVICE_ID_TOSHIBA_TX4927 0x0180 - -#define PCI_VENDOR_ID_RICOH 0x1180 -#define PCI_DEVICE_ID_RICOH_RL5C465 0x0465 -#define PCI_DEVICE_ID_RICOH_RL5C466 0x0466 -#define PCI_DEVICE_ID_RICOH_RL5C475 0x0475 -#define PCI_DEVICE_ID_RICOH_RL5C476 0x0476 -#define PCI_DEVICE_ID_RICOH_RL5C478 0x0478 -#define PCI_DEVICE_ID_RICOH_R5C822 0x0822 - -#define PCI_VENDOR_ID_ARTOP 0x1191 -#define PCI_DEVICE_ID_ARTOP_ATP8400 0x0004 -#define PCI_DEVICE_ID_ARTOP_ATP850UF 0x0005 -#define PCI_DEVICE_ID_ARTOP_ATP860 0x0006 -#define PCI_DEVICE_ID_ARTOP_ATP860R 0x0007 -#define PCI_DEVICE_ID_ARTOP_ATP865 0x0008 -#define PCI_DEVICE_ID_ARTOP_ATP865R 0x0009 -#define PCI_DEVICE_ID_ARTOP_AEC7610 0x8002 -#define PCI_DEVICE_ID_ARTOP_AEC7612UW 0x8010 -#define PCI_DEVICE_ID_ARTOP_AEC7612U 0x8020 -#define PCI_DEVICE_ID_ARTOP_AEC7612S 0x8030 -#define PCI_DEVICE_ID_ARTOP_AEC7612D 0x8040 -#define PCI_DEVICE_ID_ARTOP_AEC7612SUW 0x8050 -#define PCI_DEVICE_ID_ARTOP_8060 0x8060 - -#define PCI_VENDOR_ID_ZEITNET 0x1193 -#define PCI_DEVICE_ID_ZEITNET_1221 0x0001 -#define PCI_DEVICE_ID_ZEITNET_1225 0x0002 - -#define PCI_VENDOR_ID_OMEGA 0x119b -#define PCI_DEVICE_ID_OMEGA_82C092G 0x1221 - -#define PCI_VENDOR_ID_FUJITSU_ME 0x119e -#define PCI_DEVICE_ID_FUJITSU_FS155 0x0001 -#define PCI_DEVICE_ID_FUJITSU_FS50 0x0003 +#define PCI_DID_VIA_CN700_AGP 0x0314 +#define PCI_DID_VIA_CN700_ERR 0x1314 +#define PCI_DID_VIA_CN700_HOST 0x2314 +#define PCI_DID_VIA_CN700_MEMCTRL 0x3208 +#define PCI_DID_VIA_CN700_PM 0x4314 +#define PCI_DID_VIA_CN700_VLINK 0x7314 +#define PCI_DID_VIA_CN700_BRIDGE 0xB198 +#define PCI_DID_VIA_CN700_VGA 0x3344 +#define PCI_DID_VIA_CN400_AGP 0x0259 +#define PCI_DID_VIA_CN400_ERR 0x1259 +#define PCI_DID_VIA_CN400_HOST 0x2259 +#define PCI_DID_VIA_CN400_MEMCTRL 0x3259 +#define PCI_DID_VIA_CN400_PM 0x4259 +#define PCI_DID_VIA_CN400_VLINK 0x7259 +#define PCI_DID_VIA_CN400_BRIDGE 0xB198 +#define PCI_DID_VIA_CN400_VGA 0x3118 + +#define PCI_VID_SIEMENS 0x110A +#define PCI_DID_SIEMENS_DSCC4 0x2102 + +#define PCI_VID_SMC2 0x1113 +#define PCI_DID_SMC2_1211TX 0x1211 + +#define PCI_VID_VORTEX 0x1119 +#define PCI_DID_VORTEX_GDT60x0 0x0000 +#define PCI_DID_VORTEX_GDT6000B 0x0001 +#define PCI_DID_VORTEX_GDT6x10 0x0002 +#define PCI_DID_VORTEX_GDT6x20 0x0003 +#define PCI_DID_VORTEX_GDT6530 0x0004 +#define PCI_DID_VORTEX_GDT6550 0x0005 +#define PCI_DID_VORTEX_GDT6x17 0x0006 +#define PCI_DID_VORTEX_GDT6x27 0x0007 +#define PCI_DID_VORTEX_GDT6537 0x0008 +#define PCI_DID_VORTEX_GDT6557 0x0009 +#define PCI_DID_VORTEX_GDT6x15 0x000a +#define PCI_DID_VORTEX_GDT6x25 0x000b +#define PCI_DID_VORTEX_GDT6535 0x000c +#define PCI_DID_VORTEX_GDT6555 0x000d +#define PCI_DID_VORTEX_GDT6x17RP 0x0100 +#define PCI_DID_VORTEX_GDT6x27RP 0x0101 +#define PCI_DID_VORTEX_GDT6537RP 0x0102 +#define PCI_DID_VORTEX_GDT6557RP 0x0103 +#define PCI_DID_VORTEX_GDT6x11RP 0x0104 +#define PCI_DID_VORTEX_GDT6x21RP 0x0105 +#define PCI_DID_VORTEX_GDT6x17RP1 0x0110 +#define PCI_DID_VORTEX_GDT6x27RP1 0x0111 +#define PCI_DID_VORTEX_GDT6537RP1 0x0112 +#define PCI_DID_VORTEX_GDT6557RP1 0x0113 +#define PCI_DID_VORTEX_GDT6x11RP1 0x0114 +#define PCI_DID_VORTEX_GDT6x21RP1 0x0115 +#define PCI_DID_VORTEX_GDT6x17RP2 0x0120 +#define PCI_DID_VORTEX_GDT6x27RP2 0x0121 +#define PCI_DID_VORTEX_GDT6537RP2 0x0122 +#define PCI_DID_VORTEX_GDT6557RP2 0x0123 +#define PCI_DID_VORTEX_GDT6x11RP2 0x0124 +#define PCI_DID_VORTEX_GDT6x21RP2 0x0125 + +#define PCI_VID_EF 0x111a +#define PCI_DID_EF_ATM_FPGA 0x0000 +#define PCI_DID_EF_ATM_ASIC 0x0002 + +#define PCI_VID_IDT 0x111d +#define PCI_DID_IDT_IDT77201 0x0001 + +#define PCI_VID_FORE 0x1127 +#define PCI_DID_FORE_PCA200PC 0x0210 +#define PCI_DID_FORE_PCA200E 0x0300 + +#define PCI_VID_IMAGINGTECH 0x112f +#define PCI_DID_IMAGINGTECH_ICPCI 0x0000 + +#define PCI_VID_PHILIPS 0x1131 +#define PCI_DID_PHILIPS_SAA7145 0x7145 +#define PCI_DID_PHILIPS_SAA7146 0x7146 +#define PCI_DID_PHILIPS_SAA9730 0x9730 + +#define PCI_VID_EICON 0x1133 +#define PCI_DID_EICON_DIVA20PRO 0xe001 +#define PCI_DID_EICON_DIVA20 0xe002 +#define PCI_DID_EICON_DIVA20PRO_U 0xe003 +#define PCI_DID_EICON_DIVA20_U 0xe004 +#define PCI_DID_EICON_DIVA201 0xe005 +#define PCI_DID_EICON_MAESTRA 0xe010 +#define PCI_DID_EICON_MAESTRAQ 0xe012 +#define PCI_DID_EICON_MAESTRAQ_U 0xe013 +#define PCI_DID_EICON_MAESTRAP 0xe014 + +#define PCI_VID_CYCLONE 0x113c +#define PCI_DID_CYCLONE_SDK 0x0001 + +#define PCI_VID_ALLIANCE 0x1142 +#define PCI_DID_ALLIANCE_PROMOTIO 0x3210 +#define PCI_DID_ALLIANCE_PROVIDEO 0x6422 +#define PCI_DID_ALLIANCE_AT24 0x6424 +#define PCI_DID_ALLIANCE_AT3D 0x643d + +#define PCI_VID_SYSKONNECT 0x1148 +#define PCI_DID_SYSKONNECT_FP 0x4000 +#define PCI_DID_SYSKONNECT_TR 0x4200 +#define PCI_DID_SYSKONNECT_GE 0x4300 + +#define PCI_VID_VMIC 0x114a +#define PCI_DID_VMIC_VME 0x7587 + +#define PCI_VID_DIGI 0x114f +#define PCI_DID_DIGI_EPC 0x0002 +#define PCI_DID_DIGI_RIGHTSWITCH 0x0003 +#define PCI_DID_DIGI_XEM 0x0004 +#define PCI_DID_DIGI_XR 0x0005 +#define PCI_DID_DIGI_CX 0x0006 +#define PCI_DID_DIGI_XRJ 0x0009 +#define PCI_DID_DIGI_EPCJ 0x000a +#define PCI_DID_DIGI_XR_920 0x0027 +#define PCI_DID_DIGI_DF_M_IOM2_E 0x0070 +#define PCI_DID_DIGI_DF_M_E 0x0071 +#define PCI_DID_DIGI_DF_M_IOM2_A 0x0072 +#define PCI_DID_DIGI_DF_M_A 0x0073 + +#define PCI_VID_MUTECH 0x1159 +#define PCI_DID_MUTECH_MV1000 0x0001 + +#define PCI_VID_XIRCOM 0x115d +#define PCI_DID_XIRCOM_X3201_ETH 0x0003 +#define PCI_DID_XIRCOM_X3201_MDM 0x0103 + +#define PCI_VID_RENDITION 0x1163 +#define PCI_DID_RENDITION_VERITE 0x0001 +#define PCI_DID_RENDITION_VERITE2100 0x2000 + +#define PCI_VID_SERVERWORKS 0x1166 +#define PCI_DID_SERVERWORKS_HE 0x0008 +#define PCI_DID_SERVERWORKS_LE 0x0009 +#define PCI_DID_SERVERWORKS_CIOB30 0x0010 +#define PCI_DID_SERVERWORKS_CMIC_HE 0x0011 +#define PCI_DID_SERVERWORKS_GCNB_LE 0x0017 +#define PCI_DID_SERVERWORKS_OSB4 0x0200 +#define PCI_DID_SERVERWORKS_CSB5 0x0201 +#define PCI_DID_SERVERWORKS_CSB6 0x0203 +#define PCI_DID_SERVERWORKS_OSB4IDE 0x0211 +#define PCI_DID_SERVERWORKS_CSB5IDE 0x0212 +#define PCI_DID_SERVERWORKS_CSB6IDE 0x0213 +#define PCI_DID_SERVERWORKS_OSB4USB 0x0220 +#define PCI_DID_SERVERWORKS_CSB5USB PCI_DID_SERVERWORKS_OSB4USB +#define PCI_DID_SERVERWORKS_CSB6USB 0x0221 +#define PCI_DID_SERVERWORKS_GCLE 0x0225 +#define PCI_DID_SERVERWORKS_GCLE2 0x0227 +#define PCI_DID_SERVERWORKS_CSB5ISA 0x0230 + +#define PCI_DID_SERVERWORKS_BCM5780_PXB 0x0130 +#define PCI_DID_SERVERWORKS_BCM5780_PCIE 0x0132 +#define PCI_DID_BROADCOM_BCM5780_NIC 0x1668 +#define PCI_DID_BROADCOM_BCM5780_NIC1 0x1669 + +#define PCI_DID_SERVERWORKS_BCM21000_EXB0 0x140 +#define PCI_DID_SERVERWORKS_BCM21000_EXB1 0x142 +#define PCI_DID_SERVERWORKS_BCM21000_EXB2 0x144 + +#define PCI_DID_SERVERWORKS_BCM5785_HT_PXB 0x0036 +#define PCI_DID_SERVERWORKS_BCM5785_PXBX 0x0104 +#define PCI_DID_SERVERWORKS_BCM5785_SATA 0x024a +#define PCI_DID_SERVERWORKS_BCM5785_SB_PCI_MAIN 0x0205 +#define PCI_DID_SERVERWORKS_BCM5785_IDE 0x0214 +#define PCI_DID_SERVERWORKS_BCM5785_LPC 0x0234 +#define PCI_DID_SERVERWORKS_BCM5785_WDT 0x0238 +#define PCI_DID_SERVERWORKS_BCM5785_XIOAPIC 0x0235 +#define PCI_DID_SERVERWORKS_BCM5785_USB 0x0223 + +#define PCI_VID_SBE 0x1176 +#define PCI_DID_SBE_WANXL100 0x0301 +#define PCI_DID_SBE_WANXL200 0x0302 +#define PCI_DID_SBE_WANXL400 0x0104 + +#define PCI_VID_TOSHIBA 0x1179 +#define PCI_DID_TOSHIBA_601 0x0601 +#define PCI_DID_TOSHIBA_TOPIC95 0x060a +#define PCI_DID_TOSHIBA_TOPIC97 0x060f + +#define PCI_VID_TOSHIBA_2 0x102f +#define PCI_DID_TOSHIBA_TX3927 0x000a +#define PCI_DID_TOSHIBA_TC35815CF 0x0030 +#define PCI_DID_TOSHIBA_TX4927 0x0180 + +#define PCI_VID_RICOH 0x1180 +#define PCI_DID_RICOH_RL5C465 0x0465 +#define PCI_DID_RICOH_RL5C466 0x0466 +#define PCI_DID_RICOH_RL5C475 0x0475 +#define PCI_DID_RICOH_RL5C476 0x0476 +#define PCI_DID_RICOH_RL5C478 0x0478 +#define PCI_DID_RICOH_R5C822 0x0822 + +#define PCI_VID_ARTOP 0x1191 +#define PCI_DID_ARTOP_ATP8400 0x0004 +#define PCI_DID_ARTOP_ATP850UF 0x0005 +#define PCI_DID_ARTOP_ATP860 0x0006 +#define PCI_DID_ARTOP_ATP860R 0x0007 +#define PCI_DID_ARTOP_ATP865 0x0008 +#define PCI_DID_ARTOP_ATP865R 0x0009 +#define PCI_DID_ARTOP_AEC7610 0x8002 +#define PCI_DID_ARTOP_AEC7612UW 0x8010 +#define PCI_DID_ARTOP_AEC7612U 0x8020 +#define PCI_DID_ARTOP_AEC7612S 0x8030 +#define PCI_DID_ARTOP_AEC7612D 0x8040 +#define PCI_DID_ARTOP_AEC7612SUW 0x8050 +#define PCI_DID_ARTOP_8060 0x8060 + +#define PCI_VID_ZEITNET 0x1193 +#define PCI_DID_ZEITNET_1221 0x0001 +#define PCI_DID_ZEITNET_1225 0x0002 + +#define PCI_VID_OMEGA 0x119b +#define PCI_DID_OMEGA_82C092G 0x1221 + +#define PCI_VID_FUJITSU_ME 0x119e +#define PCI_DID_FUJITSU_FS155 0x0001 +#define PCI_DID_FUJITSU_FS50 0x0003 #define PCI_SUBVENDOR_ID_KEYSPAN 0x11a9 #define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334 -#define PCI_VENDOR_ID_GALILEO 0x11ab -#define PCI_DEVICE_ID_GALILEO_GT64011 0x4146 -#define PCI_DEVICE_ID_GALILEO_GT64111 0x4146 -#define PCI_DEVICE_ID_GALILEO_GT96100 0x9652 -#define PCI_DEVICE_ID_GALILEO_GT96100A 0x9653 - -#define PCI_VENDOR_ID_LITEON 0x11ad -#define PCI_DEVICE_ID_LITEON_LNE100TX 0x0002 - -#define PCI_VENDOR_ID_V3 0x11b0 -#define PCI_DEVICE_ID_V3_V960 0x0001 -#define PCI_DEVICE_ID_V3_V350 0x0001 -#define PCI_DEVICE_ID_V3_V960V2 0x0002 -#define PCI_DEVICE_ID_V3_V350V2 0x0002 -#define PCI_DEVICE_ID_V3_V961 0x0002 -#define PCI_DEVICE_ID_V3_V351 0x0002 - -#define PCI_VENDOR_ID_NP 0x11bc -#define PCI_DEVICE_ID_NP_PCI_FDDI 0x0001 - -#define PCI_VENDOR_ID_ATT 0x11c1 -#define PCI_DEVICE_ID_ATT_L56XMF 0x0440 -#define PCI_DEVICE_ID_ATT_VENUS_MODEM 0x480 - -#define PCI_VENDOR_ID_SPECIALIX 0x11cb -#define PCI_DEVICE_ID_SPECIALIX_IO8 0x2000 -#define PCI_DEVICE_ID_SPECIALIX_XIO 0x4000 -#define PCI_DEVICE_ID_SPECIALIX_RIO 0x8000 +#define PCI_VID_GALILEO 0x11ab +#define PCI_DID_GALILEO_GT64011 0x4146 +#define PCI_DID_GALILEO_GT64111 0x4146 +#define PCI_DID_GALILEO_GT96100 0x9652 +#define PCI_DID_GALILEO_GT96100A 0x9653 + +#define PCI_VID_LITEON 0x11ad +#define PCI_DID_LITEON_LNE100TX 0x0002 + +#define PCI_VID_V3 0x11b0 +#define PCI_DID_V3_V960 0x0001 +#define PCI_DID_V3_V350 0x0001 +#define PCI_DID_V3_V960V2 0x0002 +#define PCI_DID_V3_V350V2 0x0002 +#define PCI_DID_V3_V961 0x0002 +#define PCI_DID_V3_V351 0x0002 + +#define PCI_VID_NP 0x11bc +#define PCI_DID_NP_PCI_FDDI 0x0001 + +#define PCI_VID_ATT 0x11c1 +#define PCI_DID_ATT_L56XMF 0x0440 +#define PCI_DID_ATT_VENUS_MODEM 0x480 + +#define PCI_VID_SPECIALIX 0x11cb +#define PCI_DID_SPECIALIX_IO8 0x2000 +#define PCI_DID_SPECIALIX_XIO 0x4000 +#define PCI_DID_SPECIALIX_RIO 0x8000 #define PCI_SUBDEVICE_ID_SPECIALIX_SPEED4 0xa004 -#define PCI_VENDOR_ID_AURAVISION 0x11d1 -#define PCI_DEVICE_ID_AURAVISION_VXP524 0x01f7 - -#define PCI_VENDOR_ID_ANALOG_DEVICES 0x11d4 -#define PCI_DEVICE_ID_AD1889JS 0x1889 - -#define PCI_VENDOR_ID_IKON 0x11d5 -#define PCI_DEVICE_ID_IKON_10115 0x0115 -#define PCI_DEVICE_ID_IKON_10117 0x0117 - -#define PCI_VENDOR_ID_ZORAN 0x11de -#define PCI_DEVICE_ID_ZORAN_36057 0x6057 -#define PCI_DEVICE_ID_ZORAN_36120 0x6120 - -#define PCI_VENDOR_ID_KINETIC 0x11f4 -#define PCI_DEVICE_ID_KINETIC_2915 0x2915 - -#define PCI_VENDOR_ID_COMPEX 0x11f6 -#define PCI_DEVICE_ID_COMPEX_ENET100VG4 0x0112 -#define PCI_DEVICE_ID_COMPEX_RL2000 0x1401 - -#define PCI_VENDOR_ID_RP 0x11fe -#define PCI_DEVICE_ID_RP32INTF 0x0001 -#define PCI_DEVICE_ID_RP8INTF 0x0002 -#define PCI_DEVICE_ID_RP16INTF 0x0003 -#define PCI_DEVICE_ID_RP4QUAD 0x0004 -#define PCI_DEVICE_ID_RP8OCTA 0x0005 -#define PCI_DEVICE_ID_RP8J 0x0006 -#define PCI_DEVICE_ID_RPP4 0x000A -#define PCI_DEVICE_ID_RPP8 0x000B -#define PCI_DEVICE_ID_RP8M 0x000C - -#define PCI_VENDOR_ID_CYCLADES 0x120e -#define PCI_DEVICE_ID_CYCLOM_Y_Lo 0x0100 -#define PCI_DEVICE_ID_CYCLOM_Y_Hi 0x0101 -#define PCI_DEVICE_ID_CYCLOM_4Y_Lo 0x0102 -#define PCI_DEVICE_ID_CYCLOM_4Y_Hi 0x0103 -#define PCI_DEVICE_ID_CYCLOM_8Y_Lo 0x0104 -#define PCI_DEVICE_ID_CYCLOM_8Y_Hi 0x0105 -#define PCI_DEVICE_ID_CYCLOM_Z_Lo 0x0200 -#define PCI_DEVICE_ID_CYCLOM_Z_Hi 0x0201 -#define PCI_DEVICE_ID_PC300_RX_2 0x0300 -#define PCI_DEVICE_ID_PC300_RX_1 0x0301 -#define PCI_DEVICE_ID_PC300_TE_2 0x0310 -#define PCI_DEVICE_ID_PC300_TE_1 0x0311 - -#define PCI_VENDOR_ID_ESSENTIAL 0x120f -#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER 0x0001 - -#define PCI_VENDOR_ID_O2 0x1217 -#define PCI_DEVICE_ID_O2_6729 0x6729 -#define PCI_DEVICE_ID_O2_6730 0x673a -#define PCI_DEVICE_ID_O2_6832 0x6832 -#define PCI_DEVICE_ID_O2_6836 0x6836 -#define PCI_DEVICE_ID_O2_BH720 0x8620 -#define PCI_DEVICE_ID_O2_LV2 0x8621 - -#define PCI_VENDOR_ID_3DFX 0x121a -#define PCI_DEVICE_ID_3DFX_VOODOO 0x0001 -#define PCI_DEVICE_ID_3DFX_VOODOO2 0x0002 -#define PCI_DEVICE_ID_3DFX_BANSHEE 0x0003 -#define PCI_DEVICE_ID_3DFX_VOODOO3 0x0005 - -#define PCI_VENDOR_ID_SIGMADES 0x1236 -#define PCI_DEVICE_ID_SIGMADES_6425 0x6401 - -#define PCI_VENDOR_ID_CCUBE 0x123f - -#define PCI_VENDOR_ID_AVM 0x1244 -#define PCI_DEVICE_ID_AVM_B1 0x0700 -#define PCI_DEVICE_ID_AVM_C4 0x0800 -#define PCI_DEVICE_ID_AVM_A1 0x0a00 -#define PCI_DEVICE_ID_AVM_A1_V2 0x0e00 -#define PCI_DEVICE_ID_AVM_C2 0x1100 -#define PCI_DEVICE_ID_AVM_T1 0x1200 - -#define PCI_VENDOR_ID_DIPIX 0x1246 - -#define PCI_VENDOR_ID_STALLION 0x124d -#define PCI_DEVICE_ID_STALLION_ECHPCI832 0x0000 -#define PCI_DEVICE_ID_STALLION_ECHPCI864 0x0002 -#define PCI_DEVICE_ID_STALLION_EIOPCI 0x0003 - -#define PCI_VENDOR_ID_OPTIBASE 0x1255 -#define PCI_DEVICE_ID_OPTIBASE_FORGE 0x1110 -#define PCI_DEVICE_ID_OPTIBASE_FUSION 0x1210 -#define PCI_DEVICE_ID_OPTIBASE_VPLEX 0x2110 -#define PCI_DEVICE_ID_OPTIBASE_VPLEXCC 0x2120 -#define PCI_DEVICE_ID_OPTIBASE_VQUEST 0x2130 - -#define PCI_VENDOR_ID_ESS 0x125d -#define PCI_DEVICE_ID_ESS_ESS1968 0x1968 -#define PCI_DEVICE_ID_ESS_AUDIOPCI 0x1969 -#define PCI_DEVICE_ID_ESS_ESS1978 0x1978 - -#define PCI_VENDOR_ID_SATSAGEM 0x1267 -#define PCI_DEVICE_ID_SATSAGEM_NICCY 0x1016 -#define PCI_DEVICE_ID_SATSAGEM_PCR2101 0x5352 -#define PCI_DEVICE_ID_SATSAGEM_TELSATTURBO 0x5a4b - -#define PCI_VENDOR_ID_HUGHES 0x1273 -#define PCI_DEVICE_ID_HUGHES_DIRECPC 0x0002 - -#define PCI_VENDOR_ID_ENSONIQ 0x1274 -#define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880 -#define PCI_DEVICE_ID_ENSONIQ_AUDIOPCI 0x5000 -#define PCI_DEVICE_ID_ENSONIQ_ES1370 0x5000 -#define PCI_DEVICE_ID_ENSONIQ_ES1371 0x1371 - -#define PCI_VENDOR_ID_ROCKWELL 0x127A - -#define PCI_VENDOR_ID_ITE 0x1283 -#define PCI_DEVICE_ID_ITE_IT8172G 0x8172 -#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801 -#define PCI_DEVICE_ID_ITE_8872 0x8872 - -#define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886 +#define PCI_VID_AURAVISION 0x11d1 +#define PCI_DID_AURAVISION_VXP524 0x01f7 + +#define PCI_VID_ANALOG_DEVICES 0x11d4 +#define PCI_DID_AD1889JS 0x1889 + +#define PCI_VID_IKON 0x11d5 +#define PCI_DID_IKON_10115 0x0115 +#define PCI_DID_IKON_10117 0x0117 + +#define PCI_VID_ZORAN 0x11de +#define PCI_DID_ZORAN_36057 0x6057 +#define PCI_DID_ZORAN_36120 0x6120 + +#define PCI_VID_KINETIC 0x11f4 +#define PCI_DID_KINETIC_2915 0x2915 + +#define PCI_VID_COMPEX 0x11f6 +#define PCI_DID_COMPEX_ENET100VG4 0x0112 +#define PCI_DID_COMPEX_RL2000 0x1401 + +#define PCI_VID_RP 0x11fe +#define PCI_DID_RP32INTF 0x0001 +#define PCI_DID_RP8INTF 0x0002 +#define PCI_DID_RP16INTF 0x0003 +#define PCI_DID_RP4QUAD 0x0004 +#define PCI_DID_RP8OCTA 0x0005 +#define PCI_DID_RP8J 0x0006 +#define PCI_DID_RPP4 0x000A +#define PCI_DID_RPP8 0x000B +#define PCI_DID_RP8M 0x000C + +#define PCI_VID_CYCLADES 0x120e +#define PCI_DID_CYCLOM_Y_Lo 0x0100 +#define PCI_DID_CYCLOM_Y_Hi 0x0101 +#define PCI_DID_CYCLOM_4Y_Lo 0x0102 +#define PCI_DID_CYCLOM_4Y_Hi 0x0103 +#define PCI_DID_CYCLOM_8Y_Lo 0x0104 +#define PCI_DID_CYCLOM_8Y_Hi 0x0105 +#define PCI_DID_CYCLOM_Z_Lo 0x0200 +#define PCI_DID_CYCLOM_Z_Hi 0x0201 +#define PCI_DID_PC300_RX_2 0x0300 +#define PCI_DID_PC300_RX_1 0x0301 +#define PCI_DID_PC300_TE_2 0x0310 +#define PCI_DID_PC300_TE_1 0x0311 + +#define PCI_VID_ESSENTIAL 0x120f +#define PCI_DID_ESSENTIAL_ROADRUNNER 0x0001 + +#define PCI_VID_O2 0x1217 +#define PCI_DID_O2_6729 0x6729 +#define PCI_DID_O2_6730 0x673a +#define PCI_DID_O2_6832 0x6832 +#define PCI_DID_O2_6836 0x6836 +#define PCI_DID_O2_BH720 0x8620 +#define PCI_DID_O2_LV2 0x8621 + +#define PCI_VID_3DFX 0x121a +#define PCI_DID_3DFX_VOODOO 0x0001 +#define PCI_DID_3DFX_VOODOO2 0x0002 +#define PCI_DID_3DFX_BANSHEE 0x0003 +#define PCI_DID_3DFX_VOODOO3 0x0005 + +#define PCI_VID_SIGMADES 0x1236 +#define PCI_DID_SIGMADES_6425 0x6401 + +#define PCI_VID_CCUBE 0x123f + +#define PCI_VID_AVM 0x1244 +#define PCI_DID_AVM_B1 0x0700 +#define PCI_DID_AVM_C4 0x0800 +#define PCI_DID_AVM_A1 0x0a00 +#define PCI_DID_AVM_A1_V2 0x0e00 +#define PCI_DID_AVM_C2 0x1100 +#define PCI_DID_AVM_T1 0x1200 + +#define PCI_VID_DIPIX 0x1246 + +#define PCI_VID_STALLION 0x124d +#define PCI_DID_STALLION_ECHPCI832 0x0000 +#define PCI_DID_STALLION_ECHPCI864 0x0002 +#define PCI_DID_STALLION_EIOPCI 0x0003 + +#define PCI_VID_OPTIBASE 0x1255 +#define PCI_DID_OPTIBASE_FORGE 0x1110 +#define PCI_DID_OPTIBASE_FUSION 0x1210 +#define PCI_DID_OPTIBASE_VPLEX 0x2110 +#define PCI_DID_OPTIBASE_VPLEXCC 0x2120 +#define PCI_DID_OPTIBASE_VQUEST 0x2130 + +#define PCI_VID_ESS 0x125d +#define PCI_DID_ESS_ESS1968 0x1968 +#define PCI_DID_ESS_AUDIOPCI 0x1969 +#define PCI_DID_ESS_ESS1978 0x1978 + +#define PCI_VID_SATSAGEM 0x1267 +#define PCI_DID_SATSAGEM_NICCY 0x1016 +#define PCI_DID_SATSAGEM_PCR2101 0x5352 +#define PCI_DID_SATSAGEM_TELSATTURBO 0x5a4b + +#define PCI_VID_HUGHES 0x1273 +#define PCI_DID_HUGHES_DIRECPC 0x0002 + +#define PCI_VID_ENSONIQ 0x1274 +#define PCI_DID_ENSONIQ_CT5880 0x5880 +#define PCI_DID_ENSONIQ_AUDIOPCI 0x5000 +#define PCI_DID_ENSONIQ_ES1370 0x5000 +#define PCI_DID_ENSONIQ_ES1371 0x1371 + +#define PCI_VID_ROCKWELL 0x127A + +#define PCI_VID_ITE 0x1283 +#define PCI_DID_ITE_IT8172G 0x8172 +#define PCI_DID_ITE_IT8172G_AUDIO 0x0801 +#define PCI_DID_ITE_8872 0x8872 + +#define PCI_DID_ITE_IT8330G_0 0xe886 /* formerly Platform Tech */ -#define PCI_VENDOR_ID_ESS_OLD 0x1285 -#define PCI_DEVICE_ID_ESS_ESS0100 0x0100 +#define PCI_VID_ESS_OLD 0x1285 +#define PCI_DID_ESS_ESS0100 0x0100 -#define PCI_VENDOR_ID_ALTEON 0x12ae -#define PCI_DEVICE_ID_ALTEON_ACENIC 0x0001 +#define PCI_VID_ALTEON 0x12ae +#define PCI_DID_ALTEON_ACENIC 0x0001 -#define PCI_VENDOR_ID_USR 0x12B9 +#define PCI_VID_USR 0x12B9 #define PCI_SUBVENDOR_ID_CONNECT_TECH 0x12c4 #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232 0x0001 @@ -1859,11 +1859,11 @@ #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1 0x000A #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1 0x000B -#define PCI_VENDOR_ID_PICTUREL 0x12c5 -#define PCI_DEVICE_ID_PICTUREL_PCIVST 0x0081 +#define PCI_VID_PICTUREL 0x12c5 +#define PCI_DID_PICTUREL_PCIVST 0x0081 -#define PCI_VENDOR_ID_NVIDIA_SGS 0x12d2 -#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018 +#define PCI_VID_NVIDIA_SGS 0x12d2 +#define PCI_DID_NVIDIA_SGS_RIVA128 0x0018 #define PCI_SUBVENDOR_ID_CHASE_PCIFAST 0x12E0 #define PCI_SUBDEVICE_ID_CHASE_PCIFAST4 0x0031 @@ -1874,920 +1874,920 @@ #define PCI_SUBDEVICE_ID_CHASE_PCIRAS4 0xF001 #define PCI_SUBDEVICE_ID_CHASE_PCIRAS8 0xF010 -#define PCI_VENDOR_ID_AUREAL 0x12eb -#define PCI_DEVICE_ID_AUREAL_VORTEX_1 0x0001 -#define PCI_DEVICE_ID_AUREAL_VORTEX_2 0x0002 - -#define PCI_VENDOR_ID_CBOARDS 0x1307 -#define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001 - -#define PCI_VENDOR_ID_SIIG 0x131f -#define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000 -#define PCI_DEVICE_ID_SIIG_1S_10x_650 0x1001 -#define PCI_DEVICE_ID_SIIG_1S_10x_850 0x1002 -#define PCI_DEVICE_ID_SIIG_1S1P_10x_550 0x1010 -#define PCI_DEVICE_ID_SIIG_1S1P_10x_650 0x1011 -#define PCI_DEVICE_ID_SIIG_1S1P_10x_850 0x1012 -#define PCI_DEVICE_ID_SIIG_1P_10x 0x1020 -#define PCI_DEVICE_ID_SIIG_2P_10x 0x1021 -#define PCI_DEVICE_ID_SIIG_2S_10x_550 0x1030 -#define PCI_DEVICE_ID_SIIG_2S_10x_650 0x1031 -#define PCI_DEVICE_ID_SIIG_2S_10x_850 0x1032 -#define PCI_DEVICE_ID_SIIG_2S1P_10x_550 0x1034 -#define PCI_DEVICE_ID_SIIG_2S1P_10x_650 0x1035 -#define PCI_DEVICE_ID_SIIG_2S1P_10x_850 0x1036 -#define PCI_DEVICE_ID_SIIG_4S_10x_550 0x1050 -#define PCI_DEVICE_ID_SIIG_4S_10x_650 0x1051 -#define PCI_DEVICE_ID_SIIG_4S_10x_850 0x1052 -#define PCI_DEVICE_ID_SIIG_1S_20x_550 0x2000 -#define PCI_DEVICE_ID_SIIG_1S_20x_650 0x2001 -#define PCI_DEVICE_ID_SIIG_1S_20x_850 0x2002 -#define PCI_DEVICE_ID_SIIG_1P_20x 0x2020 -#define PCI_DEVICE_ID_SIIG_2P_20x 0x2021 -#define PCI_DEVICE_ID_SIIG_2S_20x_550 0x2030 -#define PCI_DEVICE_ID_SIIG_2S_20x_650 0x2031 -#define PCI_DEVICE_ID_SIIG_2S_20x_850 0x2032 -#define PCI_DEVICE_ID_SIIG_2P1S_20x_550 0x2040 -#define PCI_DEVICE_ID_SIIG_2P1S_20x_650 0x2041 -#define PCI_DEVICE_ID_SIIG_2P1S_20x_850 0x2042 -#define PCI_DEVICE_ID_SIIG_1S1P_20x_550 0x2010 -#define PCI_DEVICE_ID_SIIG_1S1P_20x_650 0x2011 -#define PCI_DEVICE_ID_SIIG_1S1P_20x_850 0x2012 -#define PCI_DEVICE_ID_SIIG_4S_20x_550 0x2050 -#define PCI_DEVICE_ID_SIIG_4S_20x_650 0x2051 -#define PCI_DEVICE_ID_SIIG_4S_20x_850 0x2052 -#define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060 -#define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061 -#define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062 - -#define PCI_VENDOR_ID_DOMEX 0x134a -#define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 - -#define PCI_VENDOR_ID_QUATECH 0x135C -#define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 -#define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 -#define PCI_DEVICE_ID_QUATECH_DSC200 0x0030 -#define PCI_DEVICE_ID_QUATECH_QSC200 0x0040 -#define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050 -#define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060 - -#define PCI_VENDOR_ID_SEALEVEL 0x135e -#define PCI_DEVICE_ID_SEALEVEL_U530 0x7101 -#define PCI_DEVICE_ID_SEALEVEL_UCOMM2 0x7201 -#define PCI_DEVICE_ID_SEALEVEL_UCOMM422 0x7402 -#define PCI_DEVICE_ID_SEALEVEL_UCOMM232 0x7202 -#define PCI_DEVICE_ID_SEALEVEL_COMM4 0x7401 -#define PCI_DEVICE_ID_SEALEVEL_COMM8 0x7801 - -#define PCI_VENDOR_ID_HYPERCOPE 0x1365 -#define PCI_DEVICE_ID_HYPERCOPE_PLX 0x9050 +#define PCI_VID_AUREAL 0x12eb +#define PCI_DID_AUREAL_VORTEX_1 0x0001 +#define PCI_DID_AUREAL_VORTEX_2 0x0002 + +#define PCI_VID_CBOARDS 0x1307 +#define PCI_DID_CBOARDS_DAS1602_16 0x0001 + +#define PCI_VID_SIIG 0x131f +#define PCI_DID_SIIG_1S_10x_550 0x1000 +#define PCI_DID_SIIG_1S_10x_650 0x1001 +#define PCI_DID_SIIG_1S_10x_850 0x1002 +#define PCI_DID_SIIG_1S1P_10x_550 0x1010 +#define PCI_DID_SIIG_1S1P_10x_650 0x1011 +#define PCI_DID_SIIG_1S1P_10x_850 0x1012 +#define PCI_DID_SIIG_1P_10x 0x1020 +#define PCI_DID_SIIG_2P_10x 0x1021 +#define PCI_DID_SIIG_2S_10x_550 0x1030 +#define PCI_DID_SIIG_2S_10x_650 0x1031 +#define PCI_DID_SIIG_2S_10x_850 0x1032 +#define PCI_DID_SIIG_2S1P_10x_550 0x1034 +#define PCI_DID_SIIG_2S1P_10x_650 0x1035 +#define PCI_DID_SIIG_2S1P_10x_850 0x1036 +#define PCI_DID_SIIG_4S_10x_550 0x1050 +#define PCI_DID_SIIG_4S_10x_650 0x1051 +#define PCI_DID_SIIG_4S_10x_850 0x1052 +#define PCI_DID_SIIG_1S_20x_550 0x2000 +#define PCI_DID_SIIG_1S_20x_650 0x2001 +#define PCI_DID_SIIG_1S_20x_850 0x2002 +#define PCI_DID_SIIG_1P_20x 0x2020 +#define PCI_DID_SIIG_2P_20x 0x2021 +#define PCI_DID_SIIG_2S_20x_550 0x2030 +#define PCI_DID_SIIG_2S_20x_650 0x2031 +#define PCI_DID_SIIG_2S_20x_850 0x2032 +#define PCI_DID_SIIG_2P1S_20x_550 0x2040 +#define PCI_DID_SIIG_2P1S_20x_650 0x2041 +#define PCI_DID_SIIG_2P1S_20x_850 0x2042 +#define PCI_DID_SIIG_1S1P_20x_550 0x2010 +#define PCI_DID_SIIG_1S1P_20x_650 0x2011 +#define PCI_DID_SIIG_1S1P_20x_850 0x2012 +#define PCI_DID_SIIG_4S_20x_550 0x2050 +#define PCI_DID_SIIG_4S_20x_650 0x2051 +#define PCI_DID_SIIG_4S_20x_850 0x2052 +#define PCI_DID_SIIG_2S1P_20x_550 0x2060 +#define PCI_DID_SIIG_2S1P_20x_650 0x2061 +#define PCI_DID_SIIG_2S1P_20x_850 0x2062 + +#define PCI_VID_DOMEX 0x134a +#define PCI_DID_DOMEX_DMX3191D 0x0001 + +#define PCI_VID_QUATECH 0x135C +#define PCI_DID_QUATECH_QSC100 0x0010 +#define PCI_DID_QUATECH_DSC100 0x0020 +#define PCI_DID_QUATECH_DSC200 0x0030 +#define PCI_DID_QUATECH_QSC200 0x0040 +#define PCI_DID_QUATECH_ESC100D 0x0050 +#define PCI_DID_QUATECH_ESC100M 0x0060 + +#define PCI_VID_SEALEVEL 0x135e +#define PCI_DID_SEALEVEL_U530 0x7101 +#define PCI_DID_SEALEVEL_UCOMM2 0x7201 +#define PCI_DID_SEALEVEL_UCOMM422 0x7402 +#define PCI_DID_SEALEVEL_UCOMM232 0x7202 +#define PCI_DID_SEALEVEL_COMM4 0x7401 +#define PCI_DID_SEALEVEL_COMM8 0x7801 + +#define PCI_VID_HYPERCOPE 0x1365 +#define PCI_DID_HYPERCOPE_PLX 0x9050 #define PCI_SUBDEVICE_ID_HYPERCOPE_OLD_ERGO 0x0104 #define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO 0x0106 #define PCI_SUBDEVICE_ID_HYPERCOPE_METRO 0x0107 #define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2 0x0108 #define PCI_SUBDEVICE_ID_HYPERCOPE_PLEXUS 0x0109 -#define PCI_VENDOR_ID_KAWASAKI 0x136b -#define PCI_DEVICE_ID_MCHIP_KL5A72002 0xff01 - -#define PCI_VENDOR_ID_LMC 0x1376 -#define PCI_DEVICE_ID_LMC_HSSI 0x0003 -#define PCI_DEVICE_ID_LMC_DS3 0x0004 -#define PCI_DEVICE_ID_LMC_SSI 0x0005 -#define PCI_DEVICE_ID_LMC_T1 0x0006 - -#define PCI_VENDOR_ID_NETGEAR 0x1385 -#define PCI_DEVICE_ID_NETGEAR_GA620 0x620a -#define PCI_DEVICE_ID_NETGEAR_GA622 0x622a - -#define PCI_VENDOR_ID_APPLICOM 0x1389 -#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001 -#define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002 -#define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003 - -#define PCI_VENDOR_ID_MOXA 0x1393 -#define PCI_DEVICE_ID_MOXA_C104 0x1040 -#define PCI_DEVICE_ID_MOXA_C168 0x1680 -#define PCI_DEVICE_ID_MOXA_CP204J 0x2040 -#define PCI_DEVICE_ID_MOXA_C218 0x2180 -#define PCI_DEVICE_ID_MOXA_C320 0x3200 - -#define PCI_VENDOR_ID_CCD 0x1397 -#define PCI_DEVICE_ID_CCD_2BD0 0x2bd0 -#define PCI_DEVICE_ID_CCD_B000 0xb000 -#define PCI_DEVICE_ID_CCD_B006 0xb006 -#define PCI_DEVICE_ID_CCD_B007 0xb007 -#define PCI_DEVICE_ID_CCD_B008 0xb008 -#define PCI_DEVICE_ID_CCD_B009 0xb009 -#define PCI_DEVICE_ID_CCD_B00A 0xb00a -#define PCI_DEVICE_ID_CCD_B00B 0xb00b -#define PCI_DEVICE_ID_CCD_B00C 0xb00c -#define PCI_DEVICE_ID_CCD_B100 0xb100 - -#define PCI_VENDOR_ID_NOKIA 0x13B8 -#define PCI_VENDOR_ID_NOKIA_WIRELESS 0x1603 -#define PCI_VENDOR_ID_NOKIA_HOME 0x1622 - -#define PCI_VENDOR_ID_3WARE 0x13C1 -#define PCI_DEVICE_ID_3WARE_1000 0x1000 - -#define PCI_VENDOR_ID_ABOCOM 0x13D1 -#define PCI_DEVICE_ID_ABOCOM_2BD1 0x2BD1 - -#define PCI_VENDOR_ID_CMEDIA 0x13f6 -#define PCI_DEVICE_ID_CMEDIA_CM8338A 0x0100 -#define PCI_DEVICE_ID_CMEDIA_CM8338B 0x0101 -#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111 -#define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112 - -#define PCI_VENDOR_ID_LAVA 0x1407 -#define PCI_DEVICE_ID_LAVA_DSERIAL 0x0100 /* 2x 16550 */ -#define PCI_DEVICE_ID_LAVA_QUATRO_A 0x0101 /* 2x 16550, half of 4 port */ -#define PCI_DEVICE_ID_LAVA_QUATRO_B 0x0102 /* 2x 16550, half of 4 port */ -#define PCI_DEVICE_ID_LAVA_OCTO_A 0x0180 /* 4x 16550A, half of 8 port */ -#define PCI_DEVICE_ID_LAVA_OCTO_B 0x0181 /* 4x 16550A, half of 8 port */ -#define PCI_DEVICE_ID_LAVA_PORT_PLUS 0x0200 /* 2x 16650 */ -#define PCI_DEVICE_ID_LAVA_QUAD_A 0x0201 /* 2x 16650, half of 4 port */ -#define PCI_DEVICE_ID_LAVA_QUAD_B 0x0202 /* 2x 16650, half of 4 port */ -#define PCI_DEVICE_ID_LAVA_SSERIAL 0x0500 /* 1x 16550 */ -#define PCI_DEVICE_ID_LAVA_PORT_650 0x0600 /* 1x 16650 */ -#define PCI_DEVICE_ID_LAVA_PARALLEL 0x8000 -#define PCI_DEVICE_ID_LAVA_DUAL_PAR_A 0x8002 /* The Lava Dual Parallel is */ -#define PCI_DEVICE_ID_LAVA_DUAL_PAR_B 0x8003 /* two PCI devices on a card */ -#define PCI_DEVICE_ID_LAVA_BOCA_IOPPAR 0x8800 - -#define PCI_VENDOR_ID_TIMEDIA 0x1409 -#define PCI_DEVICE_ID_TIMEDIA_1889 0x7168 - -#define PCI_VENDOR_ID_OXSEMI 0x1415 -#define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403 -#define PCI_DEVICE_ID_OXSEMI_16PCI954 0x9501 -#define PCI_DEVICE_ID_OXSEMI_16PCI95N 0x9511 -#define PCI_DEVICE_ID_OXSEMI_16PCI954PP 0x9513 -#define PCI_DEVICE_ID_OXSEMI_16PCI952 0x9521 - -#define PCI_VENDOR_ID_AIRONET 0x14b9 -#define PCI_DEVICE_ID_AIRONET_4800_1 0x0001 -#define PCI_DEVICE_ID_AIRONET_4800 0x4500 // values switched? see -#define PCI_DEVICE_ID_AIRONET_4500 0x4800 // drivers/net/aironet4500_card.c - -#define PCI_VENDOR_ID_TITAN 0x14D2 -#define PCI_DEVICE_ID_TITAN_010L 0x8001 -#define PCI_DEVICE_ID_TITAN_100L 0x8010 -#define PCI_DEVICE_ID_TITAN_110L 0x8011 -#define PCI_DEVICE_ID_TITAN_200L 0x8020 -#define PCI_DEVICE_ID_TITAN_210L 0x8021 -#define PCI_DEVICE_ID_TITAN_400L 0x8040 -#define PCI_DEVICE_ID_TITAN_800L 0x8080 -#define PCI_DEVICE_ID_TITAN_100 0xA001 -#define PCI_DEVICE_ID_TITAN_200 0xA005 -#define PCI_DEVICE_ID_TITAN_400 0xA003 -#define PCI_DEVICE_ID_TITAN_800B 0xA004 - -#define PCI_VENDOR_ID_PANACOM 0x14d4 -#define PCI_DEVICE_ID_PANACOM_QUADMODEM 0x0400 -#define PCI_DEVICE_ID_PANACOM_DUALMODEM 0x0402 - -#define PCI_VENDOR_ID_AFAVLAB 0x14db -#define PCI_DEVICE_ID_AFAVLAB_TK9902 0x2120 -#define PCI_DEVICE_ID_AFAVLAB_P028 0x2180 - -#define PCI_VENDOR_ID_BROADCOM 0x14e4 -#define PCI_DEVICE_ID_TIGON3_5700 0x1644 -#define PCI_DEVICE_ID_TIGON3_5701 0x1645 -#define PCI_DEVICE_ID_TIGON3_5702 0x1646 -#define PCI_DEVICE_ID_TIGON3_5703 0x1647 -#define PCI_DEVICE_ID_TIGON3_5702FE 0x164d -#define PCI_DEVICE_ID_TIGON3_5702X 0x16a6 -#define PCI_DEVICE_ID_TIGON3_5703X 0x16a7 - -#define PCI_VENDOR_ID_SYBA 0x1592 -#define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 -#define PCI_DEVICE_ID_SYBA_1P_ECP 0x0783 - -#define PCI_VENDOR_ID_MORETON 0x15aa -#define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 - -#define PCI_VENDOR_ID_ZOLTRIX 0x15b0 -#define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 - -#define PCI_VENDOR_ID_PDC 0x15e9 -#define PCI_DEVICE_ID_PDC_1841 0x1841 - -#define PCI_VENDOR_ID_RDC 0x17f3 -#define PCI_DEVICE_ID_RDC_R8610_NB 0x6020 -#define PCI_DEVICE_ID_RDC_R8610_SB 0x6030 - -#define PCI_VENDOR_ID_ALTIMA 0x173b -#define PCI_DEVICE_ID_ALTIMA_AC1000 0x03e8 -#define PCI_DEVICE_ID_ALTIMA_AC9100 0x03ea - -#define PCI_VENDOR_ID_GLI 0x17a0 -#define PCI_DEVICE_ID_GLI_9750 0x9750 -#define PCI_DEVICE_ID_GLI_9755 0x9755 -#define PCI_DEVICE_ID_GLI_9763E 0xe763 - -#define PCI_VENDOR_ID_XGI 0x18ca -#define PCI_DEVICE_ID_XGI_20 0x0020 -#define PCI_DEVICE_ID_XGI_40 0x0040 - -#define PCI_VENDOR_ID_ASPEED 0x1a03 -#define PCI_DEVICE_ID_ASPEED_AST2050_VGA 0x2000 - -#define PCI_VENDOR_ID_SYMPHONY 0x1c1c -#define PCI_DEVICE_ID_SYMPHONY_101 0x0001 - -#define PCI_VENDOR_ID_TEKRAM 0x1de1 -#define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 - -#define PCI_VENDOR_ID_3DLABS 0x3d3d -#define PCI_DEVICE_ID_3DLABS_300SX 0x0001 -#define PCI_DEVICE_ID_3DLABS_500TX 0x0002 -#define PCI_DEVICE_ID_3DLABS_DELTA 0x0003 -#define PCI_DEVICE_ID_3DLABS_PERMEDIA 0x0004 -#define PCI_DEVICE_ID_3DLABS_MX 0x0006 -#define PCI_DEVICE_ID_3DLABS_PERMEDIA2 0x0007 -#define PCI_DEVICE_ID_3DLABS_GAMMA 0x0008 -#define PCI_DEVICE_ID_3DLABS_PERMEDIA2V 0x0009 - -#define PCI_VENDOR_ID_AVANCE 0x4005 -#define PCI_DEVICE_ID_AVANCE_ALG2064 0x2064 -#define PCI_DEVICE_ID_AVANCE_2302 0x2302 - -#define PCI_VENDOR_ID_AKS 0x416c -#define PCI_DEVICE_ID_AKS_ALADDINCARD 0x0100 -#define PCI_DEVICE_ID_AKS_CPC 0x0200 - -#define PCI_VENDOR_ID_NETVIN 0x4a14 -#define PCI_DEVICE_ID_NETVIN_NV5000SC 0x5000 - -#define PCI_VENDOR_ID_S3 0x5333 -#define PCI_DEVICE_ID_S3_PLATO_PXS 0x0551 -#define PCI_DEVICE_ID_S3_ViRGE 0x5631 -#define PCI_DEVICE_ID_S3_TRIO 0x8811 -#define PCI_DEVICE_ID_S3_AURORA64VP 0x8812 -#define PCI_DEVICE_ID_S3_TRIO64UVP 0x8814 -#define PCI_DEVICE_ID_S3_ViRGE_VX 0x883d -#define PCI_DEVICE_ID_S3_868 0x8880 -#define PCI_DEVICE_ID_S3_928 0x88b0 -#define PCI_DEVICE_ID_S3_864_1 0x88c0 -#define PCI_DEVICE_ID_S3_864_2 0x88c1 -#define PCI_DEVICE_ID_S3_964_1 0x88d0 -#define PCI_DEVICE_ID_S3_964_2 0x88d1 -#define PCI_DEVICE_ID_S3_968 0x88f0 -#define PCI_DEVICE_ID_S3_TRIO64V2 0x8901 -#define PCI_DEVICE_ID_S3_PLATO_PXG 0x8902 -#define PCI_DEVICE_ID_S3_ViRGE_DXGX 0x8a01 -#define PCI_DEVICE_ID_S3_ViRGE_GX2 0x8a10 -#define PCI_DEVICE_ID_S3_ViRGE_MX 0x8c01 -#define PCI_DEVICE_ID_S3_ViRGE_MXP 0x8c02 -#define PCI_DEVICE_ID_S3_ViRGE_MXPMV 0x8c03 -#define PCI_DEVICE_ID_S3_SONICVIBES 0xca00 - -#define PCI_VENDOR_ID_DUNORD 0x5544 -#define PCI_DEVICE_ID_DUNORD_I3000 0x0001 -#define PCI_VENDOR_ID_GENROCO 0x5555 -#define PCI_DEVICE_ID_GENROCO_HFP832 0x0003 - -#define PCI_VENDOR_ID_DCI 0x6666 -#define PCI_DEVICE_ID_DCI_PCCOM4 0x0001 -#define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 - -#define PCI_VENDOR_ID_INTEL 0x8086 -#define PCI_DEVICE_ID_INTEL_21145 0x0039 -#define PCI_DEVICE_ID_INTEL_82375 0x0482 -#define PCI_DEVICE_ID_INTEL_82424 0x0483 -#define PCI_DEVICE_ID_INTEL_82378 0x0484 -#define PCI_DEVICE_ID_INTEL_82430 0x0486 -#define PCI_DEVICE_ID_INTEL_82434 0x04a3 -#define PCI_DEVICE_ID_INTEL_I960 0x0960 -#define PCI_DEVICE_ID_INTEL_82562ET 0x1031 -#define PCI_DEVICE_ID_INTEL_82559ER 0x1209 -#define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 -#define PCI_DEVICE_ID_INTEL_82092AA_1 0x1222 -#define PCI_DEVICE_ID_INTEL_7116 0x1223 -#define PCI_DEVICE_ID_INTEL_82596 0x1226 -#define PCI_DEVICE_ID_INTEL_82865 0x1227 -#define PCI_DEVICE_ID_INTEL_82557 0x1229 -#define PCI_DEVICE_ID_INTEL_82437 0x122d -#define PCI_DEVICE_ID_INTEL_82441 0x1237 -#define PCI_DEVICE_ID_INTEL_82380FB 0x124b -#define PCI_DEVICE_ID_INTEL_82439 0x1250 -#define PCI_DEVICE_ID_INTEL_80960_RP 0x1960 -#define PCI_DEVICE_ID_INTEL_82437VX 0x7030 -#define PCI_DEVICE_ID_INTEL_82439TX 0x7100 -#define PCI_DEVICE_ID_INTEL_CNL_ISHB 0x9dfc -#define PCI_DEVICE_ID_INTEL_CML_ISHB 0x02fc -#define PCI_DEVICE_ID_INTEL_TGL_ISHB 0xa0fc -#define PCI_DEVICE_ID_INTEL_TGL_H_ISHB 0x43fc +#define PCI_VID_KAWASAKI 0x136b +#define PCI_DID_MCHIP_KL5A72002 0xff01 + +#define PCI_VID_LMC 0x1376 +#define PCI_DID_LMC_HSSI 0x0003 +#define PCI_DID_LMC_DS3 0x0004 +#define PCI_DID_LMC_SSI 0x0005 +#define PCI_DID_LMC_T1 0x0006 + +#define PCI_VID_NETGEAR 0x1385 +#define PCI_DID_NETGEAR_GA620 0x620a +#define PCI_DID_NETGEAR_GA622 0x622a + +#define PCI_VID_APPLICOM 0x1389 +#define PCI_DID_APPLICOM_PCIGENERIC 0x0001 +#define PCI_DID_APPLICOM_PCI2000IBS_CAN 0x0002 +#define PCI_DID_APPLICOM_PCI2000PFB 0x0003 + +#define PCI_VID_MOXA 0x1393 +#define PCI_DID_MOXA_C104 0x1040 +#define PCI_DID_MOXA_C168 0x1680 +#define PCI_DID_MOXA_CP204J 0x2040 +#define PCI_DID_MOXA_C218 0x2180 +#define PCI_DID_MOXA_C320 0x3200 + +#define PCI_VID_CCD 0x1397 +#define PCI_DID_CCD_2BD0 0x2bd0 +#define PCI_DID_CCD_B000 0xb000 +#define PCI_DID_CCD_B006 0xb006 +#define PCI_DID_CCD_B007 0xb007 +#define PCI_DID_CCD_B008 0xb008 +#define PCI_DID_CCD_B009 0xb009 +#define PCI_DID_CCD_B00A 0xb00a +#define PCI_DID_CCD_B00B 0xb00b +#define PCI_DID_CCD_B00C 0xb00c +#define PCI_DID_CCD_B100 0xb100 + +#define PCI_VID_NOKIA 0x13B8 +#define PCI_VID_NOKIA_WIRELESS 0x1603 +#define PCI_VID_NOKIA_HOME 0x1622 + +#define PCI_VID_3WARE 0x13C1 +#define PCI_DID_3WARE_1000 0x1000 + +#define PCI_VID_ABOCOM 0x13D1 +#define PCI_DID_ABOCOM_2BD1 0x2BD1 + +#define PCI_VID_CMEDIA 0x13f6 +#define PCI_DID_CMEDIA_CM8338A 0x0100 +#define PCI_DID_CMEDIA_CM8338B 0x0101 +#define PCI_DID_CMEDIA_CM8738 0x0111 +#define PCI_DID_CMEDIA_CM8738B 0x0112 + +#define PCI_VID_LAVA 0x1407 +#define PCI_DID_LAVA_DSERIAL 0x0100 /* 2x 16550 */ +#define PCI_DID_LAVA_QUATRO_A 0x0101 /* 2x 16550, half of 4 port */ +#define PCI_DID_LAVA_QUATRO_B 0x0102 /* 2x 16550, half of 4 port */ +#define PCI_DID_LAVA_OCTO_A 0x0180 /* 4x 16550A, half of 8 port */ +#define PCI_DID_LAVA_OCTO_B 0x0181 /* 4x 16550A, half of 8 port */ +#define PCI_DID_LAVA_PORT_PLUS 0x0200 /* 2x 16650 */ +#define PCI_DID_LAVA_QUAD_A 0x0201 /* 2x 16650, half of 4 port */ +#define PCI_DID_LAVA_QUAD_B 0x0202 /* 2x 16650, half of 4 port */ +#define PCI_DID_LAVA_SSERIAL 0x0500 /* 1x 16550 */ +#define PCI_DID_LAVA_PORT_650 0x0600 /* 1x 16650 */ +#define PCI_DID_LAVA_PARALLEL 0x8000 +#define PCI_DID_LAVA_DUAL_PAR_A 0x8002 /* The Lava Dual Parallel is */ +#define PCI_DID_LAVA_DUAL_PAR_B 0x8003 /* two PCI devices on a card */ +#define PCI_DID_LAVA_BOCA_IOPPAR 0x8800 + +#define PCI_VID_TIMEDIA 0x1409 +#define PCI_DID_TIMEDIA_1889 0x7168 + +#define PCI_VID_OXSEMI 0x1415 +#define PCI_DID_OXSEMI_12PCI840 0x8403 +#define PCI_DID_OXSEMI_16PCI954 0x9501 +#define PCI_DID_OXSEMI_16PCI95N 0x9511 +#define PCI_DID_OXSEMI_16PCI954PP 0x9513 +#define PCI_DID_OXSEMI_16PCI952 0x9521 + +#define PCI_VID_AIRONET 0x14b9 +#define PCI_DID_AIRONET_4800_1 0x0001 +#define PCI_DID_AIRONET_4800 0x4500 // values switched? see +#define PCI_DID_AIRONET_4500 0x4800 // drivers/net/aironet4500_card.c + +#define PCI_VID_TITAN 0x14D2 +#define PCI_DID_TITAN_010L 0x8001 +#define PCI_DID_TITAN_100L 0x8010 +#define PCI_DID_TITAN_110L 0x8011 +#define PCI_DID_TITAN_200L 0x8020 +#define PCI_DID_TITAN_210L 0x8021 +#define PCI_DID_TITAN_400L 0x8040 +#define PCI_DID_TITAN_800L 0x8080 +#define PCI_DID_TITAN_100 0xA001 +#define PCI_DID_TITAN_200 0xA005 +#define PCI_DID_TITAN_400 0xA003 +#define PCI_DID_TITAN_800B 0xA004 + +#define PCI_VID_PANACOM 0x14d4 +#define PCI_DID_PANACOM_QUADMODEM 0x0400 +#define PCI_DID_PANACOM_DUALMODEM 0x0402 + +#define PCI_VID_AFAVLAB 0x14db +#define PCI_DID_AFAVLAB_TK9902 0x2120 +#define PCI_DID_AFAVLAB_P028 0x2180 + +#define PCI_VID_BROADCOM 0x14e4 +#define PCI_DID_TIGON3_5700 0x1644 +#define PCI_DID_TIGON3_5701 0x1645 +#define PCI_DID_TIGON3_5702 0x1646 +#define PCI_DID_TIGON3_5703 0x1647 +#define PCI_DID_TIGON3_5702FE 0x164d +#define PCI_DID_TIGON3_5702X 0x16a6 +#define PCI_DID_TIGON3_5703X 0x16a7 + +#define PCI_VID_SYBA 0x1592 +#define PCI_DID_SYBA_2P_EPP 0x0782 +#define PCI_DID_SYBA_1P_ECP 0x0783 + +#define PCI_VID_MORETON 0x15aa +#define PCI_DID_RASTEL_2PORT 0x2000 + +#define PCI_VID_ZOLTRIX 0x15b0 +#define PCI_DID_ZOLTRIX_2BD0 0x2bd0 + +#define PCI_VID_PDC 0x15e9 +#define PCI_DID_PDC_1841 0x1841 + +#define PCI_VID_RDC 0x17f3 +#define PCI_DID_RDC_R8610_NB 0x6020 +#define PCI_DID_RDC_R8610_SB 0x6030 + +#define PCI_VID_ALTIMA 0x173b +#define PCI_DID_ALTIMA_AC1000 0x03e8 +#define PCI_DID_ALTIMA_AC9100 0x03ea + +#define PCI_VID_GLI 0x17a0 +#define PCI_DID_GLI_9750 0x9750 +#define PCI_DID_GLI_9755 0x9755 +#define PCI_DID_GLI_9763E 0xe763 + +#define PCI_VID_XGI 0x18ca +#define PCI_DID_XGI_20 0x0020 +#define PCI_DID_XGI_40 0x0040 + +#define PCI_VID_ASPEED 0x1a03 +#define PCI_DID_ASPEED_AST2050_VGA 0x2000 + +#define PCI_VID_SYMPHONY 0x1c1c +#define PCI_DID_SYMPHONY_101 0x0001 + +#define PCI_VID_TEKRAM 0x1de1 +#define PCI_DID_TEKRAM_DC290 0xdc29 + +#define PCI_VID_3DLABS 0x3d3d +#define PCI_DID_3DLABS_300SX 0x0001 +#define PCI_DID_3DLABS_500TX 0x0002 +#define PCI_DID_3DLABS_DELTA 0x0003 +#define PCI_DID_3DLABS_PERMEDIA 0x0004 +#define PCI_DID_3DLABS_MX 0x0006 +#define PCI_DID_3DLABS_PERMEDIA2 0x0007 +#define PCI_DID_3DLABS_GAMMA 0x0008 +#define PCI_DID_3DLABS_PERMEDIA2V 0x0009 + +#define PCI_VID_AVANCE 0x4005 +#define PCI_DID_AVANCE_ALG2064 0x2064 +#define PCI_DID_AVANCE_2302 0x2302 + +#define PCI_VID_AKS 0x416c +#define PCI_DID_AKS_ALADDINCARD 0x0100 +#define PCI_DID_AKS_CPC 0x0200 + +#define PCI_VID_NETVIN 0x4a14 +#define PCI_DID_NETVIN_NV5000SC 0x5000 + +#define PCI_VID_S3 0x5333 +#define PCI_DID_S3_PLATO_PXS 0x0551 +#define PCI_DID_S3_ViRGE 0x5631 +#define PCI_DID_S3_TRIO 0x8811 +#define PCI_DID_S3_AURORA64VP 0x8812 +#define PCI_DID_S3_TRIO64UVP 0x8814 +#define PCI_DID_S3_ViRGE_VX 0x883d +#define PCI_DID_S3_868 0x8880 +#define PCI_DID_S3_928 0x88b0 +#define PCI_DID_S3_864_1 0x88c0 +#define PCI_DID_S3_864_2 0x88c1 +#define PCI_DID_S3_964_1 0x88d0 +#define PCI_DID_S3_964_2 0x88d1 +#define PCI_DID_S3_968 0x88f0 +#define PCI_DID_S3_TRIO64V2 0x8901 +#define PCI_DID_S3_PLATO_PXG 0x8902 +#define PCI_DID_S3_ViRGE_DXGX 0x8a01 +#define PCI_DID_S3_ViRGE_GX2 0x8a10 +#define PCI_DID_S3_ViRGE_MX 0x8c01 +#define PCI_DID_S3_ViRGE_MXP 0x8c02 +#define PCI_DID_S3_ViRGE_MXPMV 0x8c03 +#define PCI_DID_S3_SONICVIBES 0xca00 + +#define PCI_VID_DUNORD 0x5544 +#define PCI_DID_DUNORD_I3000 0x0001 +#define PCI_VID_GENROCO 0x5555 +#define PCI_DID_GENROCO_HFP832 0x0003 + +#define PCI_VID_DCI 0x6666 +#define PCI_DID_DCI_PCCOM4 0x0001 +#define PCI_DID_DCI_PCCOM8 0x0002 + +#define PCI_VID_INTEL 0x8086 +#define PCI_DID_INTEL_21145 0x0039 +#define PCI_DID_INTEL_82375 0x0482 +#define PCI_DID_INTEL_82424 0x0483 +#define PCI_DID_INTEL_82378 0x0484 +#define PCI_DID_INTEL_82430 0x0486 +#define PCI_DID_INTEL_82434 0x04a3 +#define PCI_DID_INTEL_I960 0x0960 +#define PCI_DID_INTEL_82562ET 0x1031 +#define PCI_DID_INTEL_82559ER 0x1209 +#define PCI_DID_INTEL_82092AA_0 0x1221 +#define PCI_DID_INTEL_82092AA_1 0x1222 +#define PCI_DID_INTEL_7116 0x1223 +#define PCI_DID_INTEL_82596 0x1226 +#define PCI_DID_INTEL_82865 0x1227 +#define PCI_DID_INTEL_82557 0x1229 +#define PCI_DID_INTEL_82437 0x122d +#define PCI_DID_INTEL_82441 0x1237 +#define PCI_DID_INTEL_82380FB 0x124b +#define PCI_DID_INTEL_82439 0x1250 +#define PCI_DID_INTEL_80960_RP 0x1960 +#define PCI_DID_INTEL_82437VX 0x7030 +#define PCI_DID_INTEL_82439TX 0x7100 +#define PCI_DID_INTEL_CNL_ISHB 0x9dfc +#define PCI_DID_INTEL_CML_ISHB 0x02fc +#define PCI_DID_INTEL_TGL_ISHB 0xa0fc +#define PCI_DID_INTEL_TGL_H_ISHB 0x43fc /* Intel 82371FB (PIIX) */ -#define PCI_DEVICE_ID_INTEL_82371FB_ISA 0x122e -#define PCI_DEVICE_ID_INTEL_82371FB_IDE 0x1230 +#define PCI_DID_INTEL_82371FB_ISA 0x122e +#define PCI_DID_INTEL_82371FB_IDE 0x1230 /* Intel 82371SB (PIIX3) */ -#define PCI_DEVICE_ID_INTEL_82371SB_ISA 0x7000 -#define PCI_DEVICE_ID_INTEL_82371SB_IDE 0x7010 -#define PCI_DEVICE_ID_INTEL_82371SB_USB 0x7020 +#define PCI_DID_INTEL_82371SB_ISA 0x7000 +#define PCI_DID_INTEL_82371SB_IDE 0x7010 +#define PCI_DID_INTEL_82371SB_USB 0x7020 /* Intel 82371MX (MPIIX) */ -#define PCI_DEVICE_ID_INTEL_82371MX_ISA_IDE 0x1234 +#define PCI_DID_INTEL_82371MX_ISA_IDE 0x1234 /* Intel 82437MX (part of the 430MX chipset) */ -#define PCI_DEVICE_ID_INTEL_82437MX_ISA_IDE 0x1235 +#define PCI_DID_INTEL_82437MX_ISA_IDE 0x1235 /* Intel 82371AB/EB/MB (PIIX4/PIIX4E/PIIX4M) */ /* The 440MX (82443MX) consists of 82443BX + 82371EB (uses same PCI IDs). */ -#define PCI_DEVICE_ID_INTEL_82371AB_ISA 0x7110 -#define PCI_DEVICE_ID_INTEL_82371AB_IDE 0x7111 -#define PCI_DEVICE_ID_INTEL_82371AB_USB 0x7112 -#define PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI 0x7113 +#define PCI_DID_INTEL_82371AB_ISA 0x7110 +#define PCI_DID_INTEL_82371AB_IDE 0x7111 +#define PCI_DID_INTEL_82371AB_USB 0x7112 +#define PCI_DID_INTEL_82371AB_SMB_ACPI 0x7113 /* Intel 82801AA (ICH) */ -#define PCI_DEVICE_ID_INTEL_82801AA_LPC 0x2410 -#define PCI_DEVICE_ID_INTEL_82801AA_IDE 0x2411 -#define PCI_DEVICE_ID_INTEL_82801AA_USB 0x2412 -#define PCI_DEVICE_ID_INTEL_82801AA_SMB 0x2413 -#define PCI_DEVICE_ID_INTEL_82801AA_AC97_AUDIO 0x2415 -#define PCI_DEVICE_ID_INTEL_82801AA_AC97_MODEM 0x2416 -#define PCI_DEVICE_ID_INTEL_82801AA_PCI 0x2418 +#define PCI_DID_INTEL_82801AA_LPC 0x2410 +#define PCI_DID_INTEL_82801AA_IDE 0x2411 +#define PCI_DID_INTEL_82801AA_USB 0x2412 +#define PCI_DID_INTEL_82801AA_SMB 0x2413 +#define PCI_DID_INTEL_82801AA_AC97_AUDIO 0x2415 +#define PCI_DID_INTEL_82801AA_AC97_MODEM 0x2416 +#define PCI_DID_INTEL_82801AA_PCI 0x2418 /* Intel 82801AB (ICH0) */ -#define PCI_DEVICE_ID_INTEL_82801AB_LPC 0x2420 -#define PCI_DEVICE_ID_INTEL_82801AB_IDE 0x2421 -#define PCI_DEVICE_ID_INTEL_82801AB_USB 0x2422 -#define PCI_DEVICE_ID_INTEL_82801AB_SMB 0x2423 -#define PCI_DEVICE_ID_INTEL_82801AB_AC97_AUDIO 0x2425 -#define PCI_DEVICE_ID_INTEL_82801AB_AC97_MODEM 0x2426 -#define PCI_DEVICE_ID_INTEL_82801AB_PCI 0x2428 +#define PCI_DID_INTEL_82801AB_LPC 0x2420 +#define PCI_DID_INTEL_82801AB_IDE 0x2421 +#define PCI_DID_INTEL_82801AB_USB 0x2422 +#define PCI_DID_INTEL_82801AB_SMB 0x2423 +#define PCI_DID_INTEL_82801AB_AC97_AUDIO 0x2425 +#define PCI_DID_INTEL_82801AB_AC97_MODEM 0x2426 +#define PCI_DID_INTEL_82801AB_PCI 0x2428 /* Intel 82801BA (ICH2) */ -#define PCI_DEVICE_ID_INTEL_82801BA_LPC 0x2440 -#define PCI_DEVICE_ID_INTEL_82801BA_USB1 0x2442 -#define PCI_DEVICE_ID_INTEL_82801BA_SMB 0x2443 -#define PCI_DEVICE_ID_INTEL_82801BA_USB2 0x2444 -#define PCI_DEVICE_ID_INTEL_82801BA_AC97_AUDIO 0x2445 -#define PCI_DEVICE_ID_INTEL_82801BA_AC97_MODEM 0x2446 -#define PCI_DEVICE_ID_INTEL_82801BA_LAN 0x2449 -#define PCI_DEVICE_ID_INTEL_82801BA_IDE 0x244b -#define PCI_DEVICE_ID_INTEL_82801BA_PCI 0x244e +#define PCI_DID_INTEL_82801BA_LPC 0x2440 +#define PCI_DID_INTEL_82801BA_USB1 0x2442 +#define PCI_DID_INTEL_82801BA_SMB 0x2443 +#define PCI_DID_INTEL_82801BA_USB2 0x2444 +#define PCI_DID_INTEL_82801BA_AC97_AUDIO 0x2445 +#define PCI_DID_INTEL_82801BA_AC97_MODEM 0x2446 +#define PCI_DID_INTEL_82801BA_LAN 0x2449 +#define PCI_DID_INTEL_82801BA_IDE 0x244b +#define PCI_DID_INTEL_82801BA_PCI 0x244e /* Intel 82801BAM (ICH2-M) */ -#define PCI_DEVICE_ID_INTEL_82801BAM_USB1 0x2442 -#define PCI_DEVICE_ID_INTEL_82801BAM_SMB 0x2443 -#define PCI_DEVICE_ID_INTEL_82801BAM_USB2 0x2444 -#define PCI_DEVICE_ID_INTEL_82801BAM_AC97_AUDIO 0x2445 -#define PCI_DEVICE_ID_INTEL_82801BAM_AC97_MODEM 0x2446 -#define PCI_DEVICE_ID_INTEL_82801BAM_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801BAM_LAN 0x2449 -#define PCI_DEVICE_ID_INTEL_82801BAM_IDE 0x244a -#define PCI_DEVICE_ID_INTEL_82801BAM_LPC 0x244c +#define PCI_DID_INTEL_82801BAM_USB1 0x2442 +#define PCI_DID_INTEL_82801BAM_SMB 0x2443 +#define PCI_DID_INTEL_82801BAM_USB2 0x2444 +#define PCI_DID_INTEL_82801BAM_AC97_AUDIO 0x2445 +#define PCI_DID_INTEL_82801BAM_AC97_MODEM 0x2446 +#define PCI_DID_INTEL_82801BAM_PCI 0x2448 +#define PCI_DID_INTEL_82801BAM_LAN 0x2449 +#define PCI_DID_INTEL_82801BAM_IDE 0x244a +#define PCI_DID_INTEL_82801BAM_LPC 0x244c /* Intel 82801CA (ICH3-S) */ -#define PCI_DEVICE_ID_INTEL_82801CA_LAN 0x2449 -#define PCI_DEVICE_ID_INTEL_82801CA_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801CA_LPC 0x2480 -#define PCI_DEVICE_ID_INTEL_82801CA_USB1 0x2482 -#define PCI_DEVICE_ID_INTEL_82801CA_SMB 0x2483 -#define PCI_DEVICE_ID_INTEL_82801CA_USB2 0x2484 -#define PCI_DEVICE_ID_INTEL_82801CA_AC97_AUDIO 0x2485 -#define PCI_DEVICE_ID_INTEL_82801CA_AC97_MODEM 0x2486 -#define PCI_DEVICE_ID_INTEL_82801CA_USB3 0x2487 -#define PCI_DEVICE_ID_INTEL_82801CA_IDE 0x248b +#define PCI_DID_INTEL_82801CA_LAN 0x2449 +#define PCI_DID_INTEL_82801CA_PCI 0x244e +#define PCI_DID_INTEL_82801CA_LPC 0x2480 +#define PCI_DID_INTEL_82801CA_USB1 0x2482 +#define PCI_DID_INTEL_82801CA_SMB 0x2483 +#define PCI_DID_INTEL_82801CA_USB2 0x2484 +#define PCI_DID_INTEL_82801CA_AC97_AUDIO 0x2485 +#define PCI_DID_INTEL_82801CA_AC97_MODEM 0x2486 +#define PCI_DID_INTEL_82801CA_USB3 0x2487 +#define PCI_DID_INTEL_82801CA_IDE 0x248b /* Intel 82801CAM (ICH3-M) */ -#define PCI_DEVICE_ID_INTEL_82801CAM_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801CAM_LAN 0x2449 -#define PCI_DEVICE_ID_INTEL_82801CAM_USB1 0x2482 -#define PCI_DEVICE_ID_INTEL_82801CAM_SMB 0x2483 -#define PCI_DEVICE_ID_INTEL_82801CAM_USB2 0x2484 -#define PCI_DEVICE_ID_INTEL_82801CAM_AC97_AUDIO 0x2485 -#define PCI_DEVICE_ID_INTEL_82801CAM_AC97_MODEM 0x2486 -#define PCI_DEVICE_ID_INTEL_82801CAM_USB3 0x2487 -#define PCI_DEVICE_ID_INTEL_82801CAM_IDE 0x248a -#define PCI_DEVICE_ID_INTEL_82801CAM_LPC 0x248c +#define PCI_DID_INTEL_82801CAM_PCI 0x2448 +#define PCI_DID_INTEL_82801CAM_LAN 0x2449 +#define PCI_DID_INTEL_82801CAM_USB1 0x2482 +#define PCI_DID_INTEL_82801CAM_SMB 0x2483 +#define PCI_DID_INTEL_82801CAM_USB2 0x2484 +#define PCI_DID_INTEL_82801CAM_AC97_AUDIO 0x2485 +#define PCI_DID_INTEL_82801CAM_AC97_MODEM 0x2486 +#define PCI_DID_INTEL_82801CAM_USB3 0x2487 +#define PCI_DID_INTEL_82801CAM_IDE 0x248a +#define PCI_DID_INTEL_82801CAM_LPC 0x248c /* Intel 82801DB (ICH4) */ -#define PCI_DEVICE_ID_INTEL_82801DB_LAN 0x103a -#define PCI_DEVICE_ID_INTEL_82801DB_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801DB_LPC 0x24c0 -#define PCI_DEVICE_ID_INTEL_82801DB_USB1 0x24c2 -#define PCI_DEVICE_ID_INTEL_82801DB_SMB 0x24c3 -#define PCI_DEVICE_ID_INTEL_82801DB_USB2 0x24c4 -#define PCI_DEVICE_ID_INTEL_82801DB_AC97_AUDIO 0x24c5 -#define PCI_DEVICE_ID_INTEL_82801DB_AC97_MODEM 0x24c6 -#define PCI_DEVICE_ID_INTEL_82801DB_USB3 0x24c7 -#define PCI_DEVICE_ID_INTEL_82801DB_IDE 0x24cb -#define PCI_DEVICE_ID_INTEL_82801DB_EHCI 0x24cd +#define PCI_DID_INTEL_82801DB_LAN 0x103a +#define PCI_DID_INTEL_82801DB_PCI 0x244e +#define PCI_DID_INTEL_82801DB_LPC 0x24c0 +#define PCI_DID_INTEL_82801DB_USB1 0x24c2 +#define PCI_DID_INTEL_82801DB_SMB 0x24c3 +#define PCI_DID_INTEL_82801DB_USB2 0x24c4 +#define PCI_DID_INTEL_82801DB_AC97_AUDIO 0x24c5 +#define PCI_DID_INTEL_82801DB_AC97_MODEM 0x24c6 +#define PCI_DID_INTEL_82801DB_USB3 0x24c7 +#define PCI_DID_INTEL_82801DB_IDE 0x24cb +#define PCI_DID_INTEL_82801DB_EHCI 0x24cd /* Intel 82801DBL (ICH4-L) */ -#define PCI_DEVICE_ID_INTEL_82801DBL_LAN 0x103a -#define PCI_DEVICE_ID_INTEL_82801DBL_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801DBL_LPC 0x24c0 -#define PCI_DEVICE_ID_INTEL_82801DBL_IDE 0x24c1 -#define PCI_DEVICE_ID_INTEL_82801DBL_USB1 0x24c2 -#define PCI_DEVICE_ID_INTEL_82801DBL_SMB 0x24c3 -#define PCI_DEVICE_ID_INTEL_82801DBL_USB2 0x24c4 -#define PCI_DEVICE_ID_INTEL_82801DBL_AC97_AUDIO 0x24c5 -#define PCI_DEVICE_ID_INTEL_82801DBL_AC97_MODEM 0x24c6 -#define PCI_DEVICE_ID_INTEL_82801DBL_USB3 0x24c7 +#define PCI_DID_INTEL_82801DBL_LAN 0x103a +#define PCI_DID_INTEL_82801DBL_PCI 0x2448 +#define PCI_DID_INTEL_82801DBL_LPC 0x24c0 +#define PCI_DID_INTEL_82801DBL_IDE 0x24c1 +#define PCI_DID_INTEL_82801DBL_USB1 0x24c2 +#define PCI_DID_INTEL_82801DBL_SMB 0x24c3 +#define PCI_DID_INTEL_82801DBL_USB2 0x24c4 +#define PCI_DID_INTEL_82801DBL_AC97_AUDIO 0x24c5 +#define PCI_DID_INTEL_82801DBL_AC97_MODEM 0x24c6 +#define PCI_DID_INTEL_82801DBL_USB3 0x24c7 /* Intel 82801DBM (ICH4-M) */ -#define PCI_DEVICE_ID_INTEL_82801DBM_LAN 0x103a -#define PCI_DEVICE_ID_INTEL_82801DBM_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801DBM_USB1 0x24c2 -#define PCI_DEVICE_ID_INTEL_82801DBM_SMB 0x24c3 -#define PCI_DEVICE_ID_INTEL_82801DBM_USB2 0x24c4 -#define PCI_DEVICE_ID_INTEL_82801DBM_AC97_AUDIO 0x24c5 -#define PCI_DEVICE_ID_INTEL_82801DBM_AC97_MODEM 0x24c6 -#define PCI_DEVICE_ID_INTEL_82801DBM_USB3 0x24c7 -#define PCI_DEVICE_ID_INTEL_82801DBM_IDE 0x24ca -#define PCI_DEVICE_ID_INTEL_82801DBM_LPC 0x24cc -#define PCI_DEVICE_ID_INTEL_82801DBM_EHCI 0x24cd +#define PCI_DID_INTEL_82801DBM_LAN 0x103a +#define PCI_DID_INTEL_82801DBM_PCI 0x2448 +#define PCI_DID_INTEL_82801DBM_USB1 0x24c2 +#define PCI_DID_INTEL_82801DBM_SMB 0x24c3 +#define PCI_DID_INTEL_82801DBM_USB2 0x24c4 +#define PCI_DID_INTEL_82801DBM_AC97_AUDIO 0x24c5 +#define PCI_DID_INTEL_82801DBM_AC97_MODEM 0x24c6 +#define PCI_DID_INTEL_82801DBM_USB3 0x24c7 +#define PCI_DID_INTEL_82801DBM_IDE 0x24ca +#define PCI_DID_INTEL_82801DBM_LPC 0x24cc +#define PCI_DID_INTEL_82801DBM_EHCI 0x24cd /* Intel 82801EB (ICH5) */ -#define PCI_DEVICE_ID_INTEL_82801EB_LAN 0x1051 -#define PCI_DEVICE_ID_INTEL_82801EB_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801EB_LPC 0x24d0 -#define PCI_DEVICE_ID_INTEL_82801EB_SATA 0x24d1 -#define PCI_DEVICE_ID_INTEL_82801EB_USB1 0x24d2 -#define PCI_DEVICE_ID_INTEL_82801EB_SMB 0x24d3 -#define PCI_DEVICE_ID_INTEL_82801EB_USB2 0x24d4 -#define PCI_DEVICE_ID_INTEL_82801EB_AC97_AUDIO 0x24d5 -#define PCI_DEVICE_ID_INTEL_82801EB_AC97_MODEM 0x24d6 -#define PCI_DEVICE_ID_INTEL_82801EB_USB3 0x24d7 -#define PCI_DEVICE_ID_INTEL_82801EB_IDE 0x24db -#define PCI_DEVICE_ID_INTEL_82801EB_EHCI 0x24dd -#define PCI_DEVICE_ID_INTEL_82801EB_USB4 0x24de +#define PCI_DID_INTEL_82801EB_LAN 0x1051 +#define PCI_DID_INTEL_82801EB_PCI 0x244e +#define PCI_DID_INTEL_82801EB_LPC 0x24d0 +#define PCI_DID_INTEL_82801EB_SATA 0x24d1 +#define PCI_DID_INTEL_82801EB_USB1 0x24d2 +#define PCI_DID_INTEL_82801EB_SMB 0x24d3 +#define PCI_DID_INTEL_82801EB_USB2 0x24d4 +#define PCI_DID_INTEL_82801EB_AC97_AUDIO 0x24d5 +#define PCI_DID_INTEL_82801EB_AC97_MODEM 0x24d6 +#define PCI_DID_INTEL_82801EB_USB3 0x24d7 +#define PCI_DID_INTEL_82801EB_IDE 0x24db +#define PCI_DID_INTEL_82801EB_EHCI 0x24dd +#define PCI_DID_INTEL_82801EB_USB4 0x24de /* Intel 82801ER (ICH5R) */ -#define PCI_DEVICE_ID_INTEL_82801ER_LAN 0x1051 -#define PCI_DEVICE_ID_INTEL_82801ER_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801ER_LPC 0x24d0 -#define PCI_DEVICE_ID_INTEL_82801ER_USB1 0x24d2 -#define PCI_DEVICE_ID_INTEL_82801ER_SMB 0x24d3 -#define PCI_DEVICE_ID_INTEL_82801ER_USB2 0x24d4 -#define PCI_DEVICE_ID_INTEL_82801ER_AC97_AUDIO 0x24d5 -#define PCI_DEVICE_ID_INTEL_82801ER_AC97_MODEM 0x24d6 -#define PCI_DEVICE_ID_INTEL_82801ER_USB3 0x24d7 -#define PCI_DEVICE_ID_INTEL_82801ER_IDE 0x24db -#define PCI_DEVICE_ID_INTEL_82801ER_EHCI 0x24dd -#define PCI_DEVICE_ID_INTEL_82801ER_USB4 0x24de -#define PCI_DEVICE_ID_INTEL_82801ER_SATA 0x24df +#define PCI_DID_INTEL_82801ER_LAN 0x1051 +#define PCI_DID_INTEL_82801ER_PCI 0x244e +#define PCI_DID_INTEL_82801ER_LPC 0x24d0 +#define PCI_DID_INTEL_82801ER_USB1 0x24d2 +#define PCI_DID_INTEL_82801ER_SMB 0x24d3 +#define PCI_DID_INTEL_82801ER_USB2 0x24d4 +#define PCI_DID_INTEL_82801ER_AC97_AUDIO 0x24d5 +#define PCI_DID_INTEL_82801ER_AC97_MODEM 0x24d6 +#define PCI_DID_INTEL_82801ER_USB3 0x24d7 +#define PCI_DID_INTEL_82801ER_IDE 0x24db +#define PCI_DID_INTEL_82801ER_EHCI 0x24dd +#define PCI_DID_INTEL_82801ER_USB4 0x24de +#define PCI_DID_INTEL_82801ER_SATA 0x24df /* Intel 82801FB (ICH6) */ -#define PCI_DEVICE_ID_INTEL_82801FB_LAN 0x1065 -#define PCI_DEVICE_ID_INTEL_82801FB_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801FB_LPC 0x2640 -#define PCI_DEVICE_ID_INTEL_82801FB_SATA 0x2651 -#define PCI_DEVICE_ID_INTEL_82801FB_USB1 0x2658 -#define PCI_DEVICE_ID_INTEL_82801FB_USB2 0x2659 -#define PCI_DEVICE_ID_INTEL_82801FB_USB3 0x265a -#define PCI_DEVICE_ID_INTEL_82801FB_USB4 0x265b -#define PCI_DEVICE_ID_INTEL_82801FB_EHCI 0x265c -#define PCI_DEVICE_ID_INTEL_82801FB_PCIE1 0x2660 -#define PCI_DEVICE_ID_INTEL_82801FB_PCIE2 0x2662 -#define PCI_DEVICE_ID_INTEL_82801FB_PCIE3 0x2664 -#define PCI_DEVICE_ID_INTEL_82801FB_PCIE4 0x2666 -#define PCI_DEVICE_ID_INTEL_82801FB_HD_AUDIO 0x2668 -#define PCI_DEVICE_ID_INTEL_82801FB_SMB 0x266a -#define PCI_DEVICE_ID_INTEL_82801FB_AC97_MODEM 0x266d -#define PCI_DEVICE_ID_INTEL_82801FB_AC97_AUDIO 0x266e -#define PCI_DEVICE_ID_INTEL_82801FB_IDE 0x266f +#define PCI_DID_INTEL_82801FB_LAN 0x1065 +#define PCI_DID_INTEL_82801FB_PCI 0x244e +#define PCI_DID_INTEL_82801FB_LPC 0x2640 +#define PCI_DID_INTEL_82801FB_SATA 0x2651 +#define PCI_DID_INTEL_82801FB_USB1 0x2658 +#define PCI_DID_INTEL_82801FB_USB2 0x2659 +#define PCI_DID_INTEL_82801FB_USB3 0x265a +#define PCI_DID_INTEL_82801FB_USB4 0x265b +#define PCI_DID_INTEL_82801FB_EHCI 0x265c +#define PCI_DID_INTEL_82801FB_PCIE1 0x2660 +#define PCI_DID_INTEL_82801FB_PCIE2 0x2662 +#define PCI_DID_INTEL_82801FB_PCIE3 0x2664 +#define PCI_DID_INTEL_82801FB_PCIE4 0x2666 +#define PCI_DID_INTEL_82801FB_HD_AUDIO 0x2668 +#define PCI_DID_INTEL_82801FB_SMB 0x266a +#define PCI_DID_INTEL_82801FB_AC97_MODEM 0x266d +#define PCI_DID_INTEL_82801FB_AC97_AUDIO 0x266e +#define PCI_DID_INTEL_82801FB_IDE 0x266f /* Intel 82801FR (ICH6R) */ -#define PCI_DEVICE_ID_INTEL_82801FR_LAN 0x1065 -#define PCI_DEVICE_ID_INTEL_82801FR_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801FR_LPC 0x2640 -#define PCI_DEVICE_ID_INTEL_82801FR_SATA 0x2652 -#define PCI_DEVICE_ID_INTEL_82801FR_USB1 0x2658 -#define PCI_DEVICE_ID_INTEL_82801FR_USB2 0x2659 -#define PCI_DEVICE_ID_INTEL_82801FR_USB3 0x265a -#define PCI_DEVICE_ID_INTEL_82801FR_USB4 0x265b -#define PCI_DEVICE_ID_INTEL_82801FR_EHCI 0x265c -#define PCI_DEVICE_ID_INTEL_82801FR_PCIE1 0x2660 -#define PCI_DEVICE_ID_INTEL_82801FR_PCIE2 0x2662 -#define PCI_DEVICE_ID_INTEL_82801FR_PCIE3 0x2664 -#define PCI_DEVICE_ID_INTEL_82801FR_PCIE4 0x2666 -#define PCI_DEVICE_ID_INTEL_82801FR_HD_AUDIO 0x2668 -#define PCI_DEVICE_ID_INTEL_82801FR_SMB 0x266a -#define PCI_DEVICE_ID_INTEL_82801FR_AC97_MODEM 0x266d -#define PCI_DEVICE_ID_INTEL_82801FR_AC97_AUDIO 0x266e -#define PCI_DEVICE_ID_INTEL_82801FR_IDE 0x266f +#define PCI_DID_INTEL_82801FR_LAN 0x1065 +#define PCI_DID_INTEL_82801FR_PCI 0x244e +#define PCI_DID_INTEL_82801FR_LPC 0x2640 +#define PCI_DID_INTEL_82801FR_SATA 0x2652 +#define PCI_DID_INTEL_82801FR_USB1 0x2658 +#define PCI_DID_INTEL_82801FR_USB2 0x2659 +#define PCI_DID_INTEL_82801FR_USB3 0x265a +#define PCI_DID_INTEL_82801FR_USB4 0x265b +#define PCI_DID_INTEL_82801FR_EHCI 0x265c +#define PCI_DID_INTEL_82801FR_PCIE1 0x2660 +#define PCI_DID_INTEL_82801FR_PCIE2 0x2662 +#define PCI_DID_INTEL_82801FR_PCIE3 0x2664 +#define PCI_DID_INTEL_82801FR_PCIE4 0x2666 +#define PCI_DID_INTEL_82801FR_HD_AUDIO 0x2668 +#define PCI_DID_INTEL_82801FR_SMB 0x266a +#define PCI_DID_INTEL_82801FR_AC97_MODEM 0x266d +#define PCI_DID_INTEL_82801FR_AC97_AUDIO 0x266e +#define PCI_DID_INTEL_82801FR_IDE 0x266f /* Intel 82801FW (ICH6W) */ -#define PCI_DEVICE_ID_INTEL_82801FW_LAN 0x1065 -#define PCI_DEVICE_ID_INTEL_82801FW_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801FW_LPC 0x2642 -#define PCI_DEVICE_ID_INTEL_82801FW_SATA 0x2651 -#define PCI_DEVICE_ID_INTEL_82801FW_USB1 0x2658 -#define PCI_DEVICE_ID_INTEL_82801FW_USB2 0x2659 -#define PCI_DEVICE_ID_INTEL_82801FW_USB3 0x265a -#define PCI_DEVICE_ID_INTEL_82801FW_USB4 0x265b -#define PCI_DEVICE_ID_INTEL_82801FW_EHCI 0x265c -#define PCI_DEVICE_ID_INTEL_82801FW_PCIE1 0x2660 -#define PCI_DEVICE_ID_INTEL_82801FW_PCIE2 0x2662 -#define PCI_DEVICE_ID_INTEL_82801FW_PCIE3 0x2664 -#define PCI_DEVICE_ID_INTEL_82801FW_PCIE4 0x2666 -#define PCI_DEVICE_ID_INTEL_82801FW_HD_AUDIO 0x2668 -#define PCI_DEVICE_ID_INTEL_82801FW_SMB 0x266a -#define PCI_DEVICE_ID_INTEL_82801FW_AC97_MODEM 0x266d -#define PCI_DEVICE_ID_INTEL_82801FW_AC97_AUDIO 0x266e -#define PCI_DEVICE_ID_INTEL_82801FW_IDE 0x266f +#define PCI_DID_INTEL_82801FW_LAN 0x1065 +#define PCI_DID_INTEL_82801FW_PCI 0x244e +#define PCI_DID_INTEL_82801FW_LPC 0x2642 +#define PCI_DID_INTEL_82801FW_SATA 0x2651 +#define PCI_DID_INTEL_82801FW_USB1 0x2658 +#define PCI_DID_INTEL_82801FW_USB2 0x2659 +#define PCI_DID_INTEL_82801FW_USB3 0x265a +#define PCI_DID_INTEL_82801FW_USB4 0x265b +#define PCI_DID_INTEL_82801FW_EHCI 0x265c +#define PCI_DID_INTEL_82801FW_PCIE1 0x2660 +#define PCI_DID_INTEL_82801FW_PCIE2 0x2662 +#define PCI_DID_INTEL_82801FW_PCIE3 0x2664 +#define PCI_DID_INTEL_82801FW_PCIE4 0x2666 +#define PCI_DID_INTEL_82801FW_HD_AUDIO 0x2668 +#define PCI_DID_INTEL_82801FW_SMB 0x266a +#define PCI_DID_INTEL_82801FW_AC97_MODEM 0x266d +#define PCI_DID_INTEL_82801FW_AC97_AUDIO 0x266e +#define PCI_DID_INTEL_82801FW_IDE 0x266f /* Intel 82801FRW (ICH6RW) */ -#define PCI_DEVICE_ID_INTEL_82801FRW_LAN 0x1065 -#define PCI_DEVICE_ID_INTEL_82801FRW_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801FRW_LPC 0x2642 -#define PCI_DEVICE_ID_INTEL_82801FRW_SATA 0x2652 -#define PCI_DEVICE_ID_INTEL_82801FRW_USB1 0x2658 -#define PCI_DEVICE_ID_INTEL_82801FRW_USB2 0x2659 -#define PCI_DEVICE_ID_INTEL_82801FRW_USB3 0x265a -#define PCI_DEVICE_ID_INTEL_82801FRW_USB4 0x265b -#define PCI_DEVICE_ID_INTEL_82801FRW_EHCI 0x265c -#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE1 0x2660 -#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE2 0x2662 -#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE3 0x2664 -#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE4 0x2666 -#define PCI_DEVICE_ID_INTEL_82801FRW_HD_AUDIO 0x2668 -#define PCI_DEVICE_ID_INTEL_82801FRW_SMB 0x266a -#define PCI_DEVICE_ID_INTEL_82801FRW_AC97_MODEM 0x266d -#define PCI_DEVICE_ID_INTEL_82801FRW_AC97_AUDIO 0x266e -#define PCI_DEVICE_ID_INTEL_82801FRW_IDE 0x266f +#define PCI_DID_INTEL_82801FRW_LAN 0x1065 +#define PCI_DID_INTEL_82801FRW_PCI 0x244e +#define PCI_DID_INTEL_82801FRW_LPC 0x2642 +#define PCI_DID_INTEL_82801FRW_SATA 0x2652 +#define PCI_DID_INTEL_82801FRW_USB1 0x2658 +#define PCI_DID_INTEL_82801FRW_USB2 0x2659 +#define PCI_DID_INTEL_82801FRW_USB3 0x265a +#define PCI_DID_INTEL_82801FRW_USB4 0x265b +#define PCI_DID_INTEL_82801FRW_EHCI 0x265c +#define PCI_DID_INTEL_82801FRW_PCIE1 0x2660 +#define PCI_DID_INTEL_82801FRW_PCIE2 0x2662 +#define PCI_DID_INTEL_82801FRW_PCIE3 0x2664 +#define PCI_DID_INTEL_82801FRW_PCIE4 0x2666 +#define PCI_DID_INTEL_82801FRW_HD_AUDIO 0x2668 +#define PCI_DID_INTEL_82801FRW_SMB 0x266a +#define PCI_DID_INTEL_82801FRW_AC97_MODEM 0x266d +#define PCI_DID_INTEL_82801FRW_AC97_AUDIO 0x266e +#define PCI_DID_INTEL_82801FRW_IDE 0x266f /* Intel 82801FBM (ICH6-M) */ -#define PCI_DEVICE_ID_INTEL_82801FBM_LAN 0x1065 -#define PCI_DEVICE_ID_INTEL_82801FBM_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801FBM_LPC 0x2641 -#define PCI_DEVICE_ID_INTEL_82801FBM_SATA 0x2653 -#define PCI_DEVICE_ID_INTEL_82801FBM_USB1 0x2658 -#define PCI_DEVICE_ID_INTEL_82801FBM_USB2 0x2659 -#define PCI_DEVICE_ID_INTEL_82801FBM_USB3 0x265a -#define PCI_DEVICE_ID_INTEL_82801FBM_USB4 0x265b -#define PCI_DEVICE_ID_INTEL_82801FBM_EHCI 0x265c -#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE1 0x2660 -#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE2 0x2662 -#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE3 0x2664 -#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE4 0x2666 -#define PCI_DEVICE_ID_INTEL_82801FBM_HD_AUDIO 0x2668 -#define PCI_DEVICE_ID_INTEL_82801FBM_SMB 0x266a -#define PCI_DEVICE_ID_INTEL_82801FBM_AC97_MODEM 0x266d -#define PCI_DEVICE_ID_INTEL_82801FBM_AC97_AUDIO 0x266e -#define PCI_DEVICE_ID_INTEL_82801FBM_IDE 0x266f +#define PCI_DID_INTEL_82801FBM_LAN 0x1065 +#define PCI_DID_INTEL_82801FBM_PCI 0x2448 +#define PCI_DID_INTEL_82801FBM_LPC 0x2641 +#define PCI_DID_INTEL_82801FBM_SATA 0x2653 +#define PCI_DID_INTEL_82801FBM_USB1 0x2658 +#define PCI_DID_INTEL_82801FBM_USB2 0x2659 +#define PCI_DID_INTEL_82801FBM_USB3 0x265a +#define PCI_DID_INTEL_82801FBM_USB4 0x265b +#define PCI_DID_INTEL_82801FBM_EHCI 0x265c +#define PCI_DID_INTEL_82801FBM_PCIE1 0x2660 +#define PCI_DID_INTEL_82801FBM_PCIE2 0x2662 +#define PCI_DID_INTEL_82801FBM_PCIE3 0x2664 +#define PCI_DID_INTEL_82801FBM_PCIE4 0x2666 +#define PCI_DID_INTEL_82801FBM_HD_AUDIO 0x2668 +#define PCI_DID_INTEL_82801FBM_SMB 0x266a +#define PCI_DID_INTEL_82801FBM_AC97_MODEM 0x266d +#define PCI_DID_INTEL_82801FBM_AC97_AUDIO 0x266e +#define PCI_DID_INTEL_82801FBM_IDE 0x266f /* Intel 82801GB (ICH7) */ -#define PCI_DEVICE_ID_INTEL_82801GB_LAN 0x27dc -#define PCI_DEVICE_ID_INTEL_82801GB_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801GB_LPC 0x27b8 -#define PCI_DEVICE_ID_INTEL_82801GB_SATA 0x27c0 -#define PCI_DEVICE_ID_INTEL_82801GB_SATA_AHCI 0x27c1 -#define PCI_DEVICE_ID_INTEL_82801GB_SATA_RAID 0x27c3 -#define PCI_DEVICE_ID_INTEL_82801GB_USB1 0x27c8 -#define PCI_DEVICE_ID_INTEL_82801GB_USB2 0x27c9 -#define PCI_DEVICE_ID_INTEL_82801GB_USB3 0x27ca -#define PCI_DEVICE_ID_INTEL_82801GB_USB4 0x27cb -#define PCI_DEVICE_ID_INTEL_82801GB_EHCI 0x27cc -#define PCI_DEVICE_ID_INTEL_82801GB_PCIE1 0x27d0 -#define PCI_DEVICE_ID_INTEL_82801GB_PCIE2 0x27d2 -#define PCI_DEVICE_ID_INTEL_82801GB_PCIE3 0x27d4 -#define PCI_DEVICE_ID_INTEL_82801GB_PCIE4 0x27d6 -#define PCI_DEVICE_ID_INTEL_82801GB_HD_AUDIO 0x27d8 -#define PCI_DEVICE_ID_INTEL_82801GB_SMB 0x27da -#define PCI_DEVICE_ID_INTEL_82801GB_AC97_MODEM 0x27de -#define PCI_DEVICE_ID_INTEL_82801GB_AC97_AUDIO 0x27dd -#define PCI_DEVICE_ID_INTEL_82801GB_IDE 0x27df +#define PCI_DID_INTEL_82801GB_LAN 0x27dc +#define PCI_DID_INTEL_82801GB_PCI 0x244e +#define PCI_DID_INTEL_82801GB_LPC 0x27b8 +#define PCI_DID_INTEL_82801GB_SATA 0x27c0 +#define PCI_DID_INTEL_82801GB_SATA_AHCI 0x27c1 +#define PCI_DID_INTEL_82801GB_SATA_RAID 0x27c3 +#define PCI_DID_INTEL_82801GB_USB1 0x27c8 +#define PCI_DID_INTEL_82801GB_USB2 0x27c9 +#define PCI_DID_INTEL_82801GB_USB3 0x27ca +#define PCI_DID_INTEL_82801GB_USB4 0x27cb +#define PCI_DID_INTEL_82801GB_EHCI 0x27cc +#define PCI_DID_INTEL_82801GB_PCIE1 0x27d0 +#define PCI_DID_INTEL_82801GB_PCIE2 0x27d2 +#define PCI_DID_INTEL_82801GB_PCIE3 0x27d4 +#define PCI_DID_INTEL_82801GB_PCIE4 0x27d6 +#define PCI_DID_INTEL_82801GB_HD_AUDIO 0x27d8 +#define PCI_DID_INTEL_82801GB_SMB 0x27da +#define PCI_DID_INTEL_82801GB_AC97_MODEM 0x27de +#define PCI_DID_INTEL_82801GB_AC97_AUDIO 0x27dd +#define PCI_DID_INTEL_82801GB_IDE 0x27df /* Intel 82801GR (ICH7R) */ -#define PCI_DEVICE_ID_INTEL_82801GR_LAN 0x27dc -#define PCI_DEVICE_ID_INTEL_82801GR_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801GR_LPC 0x27b8 -#define PCI_DEVICE_ID_INTEL_82801GR_SATA 0x27c0 -#define PCI_DEVICE_ID_INTEL_82801GR_SATA_AHCI 0x27c1 -#define PCI_DEVICE_ID_INTEL_82801GR_SATA_RAID 0x27c3 -#define PCI_DEVICE_ID_INTEL_82801GR_USB1 0x27c8 -#define PCI_DEVICE_ID_INTEL_82801GR_USB2 0x27c9 -#define PCI_DEVICE_ID_INTEL_82801GR_USB3 0x27ca -#define PCI_DEVICE_ID_INTEL_82801GR_USB4 0x27cb -#define PCI_DEVICE_ID_INTEL_82801GR_EHCI 0x27cc -#define PCI_DEVICE_ID_INTEL_82801GR_PCIE1 0x27d0 -#define PCI_DEVICE_ID_INTEL_82801GR_PCIE2 0x27d2 -#define PCI_DEVICE_ID_INTEL_82801GR_PCIE3 0x27d4 -#define PCI_DEVICE_ID_INTEL_82801GR_PCIE4 0x27d6 -#define PCI_DEVICE_ID_INTEL_82801GR_PCIE5 0x27e0 -#define PCI_DEVICE_ID_INTEL_82801GR_PCIE6 0x27e2 -#define PCI_DEVICE_ID_INTEL_82801GR_HD_AUDIO 0x27d8 -#define PCI_DEVICE_ID_INTEL_82801GR_SMB 0x27da -#define PCI_DEVICE_ID_INTEL_82801GR_AC97_MODEM 0x27de -#define PCI_DEVICE_ID_INTEL_82801GR_AC97_AUDIO 0x27dd -#define PCI_DEVICE_ID_INTEL_82801GR_IDE 0x27df +#define PCI_DID_INTEL_82801GR_LAN 0x27dc +#define PCI_DID_INTEL_82801GR_PCI 0x244e +#define PCI_DID_INTEL_82801GR_LPC 0x27b8 +#define PCI_DID_INTEL_82801GR_SATA 0x27c0 +#define PCI_DID_INTEL_82801GR_SATA_AHCI 0x27c1 +#define PCI_DID_INTEL_82801GR_SATA_RAID 0x27c3 +#define PCI_DID_INTEL_82801GR_USB1 0x27c8 +#define PCI_DID_INTEL_82801GR_USB2 0x27c9 +#define PCI_DID_INTEL_82801GR_USB3 0x27ca +#define PCI_DID_INTEL_82801GR_USB4 0x27cb +#define PCI_DID_INTEL_82801GR_EHCI 0x27cc +#define PCI_DID_INTEL_82801GR_PCIE1 0x27d0 +#define PCI_DID_INTEL_82801GR_PCIE2 0x27d2 +#define PCI_DID_INTEL_82801GR_PCIE3 0x27d4 +#define PCI_DID_INTEL_82801GR_PCIE4 0x27d6 +#define PCI_DID_INTEL_82801GR_PCIE5 0x27e0 +#define PCI_DID_INTEL_82801GR_PCIE6 0x27e2 +#define PCI_DID_INTEL_82801GR_HD_AUDIO 0x27d8 +#define PCI_DID_INTEL_82801GR_SMB 0x27da +#define PCI_DID_INTEL_82801GR_AC97_MODEM 0x27de +#define PCI_DID_INTEL_82801GR_AC97_AUDIO 0x27dd +#define PCI_DID_INTEL_82801GR_IDE 0x27df /* Intel 82801GDH (ICH7DH) */ -#define PCI_DEVICE_ID_INTEL_82801GDH_LAN 0x27dc -#define PCI_DEVICE_ID_INTEL_82801GDH_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801GDH_LPC 0x27b8 -#define PCI_DEVICE_ID_INTEL_82801GDH_SATA 0x27c0 -#define PCI_DEVICE_ID_INTEL_82801GDH_SATA_AHCI 0x27c1 -#define PCI_DEVICE_ID_INTEL_82801GDH_SATA_RAID 0x27c3 -#define PCI_DEVICE_ID_INTEL_82801GDH_USB1 0x27c8 -#define PCI_DEVICE_ID_INTEL_82801GDH_USB2 0x27c9 -#define PCI_DEVICE_ID_INTEL_82801GDH_USB3 0x27ca -#define PCI_DEVICE_ID_INTEL_82801GDH_USB4 0x27cb -#define PCI_DEVICE_ID_INTEL_82801GDH_EHCI 0x27cc -#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE1 0x27d0 -#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE2 0x27d2 -#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE3 0x27d4 -#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE4 0x27d6 -#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE5 0x27e0 -#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE6 0x27e2 -#define PCI_DEVICE_ID_INTEL_82801GDH_HD_AUDIO 0x27d8 -#define PCI_DEVICE_ID_INTEL_82801GDH_SMB 0x27da -#define PCI_DEVICE_ID_INTEL_82801GDH_AC97_MODEM 0x27de -#define PCI_DEVICE_ID_INTEL_82801GDH_AC97_AUDIO 0x27dd -#define PCI_DEVICE_ID_INTEL_82801GDH_IDE 0x27df +#define PCI_DID_INTEL_82801GDH_LAN 0x27dc +#define PCI_DID_INTEL_82801GDH_PCI 0x244e +#define PCI_DID_INTEL_82801GDH_LPC 0x27b8 +#define PCI_DID_INTEL_82801GDH_SATA 0x27c0 +#define PCI_DID_INTEL_82801GDH_SATA_AHCI 0x27c1 +#define PCI_DID_INTEL_82801GDH_SATA_RAID 0x27c3 +#define PCI_DID_INTEL_82801GDH_USB1 0x27c8 +#define PCI_DID_INTEL_82801GDH_USB2 0x27c9 +#define PCI_DID_INTEL_82801GDH_USB3 0x27ca +#define PCI_DID_INTEL_82801GDH_USB4 0x27cb +#define PCI_DID_INTEL_82801GDH_EHCI 0x27cc +#define PCI_DID_INTEL_82801GDH_PCIE1 0x27d0 +#define PCI_DID_INTEL_82801GDH_PCIE2 0x27d2 +#define PCI_DID_INTEL_82801GDH_PCIE3 0x27d4 +#define PCI_DID_INTEL_82801GDH_PCIE4 0x27d6 +#define PCI_DID_INTEL_82801GDH_PCIE5 0x27e0 +#define PCI_DID_INTEL_82801GDH_PCIE6 0x27e2 +#define PCI_DID_INTEL_82801GDH_HD_AUDIO 0x27d8 +#define PCI_DID_INTEL_82801GDH_SMB 0x27da +#define PCI_DID_INTEL_82801GDH_AC97_MODEM 0x27de +#define PCI_DID_INTEL_82801GDH_AC97_AUDIO 0x27dd +#define PCI_DID_INTEL_82801GDH_IDE 0x27df /* Intel 82801GBM (ICH7-M) */ -#define PCI_DEVICE_ID_INTEL_82801GBM_LAN 0x27dc -#define PCI_DEVICE_ID_INTEL_82801GBM_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801GBM_LPC 0x27b9 -#define PCI_DEVICE_ID_INTEL_82801GBM_SATA 0x27c4 -#define PCI_DEVICE_ID_INTEL_82801GBM_SATA_AHCI 0x27c5 -#define PCI_DEVICE_ID_INTEL_82801GBM_USB1 0x27c8 -#define PCI_DEVICE_ID_INTEL_82801GBM_USB2 0x27c9 -#define PCI_DEVICE_ID_INTEL_82801GBM_USB3 0x27ca -#define PCI_DEVICE_ID_INTEL_82801GBM_USB4 0x27cb -#define PCI_DEVICE_ID_INTEL_82801GBM_EHCI 0x27cc -#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE1 0x27d0 -#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE2 0x27d2 -#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE3 0x27d4 -#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE4 0x27d6 -#define PCI_DEVICE_ID_INTEL_82801GBM_HD_AUDIO 0x27d8 -#define PCI_DEVICE_ID_INTEL_82801GBM_SMB 0x27da -#define PCI_DEVICE_ID_INTEL_82801GBM_AC97_MODEM 0x27de -#define PCI_DEVICE_ID_INTEL_82801GBM_AC97_AUDIO 0x27dd -#define PCI_DEVICE_ID_INTEL_82801GBM_IDE 0x27df +#define PCI_DID_INTEL_82801GBM_LAN 0x27dc +#define PCI_DID_INTEL_82801GBM_PCI 0x2448 +#define PCI_DID_INTEL_82801GBM_LPC 0x27b9 +#define PCI_DID_INTEL_82801GBM_SATA 0x27c4 +#define PCI_DID_INTEL_82801GBM_SATA_AHCI 0x27c5 +#define PCI_DID_INTEL_82801GBM_USB1 0x27c8 +#define PCI_DID_INTEL_82801GBM_USB2 0x27c9 +#define PCI_DID_INTEL_82801GBM_USB3 0x27ca +#define PCI_DID_INTEL_82801GBM_USB4 0x27cb +#define PCI_DID_INTEL_82801GBM_EHCI 0x27cc +#define PCI_DID_INTEL_82801GBM_PCIE1 0x27d0 +#define PCI_DID_INTEL_82801GBM_PCIE2 0x27d2 +#define PCI_DID_INTEL_82801GBM_PCIE3 0x27d4 +#define PCI_DID_INTEL_82801GBM_PCIE4 0x27d6 +#define PCI_DID_INTEL_82801GBM_HD_AUDIO 0x27d8 +#define PCI_DID_INTEL_82801GBM_SMB 0x27da +#define PCI_DID_INTEL_82801GBM_AC97_MODEM 0x27de +#define PCI_DID_INTEL_82801GBM_AC97_AUDIO 0x27dd +#define PCI_DID_INTEL_82801GBM_IDE 0x27df /* Intel 82801GHM (ICH7-M DH) */ -#define PCI_DEVICE_ID_INTEL_82801GHM_LAN 0x27dc -#define PCI_DEVICE_ID_INTEL_82801GHM_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801GHM_LPC 0x27bd -#define PCI_DEVICE_ID_INTEL_82801GHM_SATA 0x27c4 -#define PCI_DEVICE_ID_INTEL_82801GHM_SATA_AHCI 0x27c5 -#define PCI_DEVICE_ID_INTEL_82801GHM_SATA_RAID 0x27c6 -#define PCI_DEVICE_ID_INTEL_82801GHM_USB1 0x27c8 -#define PCI_DEVICE_ID_INTEL_82801GHM_USB2 0x27c9 -#define PCI_DEVICE_ID_INTEL_82801GHM_USB3 0x27ca -#define PCI_DEVICE_ID_INTEL_82801GHM_USB4 0x27cb -#define PCI_DEVICE_ID_INTEL_82801GHM_EHCI 0x27cc -#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE1 0x27d0 -#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE2 0x27d2 -#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE3 0x27d4 -#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE4 0x27d6 -#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE5 0x27e0 -#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE6 0x27e2 -#define PCI_DEVICE_ID_INTEL_82801GHM_HD_AUDIO 0x27d8 -#define PCI_DEVICE_ID_INTEL_82801GHM_SMB 0x27da -#define PCI_DEVICE_ID_INTEL_82801GHM_AC97_MODEM 0x27de -#define PCI_DEVICE_ID_INTEL_82801GHM_AC97_AUDIO 0x27dd -#define PCI_DEVICE_ID_INTEL_82801GHM_IDE 0x27df +#define PCI_DID_INTEL_82801GHM_LAN 0x27dc +#define PCI_DID_INTEL_82801GHM_PCI 0x2448 +#define PCI_DID_INTEL_82801GHM_LPC 0x27bd +#define PCI_DID_INTEL_82801GHM_SATA 0x27c4 +#define PCI_DID_INTEL_82801GHM_SATA_AHCI 0x27c5 +#define PCI_DID_INTEL_82801GHM_SATA_RAID 0x27c6 +#define PCI_DID_INTEL_82801GHM_USB1 0x27c8 +#define PCI_DID_INTEL_82801GHM_USB2 0x27c9 +#define PCI_DID_INTEL_82801GHM_USB3 0x27ca +#define PCI_DID_INTEL_82801GHM_USB4 0x27cb +#define PCI_DID_INTEL_82801GHM_EHCI 0x27cc +#define PCI_DID_INTEL_82801GHM_PCIE1 0x27d0 +#define PCI_DID_INTEL_82801GHM_PCIE2 0x27d2 +#define PCI_DID_INTEL_82801GHM_PCIE3 0x27d4 +#define PCI_DID_INTEL_82801GHM_PCIE4 0x27d6 +#define PCI_DID_INTEL_82801GHM_PCIE5 0x27e0 +#define PCI_DID_INTEL_82801GHM_PCIE6 0x27e2 +#define PCI_DID_INTEL_82801GHM_HD_AUDIO 0x27d8 +#define PCI_DID_INTEL_82801GHM_SMB 0x27da +#define PCI_DID_INTEL_82801GHM_AC97_MODEM 0x27de +#define PCI_DID_INTEL_82801GHM_AC97_AUDIO 0x27dd +#define PCI_DID_INTEL_82801GHM_IDE 0x27df /* Intel 82801GU (ICH7-U) */ -#define PCI_DEVICE_ID_INTEL_82801GU_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801GU_LPC 0x27b9 -#define PCI_DEVICE_ID_INTEL_82801GU_USB1 0x27c8 -#define PCI_DEVICE_ID_INTEL_82801GU_USB2 0x27c9 -#define PCI_DEVICE_ID_INTEL_82801GU_USB3 0x27ca -#define PCI_DEVICE_ID_INTEL_82801GU_USB4 0x27cb -#define PCI_DEVICE_ID_INTEL_82801GU_EHCI 0x27cc -#define PCI_DEVICE_ID_INTEL_82801GU_HD_AUDIO 0x27d8 -#define PCI_DEVICE_ID_INTEL_82801GU_SMB 0x27da -#define PCI_DEVICE_ID_INTEL_82801GU_IDE 0x27df +#define PCI_DID_INTEL_82801GU_PCI 0x2448 +#define PCI_DID_INTEL_82801GU_LPC 0x27b9 +#define PCI_DID_INTEL_82801GU_USB1 0x27c8 +#define PCI_DID_INTEL_82801GU_USB2 0x27c9 +#define PCI_DID_INTEL_82801GU_USB3 0x27ca +#define PCI_DID_INTEL_82801GU_USB4 0x27cb +#define PCI_DID_INTEL_82801GU_EHCI 0x27cc +#define PCI_DID_INTEL_82801GU_HD_AUDIO 0x27d8 +#define PCI_DID_INTEL_82801GU_SMB 0x27da +#define PCI_DID_INTEL_82801GU_IDE 0x27df /* Intel 82801HB (ICH8) */ -#define PCI_DEVICE_ID_INTEL_82801HB_LAN 0x104b -#define PCI_DEVICE_ID_INTEL_82801HB_LPC 0x2810 -#define PCI_DEVICE_ID_INTEL_82801HB_SATA1 0x2820 -#define PCI_DEVICE_ID_INTEL_82801HB_SATA_AHCI_6 0x2821 /* 6 ports */ -#define PCI_DEVICE_ID_INTEL_82801HB_SATA_RAID 0x2822 -#define PCI_DEVICE_ID_INTEL_82801HB_SATA_AHCI_4 0x2824 /* 4 ports */ -#define PCI_DEVICE_ID_INTEL_82801HB_SATA2 0x2825 -#define PCI_DEVICE_ID_INTEL_82801HB_SMB 0x283e -#define PCI_DEVICE_ID_INTEL_82801HB_THERMAL 0x284f -#define PCI_DEVICE_ID_INTEL_82801HB_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_82801HB_USB1 0x2830 -#define PCI_DEVICE_ID_INTEL_82801HB_USB2 0x2831 -#define PCI_DEVICE_ID_INTEL_82801HB_USB3 0x2832 -#define PCI_DEVICE_ID_INTEL_82801HB_EHCI1 0x2836 -#define PCI_DEVICE_ID_INTEL_82801HB_USB4 0x2834 -#define PCI_DEVICE_ID_INTEL_82801HB_USB5 0x2835 -#define PCI_DEVICE_ID_INTEL_82801HB_EHCI2 0x283a -#define PCI_DEVICE_ID_INTEL_82801HB_PCIE1 0x283f -#define PCI_DEVICE_ID_INTEL_82801HB_PCIE2 0x2841 -#define PCI_DEVICE_ID_INTEL_82801HB_PCIE3 0x2843 -#define PCI_DEVICE_ID_INTEL_82801HB_PCIE4 0x2845 -#define PCI_DEVICE_ID_INTEL_82801HB_PCIE5 0x2847 -#define PCI_DEVICE_ID_INTEL_82801HB_PCIE6 0x2849 -#define PCI_DEVICE_ID_INTEL_82801HB_HD_AUDIO 0x284b +#define PCI_DID_INTEL_82801HB_LAN 0x104b +#define PCI_DID_INTEL_82801HB_LPC 0x2810 +#define PCI_DID_INTEL_82801HB_SATA1 0x2820 +#define PCI_DID_INTEL_82801HB_SATA_AHCI_6 0x2821 /* 6 ports */ +#define PCI_DID_INTEL_82801HB_SATA_RAID 0x2822 +#define PCI_DID_INTEL_82801HB_SATA_AHCI_4 0x2824 /* 4 ports */ +#define PCI_DID_INTEL_82801HB_SATA2 0x2825 +#define PCI_DID_INTEL_82801HB_SMB 0x283e +#define PCI_DID_INTEL_82801HB_THERMAL 0x284f +#define PCI_DID_INTEL_82801HB_PCI 0x244e +#define PCI_DID_INTEL_82801HB_USB1 0x2830 +#define PCI_DID_INTEL_82801HB_USB2 0x2831 +#define PCI_DID_INTEL_82801HB_USB3 0x2832 +#define PCI_DID_INTEL_82801HB_EHCI1 0x2836 +#define PCI_DID_INTEL_82801HB_USB4 0x2834 +#define PCI_DID_INTEL_82801HB_USB5 0x2835 +#define PCI_DID_INTEL_82801HB_EHCI2 0x283a +#define PCI_DID_INTEL_82801HB_PCIE1 0x283f +#define PCI_DID_INTEL_82801HB_PCIE2 0x2841 +#define PCI_DID_INTEL_82801HB_PCIE3 0x2843 +#define PCI_DID_INTEL_82801HB_PCIE4 0x2845 +#define PCI_DID_INTEL_82801HB_PCIE5 0x2847 +#define PCI_DID_INTEL_82801HB_PCIE6 0x2849 +#define PCI_DID_INTEL_82801HB_HD_AUDIO 0x284b /* Intel 82801HR/HH/HO (ICH8R/ICH8DH/ICH8DO), only difference to ICH8: LPC */ -#define PCI_DEVICE_ID_INTEL_82801HR_LPC 0x2810 -#define PCI_DEVICE_ID_INTEL_82801HH_LPC 0x2812 -#define PCI_DEVICE_ID_INTEL_82801HO_LPC 0x2814 +#define PCI_DID_INTEL_82801HR_LPC 0x2810 +#define PCI_DID_INTEL_82801HH_LPC 0x2812 +#define PCI_DID_INTEL_82801HO_LPC 0x2814 /* Intel 82801HBM/HEM (ICH8M/ICH8M-E) */ -#define PCI_DEVICE_ID_INTEL_82801HBM_LAN 0x104b -#define PCI_DEVICE_ID_INTEL_82801HBM_LPC 0x2815 -#define PCI_DEVICE_ID_INTEL_82801HBM_SATA 0x2828 -#define PCI_DEVICE_ID_INTEL_82801HBM_SATA_AHCI 0x2829 -#define PCI_DEVICE_ID_INTEL_82801HBM_SATA_RAID 0x282a -#define PCI_DEVICE_ID_INTEL_82801HBM_SMB 0x283e -#define PCI_DEVICE_ID_INTEL_82801HBM_THERMAL 0x284f -#define PCI_DEVICE_ID_INTEL_82801HBM_PCI 0x2448 -#define PCI_DEVICE_ID_INTEL_82801HBM_IDE 0x2850 /* TODO: Also ICH8M-E? */ -#define PCI_DEVICE_ID_INTEL_82801HBM_USB1 0x2830 -#define PCI_DEVICE_ID_INTEL_82801HBM_USB2 0x2831 -#define PCI_DEVICE_ID_INTEL_82801HBM_USB3 0x2832 -#define PCI_DEVICE_ID_INTEL_82801HBM_EHCI1 0x2836 -#define PCI_DEVICE_ID_INTEL_82801HBM_USB4 0x2834 -#define PCI_DEVICE_ID_INTEL_82801HBM_USB5 0x2835 -#define PCI_DEVICE_ID_INTEL_82801HBM_EHCI2 0x283a -#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE1 0x283f -#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE2 0x2841 -#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE3 0x2843 -#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE4 0x2845 -#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE5 0x2847 -#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE6 0x2849 -#define PCI_DEVICE_ID_INTEL_82801HBM_HD_AUDIO 0x284b +#define PCI_DID_INTEL_82801HBM_LAN 0x104b +#define PCI_DID_INTEL_82801HBM_LPC 0x2815 +#define PCI_DID_INTEL_82801HBM_SATA 0x2828 +#define PCI_DID_INTEL_82801HBM_SATA_AHCI 0x2829 +#define PCI_DID_INTEL_82801HBM_SATA_RAID 0x282a +#define PCI_DID_INTEL_82801HBM_SMB 0x283e +#define PCI_DID_INTEL_82801HBM_THERMAL 0x284f +#define PCI_DID_INTEL_82801HBM_PCI 0x2448 +#define PCI_DID_INTEL_82801HBM_IDE 0x2850 /* TODO: Also ICH8M-E? */ +#define PCI_DID_INTEL_82801HBM_USB1 0x2830 +#define PCI_DID_INTEL_82801HBM_USB2 0x2831 +#define PCI_DID_INTEL_82801HBM_USB3 0x2832 +#define PCI_DID_INTEL_82801HBM_EHCI1 0x2836 +#define PCI_DID_INTEL_82801HBM_USB4 0x2834 +#define PCI_DID_INTEL_82801HBM_USB5 0x2835 +#define PCI_DID_INTEL_82801HBM_EHCI2 0x283a +#define PCI_DID_INTEL_82801HBM_PCIE1 0x283f +#define PCI_DID_INTEL_82801HBM_PCIE2 0x2841 +#define PCI_DID_INTEL_82801HBM_PCIE3 0x2843 +#define PCI_DID_INTEL_82801HBM_PCIE4 0x2845 +#define PCI_DID_INTEL_82801HBM_PCIE5 0x2847 +#define PCI_DID_INTEL_82801HBM_PCIE6 0x2849 +#define PCI_DID_INTEL_82801HBM_HD_AUDIO 0x284b /* Intel 82801HEM (ICH8M-E), only difference to ICH8M: LPC */ -#define PCI_DEVICE_ID_INTEL_82801HEM_LPC 0x2811 +#define PCI_DID_INTEL_82801HEM_LPC 0x2811 /* Intel 82801IB (ICH9) */ -#define PCI_DEVICE_ID_INTEL_82801IB_LPC 0x2918 /* ICH9 */ -#define PCI_DEVICE_ID_INTEL_82801IB_SATA_P0123 0x2920 /* Ports 0 - 3 */ -#define PCI_DEVICE_ID_INTEL_82801IB_SATA_P01 0x2921 /* Ports 0 - 1 */ -#define PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI1 0x2922 /* Ports 0 - 5 */ -#define PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI2 0x2923 /* Ports 0, 1, 4, 5 */ -#define PCI_DEVICE_ID_INTEL_82801IB_SATA_RAID 0x2822 /* RAID */ -#define PCI_DEVICE_ID_INTEL_82801IB_SATA_P45 0x2926 /* Ports 4 - 5 */ -#define PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_IDE_P01 0x2928 /* Ports 0 - 1 */ -#define PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_AHCI_P0145 0x2929 /* Ports 0, 1, 4, 5 */ -#define PCI_DEVICE_ID_INTEL_82801IB_SMB 0x2930 -#define PCI_DEVICE_ID_INTEL_82801IB_THERMAL 0x2932 -#define PCI_DEVICE_ID_INTEL_82801IB_PCI 0x244e /* DMI to PCI bridge */ -#define PCI_DEVICE_ID_INTEL_82801IB_USB1 0x2934 -#define PCI_DEVICE_ID_INTEL_82801IB_USB2 0x2935 -#define PCI_DEVICE_ID_INTEL_82801IB_USB3 0x2936 -#define PCI_DEVICE_ID_INTEL_82801IB_EHCI1 0x293a -#define PCI_DEVICE_ID_INTEL_82801IB_USB4 0x2937 -#define PCI_DEVICE_ID_INTEL_82801IB_USB5 0x2938 -#define PCI_DEVICE_ID_INTEL_82801IB_USB6 0x2939 -#define PCI_DEVICE_ID_INTEL_82801IB_EHCI2 0x293c -#define PCI_DEVICE_ID_INTEL_82801IB_HD_AUDIO 0x293e -#define PCI_DEVICE_ID_INTEL_82801IB_PCIE1 0x2940 -#define PCI_DEVICE_ID_INTEL_82801IB_PCIE2 0x2942 -#define PCI_DEVICE_ID_INTEL_82801IB_PCIE3 0x2944 -#define PCI_DEVICE_ID_INTEL_82801IB_PCIE4 0x2946 -#define PCI_DEVICE_ID_INTEL_82801IB_PCIE5 0x2948 -#define PCI_DEVICE_ID_INTEL_82801IB_PCIE6 0x294a -#define PCI_DEVICE_ID_INTEL_82801IB_LAN 0x29c4 +#define PCI_DID_INTEL_82801IB_LPC 0x2918 /* ICH9 */ +#define PCI_DID_INTEL_82801IB_SATA_P0123 0x2920 /* Ports 0 - 3 */ +#define PCI_DID_INTEL_82801IB_SATA_P01 0x2921 /* Ports 0 - 1 */ +#define PCI_DID_INTEL_82801IB_SATA_AHCI1 0x2922 /* Ports 0 - 5 */ +#define PCI_DID_INTEL_82801IB_SATA_AHCI2 0x2923 /* Ports 0, 1, 4, 5 */ +#define PCI_DID_INTEL_82801IB_SATA_RAID 0x2822 /* RAID */ +#define PCI_DID_INTEL_82801IB_SATA_P45 0x2926 /* Ports 4 - 5 */ +#define PCI_DID_INTEL_82801IBM_IEM_SATA_IDE_P01 0x2928 /* Ports 0 - 1 */ +#define PCI_DID_INTEL_82801IBM_IEM_SATA_AHCI_P0145 0x2929 /* Ports 0, 1, 4, 5 */ +#define PCI_DID_INTEL_82801IB_SMB 0x2930 +#define PCI_DID_INTEL_82801IB_THERMAL 0x2932 +#define PCI_DID_INTEL_82801IB_PCI 0x244e /* DMI to PCI bridge */ +#define PCI_DID_INTEL_82801IB_USB1 0x2934 +#define PCI_DID_INTEL_82801IB_USB2 0x2935 +#define PCI_DID_INTEL_82801IB_USB3 0x2936 +#define PCI_DID_INTEL_82801IB_EHCI1 0x293a +#define PCI_DID_INTEL_82801IB_USB4 0x2937 +#define PCI_DID_INTEL_82801IB_USB5 0x2938 +#define PCI_DID_INTEL_82801IB_USB6 0x2939 +#define PCI_DID_INTEL_82801IB_EHCI2 0x293c +#define PCI_DID_INTEL_82801IB_HD_AUDIO 0x293e +#define PCI_DID_INTEL_82801IB_PCIE1 0x2940 +#define PCI_DID_INTEL_82801IB_PCIE2 0x2942 +#define PCI_DID_INTEL_82801IB_PCIE3 0x2944 +#define PCI_DID_INTEL_82801IB_PCIE4 0x2946 +#define PCI_DID_INTEL_82801IB_PCIE5 0x2948 +#define PCI_DID_INTEL_82801IB_PCIE6 0x294a +#define PCI_DID_INTEL_82801IB_LAN 0x29c4 /* Only difference to ICH9: LPC */ -#define PCI_DEVICE_ID_INTEL_82801IH_LPC 0x2912 /* ICH9DH */ -#define PCI_DEVICE_ID_INTEL_82801IO_LPC 0x2914 /* ICH9DO */ -#define PCI_DEVICE_ID_INTEL_82801IR_LPC 0x2916 /* ICH9R */ -#define PCI_DEVICE_ID_INTEL_82801IEM_LPC 0x2917 /* ICH9M-E */ -#define PCI_DEVICE_ID_INTEL_82801IBM_LPC 0x2919 /* ICH9M */ - -#define PCI_DEVICE_ID_INTEL_CAVECREEK_LPC 0x2310 -#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN 0x1c41 -#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f -#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN 0x1e41 -#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX 0x1e5f -#define PCI_DEVICE_ID_INTEL_TGP_LPC 0x27bc +#define PCI_DID_INTEL_82801IH_LPC 0x2912 /* ICH9DH */ +#define PCI_DID_INTEL_82801IO_LPC 0x2914 /* ICH9DO */ +#define PCI_DID_INTEL_82801IR_LPC 0x2916 /* ICH9R */ +#define PCI_DID_INTEL_82801IEM_LPC 0x2917 /* ICH9M-E */ +#define PCI_DID_INTEL_82801IBM_LPC 0x2919 /* ICH9M */ + +#define PCI_DID_INTEL_CAVECREEK_LPC 0x2310 +#define PCI_DID_INTEL_COUGARPOINT_LPC_MIN 0x1c41 +#define PCI_DID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f +#define PCI_DID_INTEL_PANTHERPOINT_LPC_MIN 0x1e41 +#define PCI_DID_INTEL_PANTHERPOINT_LPC_MAX 0x1e5f +#define PCI_DID_INTEL_TGP_LPC 0x27bc /* Intel 82801E (C-ICH) */ -#define PCI_DEVICE_ID_INTEL_82801E_LPC 0x2450 -#define PCI_DEVICE_ID_INTEL_82801E_USB 0x2452 -#define PCI_DEVICE_ID_INTEL_82801E_SMB 0x2453 -#define PCI_DEVICE_ID_INTEL_82801E_LAN1 0x2459 -#define PCI_DEVICE_ID_INTEL_82801E_IDE 0x245b -#define PCI_DEVICE_ID_INTEL_82801E_LAN2 0x245d -#define PCI_DEVICE_ID_INTEL_82801E_PCI 0x245e - -#define PCI_DEVICE_ID_INTEL_82870_1E0 0x1461 -#define PCI_DEVICE_ID_INTEL_82870_1F0 0x1460 -#define PCI_DEVICE_ID_INTEL_82820FW_0 0x2440 -#define PCI_DEVICE_ID_INTEL_82820FW_1 0x2442 -#define PCI_DEVICE_ID_INTEL_82820FW_2 0x2443 -#define PCI_DEVICE_ID_INTEL_82820FW_3 0x2444 -#define PCI_DEVICE_ID_INTEL_82820FW_4 0x2449 -#define PCI_DEVICE_ID_INTEL_82820FW_5 0x244b -#define PCI_DEVICE_ID_INTEL_82820FW_6 0x244e +#define PCI_DID_INTEL_82801E_LPC 0x2450 +#define PCI_DID_INTEL_82801E_USB 0x2452 +#define PCI_DID_INTEL_82801E_SMB 0x2453 +#define PCI_DID_INTEL_82801E_LAN1 0x2459 +#define PCI_DID_INTEL_82801E_IDE 0x245b +#define PCI_DID_INTEL_82801E_LAN2 0x245d +#define PCI_DID_INTEL_82801E_PCI 0x245e + +#define PCI_DID_INTEL_82870_1E0 0x1461 +#define PCI_DID_INTEL_82870_1F0 0x1460 +#define PCI_DID_INTEL_82820FW_0 0x2440 +#define PCI_DID_INTEL_82820FW_1 0x2442 +#define PCI_DID_INTEL_82820FW_2 0x2443 +#define PCI_DID_INTEL_82820FW_3 0x2444 +#define PCI_DID_INTEL_82820FW_4 0x2449 +#define PCI_DID_INTEL_82820FW_5 0x244b +#define PCI_DID_INTEL_82820FW_6 0x244e /* Intel 6300ESB */ -#define PCI_DEVICE_ID_INTEL_6300ESB_LPC 0x25a1 -#define PCI_DEVICE_ID_INTEL_6300ESB_AC97_AUDIO 0x25a6 -#define PCI_DEVICE_ID_INTEL_6300ESB_AC97_MODEM 0x25a7 -#define PCI_DEVICE_ID_INTEL_6300ESB_EHCI 0x25ad -#define PCI_DEVICE_ID_INTEL_6300ESB_IDE 0x25a2 -#define PCI_DEVICE_ID_INTEL_6300ESB_PCI 0x244e -#define PCI_DEVICE_ID_INTEL_6300ESB_USB1 0x25a9 -#define PCI_DEVICE_ID_INTEL_6300ESB_SMB 0x25a4 -#define PCI_DEVICE_ID_INTEL_6300ESB_USB2 0x25aa -#define PCI_DEVICE_ID_INTEL_6300ESB_SATA 0x25a3 -#define PCI_DEVICE_ID_INTEL_6300ESB_SATA_RAID 0x25b0 -#define PCI_DEVICE_ID_INTEL_6300ESB_APIC1 0x25ac -#define PCI_DEVICE_ID_INTEL_6300ESB_PCI_X 0x25ae -#define PCI_DEVICE_ID_INTEL_6300ESB_WDT 0x25ab +#define PCI_DID_INTEL_6300ESB_LPC 0x25a1 +#define PCI_DID_INTEL_6300ESB_AC97_AUDIO 0x25a6 +#define PCI_DID_INTEL_6300ESB_AC97_MODEM 0x25a7 +#define PCI_DID_INTEL_6300ESB_EHCI 0x25ad +#define PCI_DID_INTEL_6300ESB_IDE 0x25a2 +#define PCI_DID_INTEL_6300ESB_PCI 0x244e +#define PCI_DID_INTEL_6300ESB_USB1 0x25a9 +#define PCI_DID_INTEL_6300ESB_SMB 0x25a4 +#define PCI_DID_INTEL_6300ESB_USB2 0x25aa +#define PCI_DID_INTEL_6300ESB_SATA 0x25a3 +#define PCI_DID_INTEL_6300ESB_SATA_RAID 0x25b0 +#define PCI_DID_INTEL_6300ESB_APIC1 0x25ac +#define PCI_DID_INTEL_6300ESB_PCI_X 0x25ae +#define PCI_DID_INTEL_6300ESB_WDT 0x25ab /* Intel 3100 */ -#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_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_PA0 0x35b6 -#define PCI_DEVICE_ID_INTEL_3100_PCIE_PA1 0x35b7 -#define PCI_DEVICE_ID_INTEL_3100_PCIE_PB0 0x2690 -#define PCI_DEVICE_ID_INTEL_3100_PCIE_PB1 0x2692 -#define PCI_DEVICE_ID_INTEL_3100_PCIE_PB2 0x2694 -#define PCI_DEVICE_ID_INTEL_3100_PCIE_PB3 0x2696 +#define PCI_DID_INTEL_3100_LPC 0x2670 +#define PCI_DID_INTEL_3100_EHCI 0x268c +#define PCI_DID_INTEL_3100_PCI 0x244e +#define PCI_DID_INTEL_3100_IDE 0x2680 +#define PCI_DID_INTEL_3100_AHCI 0x2681 +#define PCI_DID_INTEL_3100_UHCI 0x2688 +#define PCI_DID_INTEL_3100_UHCI2 0x2689 +#define PCI_DID_INTEL_3100_SMB 0x269b +#define PCI_DID_INTEL_3100_MC 0x35b0 +#define PCI_DID_INTEL_3100_PCIE_PA0 0x35b6 +#define PCI_DID_INTEL_3100_PCIE_PA1 0x35b7 +#define PCI_DID_INTEL_3100_PCIE_PB0 0x2690 +#define PCI_DID_INTEL_3100_PCIE_PB1 0x2692 +#define PCI_DID_INTEL_3100_PCIE_PB2 0x2694 +#define PCI_DID_INTEL_3100_PCIE_PB3 0x2696 /* 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 -#define PCI_DEVICE_ID_INTEL_82810_MC3 0x7122 -#define PCI_DEVICE_ID_INTEL_82810_IG3 0x7123 -#define PCI_DEVICE_ID_INTEL_82443LX_0 0x7180 -#define PCI_DEVICE_ID_INTEL_82443LX_1 0x7181 -#define PCI_DEVICE_ID_INTEL_82443BX_0 0x7190 -#define PCI_DEVICE_ID_INTEL_82443BX_1 0x7191 -#define PCI_DEVICE_ID_INTEL_82443BX_2 0x7192 -#define PCI_DEVICE_ID_INTEL_82443MX_0 0x7198 -#define PCI_DEVICE_ID_INTEL_82443MX_1 0x7199 -#define PCI_DEVICE_ID_INTEL_82443MX_2 0x719a -#define PCI_DEVICE_ID_INTEL_82443MX_3 0x719b -#define PCI_DEVICE_ID_INTEL_82372FB_0 0x7600 -#define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601 -#define PCI_DEVICE_ID_INTEL_82372FB_2 0x7602 -#define PCI_DEVICE_ID_INTEL_82372FB_3 0x7603 -#define PCI_DEVICE_ID_INTEL_82454GX 0x84c4 -#define PCI_DEVICE_ID_INTEL_82450GX 0x84c5 -#define PCI_DEVICE_ID_INTEL_82451NX 0x84ca -#define PCI_DEVICE_ID_INTEL_82454NX 0x84cb -#define PCI_DEVICE_ID_INTEL_PCIE_PA 0x3595 -#define PCI_DEVICE_ID_INTEL_PCIE_PA1 0x3596 -#define PCI_DEVICE_ID_INTEL_PCIE_PB 0x3597 -#define PCI_DEVICE_ID_INTEL_PCIE_PC 0x3599 +#define PCI_DID_INTEL_EP80579_LPC 0x5031 +#define PCI_DID_INTEL_EP80579_EHCI 0x5035 +#define PCI_DID_INTEL_EP80579_IDE 0x5028 +#define PCI_DID_INTEL_EP80579_AHCI 0x5029 +#define PCI_DID_INTEL_EP80579_UHCI 0x5033 +#define PCI_DID_INTEL_EP80579_SMB 0x5032 +#define PCI_DID_INTEL_EP80579_MC 0x5020 +#define PCI_DID_INTEL_EP80579_PCIE_PA0 0x5024 +#define PCI_DID_INTEL_EP80579_PCIE_PA1 0x5025 + +#define PCI_DID_INTEL_80310 0x530d +#define PCI_DID_INTEL_82810_MC1 0x7120 +#define PCI_DID_INTEL_82810_IG1 0x7121 +#define PCI_DID_INTEL_82810_MC3 0x7122 +#define PCI_DID_INTEL_82810_IG3 0x7123 +#define PCI_DID_INTEL_82443LX_0 0x7180 +#define PCI_DID_INTEL_82443LX_1 0x7181 +#define PCI_DID_INTEL_82443BX_0 0x7190 +#define PCI_DID_INTEL_82443BX_1 0x7191 +#define PCI_DID_INTEL_82443BX_2 0x7192 +#define PCI_DID_INTEL_82443MX_0 0x7198 +#define PCI_DID_INTEL_82443MX_1 0x7199 +#define PCI_DID_INTEL_82443MX_2 0x719a +#define PCI_DID_INTEL_82443MX_3 0x719b +#define PCI_DID_INTEL_82372FB_0 0x7600 +#define PCI_DID_INTEL_82372FB_1 0x7601 +#define PCI_DID_INTEL_82372FB_2 0x7602 +#define PCI_DID_INTEL_82372FB_3 0x7603 +#define PCI_DID_INTEL_82454GX 0x84c4 +#define PCI_DID_INTEL_82450GX 0x84c5 +#define PCI_DID_INTEL_82451NX 0x84ca +#define PCI_DID_INTEL_82454NX 0x84cb +#define PCI_DID_INTEL_PCIE_PA 0x3595 +#define PCI_DID_INTEL_PCIE_PA1 0x3596 +#define PCI_DID_INTEL_PCIE_PB 0x3597 +#define PCI_DID_INTEL_PCIE_PC 0x3599 /* Intel Denverton (Atom C3000 family) */ -#define PCI_DEVICE_ID_INTEL_DNV_SA 0x1980 -#define PCI_DEVICE_ID_INTEL_DNVAD_SA 0x1995 -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP0 0x19a4 -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP1 0x19a5 -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP2 0x19a6 -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP3 0x19a7 -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP4 0x19a8 -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP5 0x19a9 -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP6 0x19aa -#define PCI_DEVICE_ID_INTEL_DNV_PCIE_RP7 0x19ab -#define PCI_DEVICE_ID_INTEL_DNV_SMBUS 0x19ac -#define PCI_DEVICE_ID_INTEL_DNV_SATA_AHCI_1 0x19b2 -#define PCI_DEVICE_ID_INTEL_DNV_SATA_AHCI_2 0x19c2 -#define PCI_DEVICE_ID_INTEL_DNV_XHCI 0x19d0 -#define PCI_DEVICE_ID_INTEL_DNV_LAN_1 0x19d1 -#define PCI_DEVICE_ID_INTEL_DNV_LAN_2 0x19d2 -#define PCI_DEVICE_ID_INTEL_DNV_ME_HECI_1 0x19d3 -#define PCI_DEVICE_ID_INTEL_DNV_ME_HECI_2 0x19d4 -#define PCI_DEVICE_ID_INTEL_DNV_ME_KT 0x19d5 -#define PCI_DEVICE_ID_INTEL_DNV_ME_HECI_3 0x19d6 -#define PCI_DEVICE_ID_INTEL_DNV_HSUART 0x19d8 -#define PCI_DEVICE_ID_INTEL_DNV_IE_HECI_1 0x19e5 -#define PCI_DEVICE_ID_INTEL_DNV_IE_HECI_2 0x19e6 -#define PCI_DEVICE_ID_INTEL_DNV_IE_KT 0x19e8 -#define PCI_DEVICE_ID_INTEL_DNV_IE_HECI_3 0x19e9 -#define PCI_DEVICE_ID_INTEL_DNV_EMMC 0x19db -#define PCI_DEVICE_ID_INTEL_DNV_LPC 0x19dc -#define PCI_DEVICE_ID_INTEL_DNV_P2SB 0x19dd -#define PCI_DEVICE_ID_INTEL_DNV_PMC 0x19de -#define PCI_DEVICE_ID_INTEL_DNV_SMBUS_LEGACY 0x19df -#define PCI_DEVICE_ID_INTEL_DNV_SPI 0x19e0 -#define PCI_DEVICE_ID_INTEL_DNV_TRACEHUB 0x19e1 +#define PCI_DID_INTEL_DNV_SA 0x1980 +#define PCI_DID_INTEL_DNVAD_SA 0x1995 +#define PCI_DID_INTEL_DNV_PCIE_RP0 0x19a4 +#define PCI_DID_INTEL_DNV_PCIE_RP1 0x19a5 +#define PCI_DID_INTEL_DNV_PCIE_RP2 0x19a6 +#define PCI_DID_INTEL_DNV_PCIE_RP3 0x19a7 +#define PCI_DID_INTEL_DNV_PCIE_RP4 0x19a8 +#define PCI_DID_INTEL_DNV_PCIE_RP5 0x19a9 +#define PCI_DID_INTEL_DNV_PCIE_RP6 0x19aa +#define PCI_DID_INTEL_DNV_PCIE_RP7 0x19ab +#define PCI_DID_INTEL_DNV_SMBUS 0x19ac +#define PCI_DID_INTEL_DNV_SATA_AHCI_1 0x19b2 +#define PCI_DID_INTEL_DNV_SATA_AHCI_2 0x19c2 +#define PCI_DID_INTEL_DNV_XHCI 0x19d0 +#define PCI_DID_INTEL_DNV_LAN_1 0x19d1 +#define PCI_DID_INTEL_DNV_LAN_2 0x19d2 +#define PCI_DID_INTEL_DNV_ME_HECI_1 0x19d3 +#define PCI_DID_INTEL_DNV_ME_HECI_2 0x19d4 +#define PCI_DID_INTEL_DNV_ME_KT 0x19d5 +#define PCI_DID_INTEL_DNV_ME_HECI_3 0x19d6 +#define PCI_DID_INTEL_DNV_HSUART 0x19d8 +#define PCI_DID_INTEL_DNV_IE_HECI_1 0x19e5 +#define PCI_DID_INTEL_DNV_IE_HECI_2 0x19e6 +#define PCI_DID_INTEL_DNV_IE_KT 0x19e8 +#define PCI_DID_INTEL_DNV_IE_HECI_3 0x19e9 +#define PCI_DID_INTEL_DNV_EMMC 0x19db +#define PCI_DID_INTEL_DNV_LPC 0x19dc +#define PCI_DID_INTEL_DNV_P2SB 0x19dd +#define PCI_DID_INTEL_DNV_PMC 0x19de +#define PCI_DID_INTEL_DNV_SMBUS_LEGACY 0x19df +#define PCI_DID_INTEL_DNV_SPI 0x19e0 +#define PCI_DID_INTEL_DNV_TRACEHUB 0x19e1 /* Intel Ibex Peak (5 Series Chipset and 3400 Series Chipset) */ #define PCI_DID_INTEL_IBEXPEAK_LPC_P55 0x3b02 @@ -2813,1679 +2813,1679 @@ #define PCI_DID_INTEL_IBEXPEAK_THERMAL 0x3b32 /* Intel SDMA device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_LP_SDMA 0x9c60 +#define PCI_DID_INTEL_LPT_LP_SDMA 0x9c60 /* Intel LPC device ids */ -#define PCI_DEVICE_ID_INTEL_LPT_MOBILE_SAMPLE 0x8c41 -#define PCI_DEVICE_ID_INTEL_LPT_DESKTOP_SAMPLE 0x8c42 -#define PCI_DEVICE_ID_INTEL_LPT_Z87 0x8c44 -#define PCI_DEVICE_ID_INTEL_LPT_Z85 0x8c46 -#define PCI_DEVICE_ID_INTEL_LPT_HM86 0x8c49 -#define PCI_DEVICE_ID_INTEL_LPT_H87 0x8c4a -#define PCI_DEVICE_ID_INTEL_LPT_HM87 0x8c4b -#define PCI_DEVICE_ID_INTEL_LPT_Q85 0x8c4c -#define PCI_DEVICE_ID_INTEL_LPT_Q87 0x8c4e -#define PCI_DEVICE_ID_INTEL_LPT_QM87 0x8c4f -#define PCI_DEVICE_ID_INTEL_LPT_B85 0x8c50 -#define PCI_DEVICE_ID_INTEL_LPT_C222 0x8c52 -#define PCI_DEVICE_ID_INTEL_LPT_C224 0x8c54 -#define PCI_DEVICE_ID_INTEL_LPT_C226 0x8c56 -#define PCI_DEVICE_ID_INTEL_LPT_H81 0x8c5c -#define PCI_DEVICE_ID_INTEL_LPT_LP_SAMPLE 0x9c41 -#define PCI_DEVICE_ID_INTEL_LPT_LP_PREMIUM 0x9c43 -#define PCI_DEVICE_ID_INTEL_LPT_LP_MAINSTREAM 0x9c45 -#define PCI_DEVICE_ID_INTEL_LPT_LP_VALUE 0x9c47 -#define PCI_DEVICE_ID_INTEL_SPT_LP_SAMPLE 0x9d41 -#define PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE 0x9d43 -#define PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM 0x9d48 -#define PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM 0x9d46 -#define PCI_DEVICE_ID_INTEL_SPT_H_H110 0xa143 -#define PCI_DEVICE_ID_INTEL_SPT_H_H170 0xa144 -#define PCI_DEVICE_ID_INTEL_SPT_H_Z170 0xa145 -#define PCI_DEVICE_ID_INTEL_SPT_H_Q170 0xa146 -#define PCI_DEVICE_ID_INTEL_SPT_H_Q150 0xa147 -#define PCI_DEVICE_ID_INTEL_SPT_H_B150 0xa148 -#define PCI_DEVICE_ID_INTEL_SPT_H_C236 0xa149 -#define PCI_DEVICE_ID_INTEL_SPT_H_C232 0xa14a -#define PCI_DEVICE_ID_INTEL_SPT_H_QM170 0xa14d -#define PCI_DEVICE_ID_INTEL_SPT_H_HM170 0xa14e -#define PCI_DEVICE_ID_INTEL_SPT_H_CM236 0xa150 -#define PCI_DEVICE_ID_INTEL_SPT_H_HM175 0xa152 -#define PCI_DEVICE_ID_INTEL_SPT_H_QM175 0xa153 -#define PCI_DEVICE_ID_INTEL_SPT_H_CM238 0xa154 -#define PCI_DEVICE_ID_INTEL_LWB_C621 0xa1c1 -#define PCI_DEVICE_ID_INTEL_LWB_C622 0xa1c2 -#define PCI_DEVICE_ID_INTEL_LWB_C624 0xa1c3 -#define PCI_DEVICE_ID_INTEL_LWB_C625 0xa1c4 -#define PCI_DEVICE_ID_INTEL_LWB_C626 0xa1c5 -#define PCI_DEVICE_ID_INTEL_LWB_C627 0xa1c6 -#define PCI_DEVICE_ID_INTEL_LWB_C628 0xa1c7 -#define PCI_DEVICE_ID_INTEL_LWB_C629 0xa1ca -#define PCI_DEVICE_ID_INTEL_LWB_C621A 0xa1cb -#define PCI_DEVICE_ID_INTEL_LWB_C627A 0xa1cc -#define PCI_DEVICE_ID_INTEL_LWB_C629A 0xa1cd -#define PCI_DEVICE_ID_INTEL_LWB_C624_SUPER 0xa242 -#define PCI_DEVICE_ID_INTEL_LWB_C627_SUPER_1 0xa243 -#define PCI_DEVICE_ID_INTEL_LWB_C621_SUPER 0xa244 -#define PCI_DEVICE_ID_INTEL_LWB_C627_SUPER_2 0xa245 -#define PCI_DEVICE_ID_INTEL_LWB_C628_SUPER 0xa246 -#define PCI_DEVICE_ID_INTEL_LWB_C621A_SUPER 0xa24a -#define PCI_DEVICE_ID_INTEL_LWB_C627A_SUPER 0xa24b -#define PCI_DEVICE_ID_INTEL_LWB_C629A_SUPER 0xa24c -#define PCI_DEVICE_ID_INTEL_EMB_SUPER 0x1b81 -#define PCI_DEVICE_ID_INTEL_UPT_H_H270 0xa2c4 -#define PCI_DEVICE_ID_INTEL_UPT_H_Z270 0xa2c5 -#define PCI_DEVICE_ID_INTEL_UPT_H_Q270 0xa2c6 -#define PCI_DEVICE_ID_INTEL_UPT_H_Q250 0xa2c7 -#define PCI_DEVICE_ID_INTEL_UPT_H_B250 0xa2c8 -#define PCI_DEVICE_ID_INTEL_UPT_H_Z370 0xa2c9 -#define PCI_DEVICE_ID_INTEL_UPT_H_H310C 0xa2ca -#define PCI_DEVICE_ID_INTEL_UPT_H_B365 0xa2cc -#define PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22 0x9d4b -#define PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22 0x9d4e -#define PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE_HDCP22 0x9d50 -#define PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU 0x9d51 -#define PCI_DEVICE_ID_INTEL_UPT_LP_U_BASE 0x9d53 -#define PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM 0x9d58 -#define PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM 0x9d56 -#define PCI_DEVICE_ID_INTEL_APL_LPC 0x5ae8 -#define PCI_DEVICE_ID_INTEL_GLK_LPC 0x31e8 -#define PCI_DEVICE_ID_INTEL_GLK_ESPI 0x3197 -#define PCI_DEVICE_ID_INTEL_CNL_BASE_U_LPC 0x9d85 -#define PCI_DEVICE_ID_INTEL_CNL_U_PREMIUM_LPC 0x9d84 -#define PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC 0x9d83 -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_H310 0xa303 -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_H370 0xa304 -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_Z390 0xa305 -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370 0xa306 -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_B360 0xa308 -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_C246 0xa309 -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_C242 0xa30a -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370 0xa30c -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_HM370 0xa30d -#define PCI_DEVICE_ID_INTEL_CNP_H_LPC_CM246 0xa30e -#define PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI 0x3480 -#define PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI_REV0 0x3481 -#define PCI_DEVICE_ID_INTEL_ICL_U_PREMIUM_ESPI 0x3482 -#define PCI_DEVICE_ID_INTEL_ICL_BASE_Y_ESPI 0x3483 -#define PCI_DEVICE_ID_INTEL_ICL_BASE_U_ESPI 0x3484 -#define PCI_DEVICE_ID_INTEL_ICL_Y_PREMIUM_ESPI 0x3487 -#define PCI_DEVICE_ID_INTEL_ICL_SUPER_Y_ESPI 0x3486 -#define PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC 0x0281 -#define PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC 0x0283 -#define PCI_DEVICE_ID_INTEL_CMP_PREMIUM_U_LPC 0x0284 -#define PCI_DEVICE_ID_INTEL_CMP_BASE_U_LPC 0x0285 -#define PCI_DEVICE_ID_INTEL_CMP_SUPER_Y_LPC 0x0286 -#define PCI_DEVICE_ID_INTEL_CMP_H_LPC_HM470 0x068D -#define PCI_DEVICE_ID_INTEL_CMP_H_LPC_WM490 0x068E -#define PCI_DEVICE_ID_INTEL_CMP_H_LPC_QM480 0x068C -#define PCI_DEVICE_ID_INTEL_CMP_H_LPC_W480 0x0697 -#define PCI_DEVICE_ID_INTEL_CMP_H_LPC_H470 0x0684 -#define PCI_DEVICE_ID_INTEL_CMP_H_LPC_Z490 0x0685 -#define PCI_DEVICE_ID_INTEL_CMP_H_LPC_Q470 0x0687 -#define PCI_DEVICE_ID_INTEL_TGL_ESPI 0xA083 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_0 0xA080 -#define PCI_DEVICE_ID_INTEL_TGP_SUPER_U_ESPI 0xA081 -#define PCI_DEVICE_ID_INTEL_TGP_PREMIUM_U_ESPI 0xA082 -#define PCI_DEVICE_ID_INTEL_TGP_BASE_U_ESPI 0xA083 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_1 0xA084 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_2 0xA085 -#define PCI_DEVICE_ID_INTEL_TGP_SUPER_Y_ESPI 0xA086 -#define PCI_DEVICE_ID_INTEL_TGP_PREMIUM_Y_ESPI 0xA087 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_3 0xA088 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_4 0xA089 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_5 0xA08A -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_6 0xA08B -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_7 0xA08C -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_8 0xA08D -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_9 0xA08E -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_10 0xA08F -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_11 0xA090 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_12 0xA091 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_13 0xA092 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_14 0xA093 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_15 0xA094 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_16 0xA095 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_17 0xA096 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_18 0xA097 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_19 0xA098 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_20 0xA099 -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_21 0xA09A -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_22 0xA09B -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_23 0xA09C -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_24 0xA09D -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_25 0xA09E -#define PCI_DEVICE_ID_INTEL_TGP_ESPI_26 0xA09F -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_B560 0x4387 -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H510 0x4388 -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H570 0x4386 -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Q570 0x4384 -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_W580 0x438F -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Z590 0x4385 -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_HM570 0x438B -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_QM580 0x438A -#define PCI_DEVICE_ID_INTEL_TGP_H_ESPI_WM590 0x4389 -#define PCI_DEVICE_ID_INTEL_MCC_ESPI_0 0x4b00 -#define PCI_DEVICE_ID_INTEL_MCC_ESPI_1 0x4b04 -#define PCI_DEVICE_ID_INTEL_MCC_BASE_ESPI 0x4b03 -#define PCI_DEVICE_ID_INTEL_MCC_PREMIUM_ESPI 0x4b02 -#define PCI_DEVICE_ID_INTEL_MCC_SUPER_ESPI 0x4b01 -#define PCI_DEVICE_ID_INTEL_MCC_ESPI_2 0x4b05 -#define PCI_DEVICE_ID_INTEL_MCC_ESPI_3 0x4b06 -#define PCI_DEVICE_ID_INTEL_MCC_ESPI_4 0x4b07 -#define PCI_DEVICE_ID_INTEL_JSP_SUPER_ESPI 0x4d87 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_0 0x7a00 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_1 0x7a01 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_2 0x7a02 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_3 0x7a03 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_4 0x7a04 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_5 0x7a05 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_6 0x7a06 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_7 0x7a07 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_8 0x7a08 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_9 0x7a09 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_10 0x7a0a -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_11 0x7a0b -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_12 0x7a0c -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_13 0x7a0d -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_14 0x7a0e -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_15 0x7a0f -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_16 0x7a10 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_17 0x7a11 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_18 0x7a12 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_19 0x7a13 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_20 0x7a14 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_21 0x7a15 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_22 0x7a16 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_23 0x7a17 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_24 0x7a18 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_25 0x7a19 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_26 0x7a1a -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_27 0x7a1b -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_28 0x7a1c -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_29 0x7a1d -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_30 0x7a1e -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_31 0x7a1f -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_32 0x5181 -#define PCI_DEVICE_ID_INTEL_ADP_P_ESPI_33 0x5182 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_0 0x7a80 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_1 0x7a81 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_2 0x7a82 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_3 0x7a83 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_4 0x7a84 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_5 0x7a85 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_6 0x7a86 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_7 0x7a87 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_8 0x7a88 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_9 0x7a89 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_10 0x7a8a -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_11 0x7a8b -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_12 0x7a8c -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_13 0x7a8d -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_14 0x7a8e -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_15 0x7a8f -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_16 0x7a90 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_17 0x7a91 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_18 0x7a92 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_19 0x7a93 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_20 0x7a94 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_21 0x7a95 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_22 0x7a96 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_23 0x7a97 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_24 0x7a98 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_25 0x7a99 -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_26 0x7a9a -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_27 0x7a9b -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_28 0x7a9c -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_29 0x7a9d -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_30 0x7a9e -#define PCI_DEVICE_ID_INTEL_ADP_S_ESPI_31 0x7a9f -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_0 0x5480 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_1 0x5481 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_2 0x5482 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_3 0x5483 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_4 0x5484 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_5 0x5485 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_6 0x5486 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_7 0x5487 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_8 0x5488 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_9 0x5489 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_10 0x548a -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_11 0x548b -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_12 0x548c -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_13 0x548d -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_14 0x548e -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_15 0x548f -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_16 0x5490 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_17 0x5491 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_18 0x5492 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_19 0x5493 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_20 0x5494 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_21 0x5495 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_22 0x5496 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_23 0x5497 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_24 0x5498 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_25 0x5499 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_26 0x549a -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_27 0x549b -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_28 0x548c -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_29 0x549d -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_30 0x549e -#define PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_31 0x549f -#define PCI_DEVICE_ID_INTEL_ADP_M_ESPI_32 0x5186 -#define PCI_DEVICE_ID_INTEL_SPR_ESPI_1 0x1b80 +#define PCI_DID_INTEL_LPT_MOBILE_SAMPLE 0x8c41 +#define PCI_DID_INTEL_LPT_DESKTOP_SAMPLE 0x8c42 +#define PCI_DID_INTEL_LPT_Z87 0x8c44 +#define PCI_DID_INTEL_LPT_Z85 0x8c46 +#define PCI_DID_INTEL_LPT_HM86 0x8c49 +#define PCI_DID_INTEL_LPT_H87 0x8c4a +#define PCI_DID_INTEL_LPT_HM87 0x8c4b +#define PCI_DID_INTEL_LPT_Q85 0x8c4c +#define PCI_DID_INTEL_LPT_Q87 0x8c4e +#define PCI_DID_INTEL_LPT_QM87 0x8c4f +#define PCI_DID_INTEL_LPT_B85 0x8c50 +#define PCI_DID_INTEL_LPT_C222 0x8c52 +#define PCI_DID_INTEL_LPT_C224 0x8c54 +#define PCI_DID_INTEL_LPT_C226 0x8c56 +#define PCI_DID_INTEL_LPT_H81 0x8c5c +#define PCI_DID_INTEL_LPT_LP_SAMPLE 0x9c41 +#define PCI_DID_INTEL_LPT_LP_PREMIUM 0x9c43 +#define PCI_DID_INTEL_LPT_LP_MAINSTREAM 0x9c45 +#define PCI_DID_INTEL_LPT_LP_VALUE 0x9c47 +#define PCI_DID_INTEL_SPT_LP_SAMPLE 0x9d41 +#define PCI_DID_INTEL_SPT_LP_U_BASE 0x9d43 +#define PCI_DID_INTEL_SPT_LP_U_PREMIUM 0x9d48 +#define PCI_DID_INTEL_SPT_LP_Y_PREMIUM 0x9d46 +#define PCI_DID_INTEL_SPT_H_H110 0xa143 +#define PCI_DID_INTEL_SPT_H_H170 0xa144 +#define PCI_DID_INTEL_SPT_H_Z170 0xa145 +#define PCI_DID_INTEL_SPT_H_Q170 0xa146 +#define PCI_DID_INTEL_SPT_H_Q150 0xa147 +#define PCI_DID_INTEL_SPT_H_B150 0xa148 +#define PCI_DID_INTEL_SPT_H_C236 0xa149 +#define PCI_DID_INTEL_SPT_H_C232 0xa14a +#define PCI_DID_INTEL_SPT_H_QM170 0xa14d +#define PCI_DID_INTEL_SPT_H_HM170 0xa14e +#define PCI_DID_INTEL_SPT_H_CM236 0xa150 +#define PCI_DID_INTEL_SPT_H_HM175 0xa152 +#define PCI_DID_INTEL_SPT_H_QM175 0xa153 +#define PCI_DID_INTEL_SPT_H_CM238 0xa154 +#define PCI_DID_INTEL_LWB_C621 0xa1c1 +#define PCI_DID_INTEL_LWB_C622 0xa1c2 +#define PCI_DID_INTEL_LWB_C624 0xa1c3 +#define PCI_DID_INTEL_LWB_C625 0xa1c4 +#define PCI_DID_INTEL_LWB_C626 0xa1c5 +#define PCI_DID_INTEL_LWB_C627 0xa1c6 +#define PCI_DID_INTEL_LWB_C628 0xa1c7 +#define PCI_DID_INTEL_LWB_C629 0xa1ca +#define PCI_DID_INTEL_LWB_C621A 0xa1cb +#define PCI_DID_INTEL_LWB_C627A 0xa1cc +#define PCI_DID_INTEL_LWB_C629A 0xa1cd +#define PCI_DID_INTEL_LWB_C624_SUPER 0xa242 +#define PCI_DID_INTEL_LWB_C627_SUPER_1 0xa243 +#define PCI_DID_INTEL_LWB_C621_SUPER 0xa244 +#define PCI_DID_INTEL_LWB_C627_SUPER_2 0xa245 +#define PCI_DID_INTEL_LWB_C628_SUPER 0xa246 +#define PCI_DID_INTEL_LWB_C621A_SUPER 0xa24a +#define PCI_DID_INTEL_LWB_C627A_SUPER 0xa24b +#define PCI_DID_INTEL_LWB_C629A_SUPER 0xa24c +#define PCI_DID_INTEL_EMB_SUPER 0x1b81 +#define PCI_DID_INTEL_UPT_H_H270 0xa2c4 +#define PCI_DID_INTEL_UPT_H_Z270 0xa2c5 +#define PCI_DID_INTEL_UPT_H_Q270 0xa2c6 +#define PCI_DID_INTEL_UPT_H_Q250 0xa2c7 +#define PCI_DID_INTEL_UPT_H_B250 0xa2c8 +#define PCI_DID_INTEL_UPT_H_Z370 0xa2c9 +#define PCI_DID_INTEL_UPT_H_H310C 0xa2ca +#define PCI_DID_INTEL_UPT_H_B365 0xa2cc +#define PCI_DID_INTEL_SPT_LP_Y_PREMIUM_HDCP22 0x9d4b +#define PCI_DID_INTEL_SPT_LP_U_PREMIUM_HDCP22 0x9d4e +#define PCI_DID_INTEL_SPT_LP_U_BASE_HDCP22 0x9d50 +#define PCI_DID_INTEL_UPT_LP_SUPER_SKU 0x9d51 +#define PCI_DID_INTEL_UPT_LP_U_BASE 0x9d53 +#define PCI_DID_INTEL_UPT_LP_U_PREMIUM 0x9d58 +#define PCI_DID_INTEL_UPT_LP_Y_PREMIUM 0x9d56 +#define PCI_DID_INTEL_APL_LPC 0x5ae8 +#define PCI_DID_INTEL_GLK_LPC 0x31e8 +#define PCI_DID_INTEL_GLK_ESPI 0x3197 +#define PCI_DID_INTEL_CNL_BASE_U_LPC 0x9d85 +#define PCI_DID_INTEL_CNL_U_PREMIUM_LPC 0x9d84 +#define PCI_DID_INTEL_CNL_Y_PREMIUM_LPC 0x9d83 +#define PCI_DID_INTEL_CNP_H_LPC_H310 0xa303 +#define PCI_DID_INTEL_CNP_H_LPC_H370 0xa304 +#define PCI_DID_INTEL_CNP_H_LPC_Z390 0xa305 +#define PCI_DID_INTEL_CNP_H_LPC_Q370 0xa306 +#define PCI_DID_INTEL_CNP_H_LPC_B360 0xa308 +#define PCI_DID_INTEL_CNP_H_LPC_C246 0xa309 +#define PCI_DID_INTEL_CNP_H_LPC_C242 0xa30a +#define PCI_DID_INTEL_CNP_H_LPC_QM370 0xa30c +#define PCI_DID_INTEL_CNP_H_LPC_HM370 0xa30d +#define PCI_DID_INTEL_CNP_H_LPC_CM246 0xa30e +#define PCI_DID_INTEL_ICL_U_SUPER_U_ESPI 0x3480 +#define PCI_DID_INTEL_ICL_U_SUPER_U_ESPI_REV0 0x3481 +#define PCI_DID_INTEL_ICL_U_PREMIUM_ESPI 0x3482 +#define PCI_DID_INTEL_ICL_BASE_Y_ESPI 0x3483 +#define PCI_DID_INTEL_ICL_BASE_U_ESPI 0x3484 +#define PCI_DID_INTEL_ICL_Y_PREMIUM_ESPI 0x3487 +#define PCI_DID_INTEL_ICL_SUPER_Y_ESPI 0x3486 +#define PCI_DID_INTEL_CMP_SUPER_U_LPC 0x0281 +#define PCI_DID_INTEL_CMP_PREMIUM_Y_LPC 0x0283 +#define PCI_DID_INTEL_CMP_PREMIUM_U_LPC 0x0284 +#define PCI_DID_INTEL_CMP_BASE_U_LPC 0x0285 +#define PCI_DID_INTEL_CMP_SUPER_Y_LPC 0x0286 +#define PCI_DID_INTEL_CMP_H_LPC_HM470 0x068D +#define PCI_DID_INTEL_CMP_H_LPC_WM490 0x068E +#define PCI_DID_INTEL_CMP_H_LPC_QM480 0x068C +#define PCI_DID_INTEL_CMP_H_LPC_W480 0x0697 +#define PCI_DID_INTEL_CMP_H_LPC_H470 0x0684 +#define PCI_DID_INTEL_CMP_H_LPC_Z490 0x0685 +#define PCI_DID_INTEL_CMP_H_LPC_Q470 0x0687 +#define PCI_DID_INTEL_TGL_ESPI 0xA083 +#define PCI_DID_INTEL_TGP_ESPI_0 0xA080 +#define PCI_DID_INTEL_TGP_SUPER_U_ESPI 0xA081 +#define PCI_DID_INTEL_TGP_PREMIUM_U_ESPI 0xA082 +#define PCI_DID_INTEL_TGP_BASE_U_ESPI 0xA083 +#define PCI_DID_INTEL_TGP_ESPI_1 0xA084 +#define PCI_DID_INTEL_TGP_ESPI_2 0xA085 +#define PCI_DID_INTEL_TGP_SUPER_Y_ESPI 0xA086 +#define PCI_DID_INTEL_TGP_PREMIUM_Y_ESPI 0xA087 +#define PCI_DID_INTEL_TGP_ESPI_3 0xA088 +#define PCI_DID_INTEL_TGP_ESPI_4 0xA089 +#define PCI_DID_INTEL_TGP_ESPI_5 0xA08A +#define PCI_DID_INTEL_TGP_ESPI_6 0xA08B +#define PCI_DID_INTEL_TGP_ESPI_7 0xA08C +#define PCI_DID_INTEL_TGP_ESPI_8 0xA08D +#define PCI_DID_INTEL_TGP_ESPI_9 0xA08E +#define PCI_DID_INTEL_TGP_ESPI_10 0xA08F +#define PCI_DID_INTEL_TGP_ESPI_11 0xA090 +#define PCI_DID_INTEL_TGP_ESPI_12 0xA091 +#define PCI_DID_INTEL_TGP_ESPI_13 0xA092 +#define PCI_DID_INTEL_TGP_ESPI_14 0xA093 +#define PCI_DID_INTEL_TGP_ESPI_15 0xA094 +#define PCI_DID_INTEL_TGP_ESPI_16 0xA095 +#define PCI_DID_INTEL_TGP_ESPI_17 0xA096 +#define PCI_DID_INTEL_TGP_ESPI_18 0xA097 +#define PCI_DID_INTEL_TGP_ESPI_19 0xA098 +#define PCI_DID_INTEL_TGP_ESPI_20 0xA099 +#define PCI_DID_INTEL_TGP_ESPI_21 0xA09A +#define PCI_DID_INTEL_TGP_ESPI_22 0xA09B +#define PCI_DID_INTEL_TGP_ESPI_23 0xA09C +#define PCI_DID_INTEL_TGP_ESPI_24 0xA09D +#define PCI_DID_INTEL_TGP_ESPI_25 0xA09E +#define PCI_DID_INTEL_TGP_ESPI_26 0xA09F +#define PCI_DID_INTEL_TGP_H_ESPI_B560 0x4387 +#define PCI_DID_INTEL_TGP_H_ESPI_H510 0x4388 +#define PCI_DID_INTEL_TGP_H_ESPI_H570 0x4386 +#define PCI_DID_INTEL_TGP_H_ESPI_Q570 0x4384 +#define PCI_DID_INTEL_TGP_H_ESPI_W580 0x438F +#define PCI_DID_INTEL_TGP_H_ESPI_Z590 0x4385 +#define PCI_DID_INTEL_TGP_H_ESPI_HM570 0x438B +#define PCI_DID_INTEL_TGP_H_ESPI_QM580 0x438A +#define PCI_DID_INTEL_TGP_H_ESPI_WM590 0x4389 +#define PCI_DID_INTEL_MCC_ESPI_0 0x4b00 +#define PCI_DID_INTEL_MCC_ESPI_1 0x4b04 +#define PCI_DID_INTEL_MCC_BASE_ESPI 0x4b03 +#define PCI_DID_INTEL_MCC_PREMIUM_ESPI 0x4b02 +#define PCI_DID_INTEL_MCC_SUPER_ESPI 0x4b01 +#define PCI_DID_INTEL_MCC_ESPI_2 0x4b05 +#define PCI_DID_INTEL_MCC_ESPI_3 0x4b06 +#define PCI_DID_INTEL_MCC_ESPI_4 0x4b07 +#define PCI_DID_INTEL_JSP_SUPER_ESPI 0x4d87 +#define PCI_DID_INTEL_ADP_P_ESPI_0 0x7a00 +#define PCI_DID_INTEL_ADP_P_ESPI_1 0x7a01 +#define PCI_DID_INTEL_ADP_P_ESPI_2 0x7a02 +#define PCI_DID_INTEL_ADP_P_ESPI_3 0x7a03 +#define PCI_DID_INTEL_ADP_P_ESPI_4 0x7a04 +#define PCI_DID_INTEL_ADP_P_ESPI_5 0x7a05 +#define PCI_DID_INTEL_ADP_P_ESPI_6 0x7a06 +#define PCI_DID_INTEL_ADP_P_ESPI_7 0x7a07 +#define PCI_DID_INTEL_ADP_P_ESPI_8 0x7a08 +#define PCI_DID_INTEL_ADP_P_ESPI_9 0x7a09 +#define PCI_DID_INTEL_ADP_P_ESPI_10 0x7a0a +#define PCI_DID_INTEL_ADP_P_ESPI_11 0x7a0b +#define PCI_DID_INTEL_ADP_P_ESPI_12 0x7a0c +#define PCI_DID_INTEL_ADP_P_ESPI_13 0x7a0d +#define PCI_DID_INTEL_ADP_P_ESPI_14 0x7a0e +#define PCI_DID_INTEL_ADP_P_ESPI_15 0x7a0f +#define PCI_DID_INTEL_ADP_P_ESPI_16 0x7a10 +#define PCI_DID_INTEL_ADP_P_ESPI_17 0x7a11 +#define PCI_DID_INTEL_ADP_P_ESPI_18 0x7a12 +#define PCI_DID_INTEL_ADP_P_ESPI_19 0x7a13 +#define PCI_DID_INTEL_ADP_P_ESPI_20 0x7a14 +#define PCI_DID_INTEL_ADP_P_ESPI_21 0x7a15 +#define PCI_DID_INTEL_ADP_P_ESPI_22 0x7a16 +#define PCI_DID_INTEL_ADP_P_ESPI_23 0x7a17 +#define PCI_DID_INTEL_ADP_P_ESPI_24 0x7a18 +#define PCI_DID_INTEL_ADP_P_ESPI_25 0x7a19 +#define PCI_DID_INTEL_ADP_P_ESPI_26 0x7a1a +#define PCI_DID_INTEL_ADP_P_ESPI_27 0x7a1b +#define PCI_DID_INTEL_ADP_P_ESPI_28 0x7a1c +#define PCI_DID_INTEL_ADP_P_ESPI_29 0x7a1d +#define PCI_DID_INTEL_ADP_P_ESPI_30 0x7a1e +#define PCI_DID_INTEL_ADP_P_ESPI_31 0x7a1f +#define PCI_DID_INTEL_ADP_P_ESPI_32 0x5181 +#define PCI_DID_INTEL_ADP_P_ESPI_33 0x5182 +#define PCI_DID_INTEL_ADP_S_ESPI_0 0x7a80 +#define PCI_DID_INTEL_ADP_S_ESPI_1 0x7a81 +#define PCI_DID_INTEL_ADP_S_ESPI_2 0x7a82 +#define PCI_DID_INTEL_ADP_S_ESPI_3 0x7a83 +#define PCI_DID_INTEL_ADP_S_ESPI_4 0x7a84 +#define PCI_DID_INTEL_ADP_S_ESPI_5 0x7a85 +#define PCI_DID_INTEL_ADP_S_ESPI_6 0x7a86 +#define PCI_DID_INTEL_ADP_S_ESPI_7 0x7a87 +#define PCI_DID_INTEL_ADP_S_ESPI_8 0x7a88 +#define PCI_DID_INTEL_ADP_S_ESPI_9 0x7a89 +#define PCI_DID_INTEL_ADP_S_ESPI_10 0x7a8a +#define PCI_DID_INTEL_ADP_S_ESPI_11 0x7a8b +#define PCI_DID_INTEL_ADP_S_ESPI_12 0x7a8c +#define PCI_DID_INTEL_ADP_S_ESPI_13 0x7a8d +#define PCI_DID_INTEL_ADP_S_ESPI_14 0x7a8e +#define PCI_DID_INTEL_ADP_S_ESPI_15 0x7a8f +#define PCI_DID_INTEL_ADP_S_ESPI_16 0x7a90 +#define PCI_DID_INTEL_ADP_S_ESPI_17 0x7a91 +#define PCI_DID_INTEL_ADP_S_ESPI_18 0x7a92 +#define PCI_DID_INTEL_ADP_S_ESPI_19 0x7a93 +#define PCI_DID_INTEL_ADP_S_ESPI_20 0x7a94 +#define PCI_DID_INTEL_ADP_S_ESPI_21 0x7a95 +#define PCI_DID_INTEL_ADP_S_ESPI_22 0x7a96 +#define PCI_DID_INTEL_ADP_S_ESPI_23 0x7a97 +#define PCI_DID_INTEL_ADP_S_ESPI_24 0x7a98 +#define PCI_DID_INTEL_ADP_S_ESPI_25 0x7a99 +#define PCI_DID_INTEL_ADP_S_ESPI_26 0x7a9a +#define PCI_DID_INTEL_ADP_S_ESPI_27 0x7a9b +#define PCI_DID_INTEL_ADP_S_ESPI_28 0x7a9c +#define PCI_DID_INTEL_ADP_S_ESPI_29 0x7a9d +#define PCI_DID_INTEL_ADP_S_ESPI_30 0x7a9e +#define PCI_DID_INTEL_ADP_S_ESPI_31 0x7a9f +#define PCI_DID_INTEL_ADP_M_N_ESPI_0 0x5480 +#define PCI_DID_INTEL_ADP_M_N_ESPI_1 0x5481 +#define PCI_DID_INTEL_ADP_M_N_ESPI_2 0x5482 +#define PCI_DID_INTEL_ADP_M_N_ESPI_3 0x5483 +#define PCI_DID_INTEL_ADP_M_N_ESPI_4 0x5484 +#define PCI_DID_INTEL_ADP_M_N_ESPI_5 0x5485 +#define PCI_DID_INTEL_ADP_M_N_ESPI_6 0x5486 +#define PCI_DID_INTEL_ADP_M_N_ESPI_7 0x5487 +#define PCI_DID_INTEL_ADP_M_N_ESPI_8 0x5488 +#define PCI_DID_INTEL_ADP_M_N_ESPI_9 0x5489 +#define PCI_DID_INTEL_ADP_M_N_ESPI_10 0x548a +#define PCI_DID_INTEL_ADP_M_N_ESPI_11 0x548b +#define PCI_DID_INTEL_ADP_M_N_ESPI_12 0x548c +#define PCI_DID_INTEL_ADP_M_N_ESPI_13 0x548d +#define PCI_DID_INTEL_ADP_M_N_ESPI_14 0x548e +#define PCI_DID_INTEL_ADP_M_N_ESPI_15 0x548f +#define PCI_DID_INTEL_ADP_M_N_ESPI_16 0x5490 +#define PCI_DID_INTEL_ADP_M_N_ESPI_17 0x5491 +#define PCI_DID_INTEL_ADP_M_N_ESPI_18 0x5492 +#define PCI_DID_INTEL_ADP_M_N_ESPI_19 0x5493 +#define PCI_DID_INTEL_ADP_M_N_ESPI_20 0x5494 +#define PCI_DID_INTEL_ADP_M_N_ESPI_21 0x5495 +#define PCI_DID_INTEL_ADP_M_N_ESPI_22 0x5496 +#define PCI_DID_INTEL_ADP_M_N_ESPI_23 0x5497 +#define PCI_DID_INTEL_ADP_M_N_ESPI_24 0x5498 +#define PCI_DID_INTEL_ADP_M_N_ESPI_25 0x5499 +#define PCI_DID_INTEL_ADP_M_N_ESPI_26 0x549a +#define PCI_DID_INTEL_ADP_M_N_ESPI_27 0x549b +#define PCI_DID_INTEL_ADP_M_N_ESPI_28 0x548c +#define PCI_DID_INTEL_ADP_M_N_ESPI_29 0x549d +#define PCI_DID_INTEL_ADP_M_N_ESPI_30 0x549e +#define PCI_DID_INTEL_ADP_M_N_ESPI_31 0x549f +#define PCI_DID_INTEL_ADP_M_ESPI_32 0x5186 +#define PCI_DID_INTEL_SPR_ESPI_1 0x1b80 /* Intel PCIE device ids */ -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP1 0x8c10 -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP2 0x8c12 -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP3 0x8c14 -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP4 0x8c16 -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP5 0x8c18 -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP6 0x8c1a -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP7 0x8c1c -#define PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP8 0x8c1e -#define PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP1 0x9c10 -#define PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP2 0x9c12 -#define PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP3 0x9c14 -#define PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP4 0x9c16 -#define PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP5 0x9c18 -#define PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP6 0x9c1a - -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP1 0x9d10 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP2 0x9d11 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP3 0x9d12 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP4 0x9d13 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP5 0x9d14 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP6 0x9d15 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP7 0x9d16 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP8 0x9d17 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP9 0x9d18 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP10 0x9d19 -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP11 0x9d1a -#define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP12 0x9d1b - -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP1 0xa110 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP2 0xa111 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP3 0xa112 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP4 0xa113 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP5 0xa114 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP6 0xa115 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP7 0xa116 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP8 0xa117 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP9 0xa118 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP10 0xa119 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP11 0xa11a -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP12 0xa11b -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP13 0xa11c -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP14 0xa11d -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP15 0xa11e -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP16 0xa11f -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP17 0xa167 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP18 0xa168 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP19 0xa169 -#define PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP20 0xa16a - -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP1 0xa190 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP2 0xa191 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP3 0xa192 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP4 0xa193 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP5 0xa194 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP6 0xa195 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP7 0xa196 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP8 0xa197 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP9 0xa198 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP10 0xa199 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP11 0xa19a -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP12 0xa19b -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP13 0xa19c -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP14 0xa19d -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP15 0xa19e -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP16 0xa19f -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP17 0xa1e7 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP18 0xa1e8 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19 0xa1e9 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20 0xa1ea - -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP1_SUPER 0xa210 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP2_SUPER 0xa211 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP3_SUPER 0xa212 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP4_SUPER 0xa213 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP5_SUPER 0xa214 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP6_SUPER 0xa215 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP7_SUPER 0xa216 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP8_SUPER 0xa217 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP9_SUPER 0xa218 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP10_SUPER 0xa219 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP11_SUPER 0xa21a -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP12_SUPER 0xa21b -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP13_SUPER 0xa21c -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP14_SUPER 0xa21d -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP15_SUPER 0xa21e -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP16_SUPER 0xa21f -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP17_SUPER 0xa267 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP18_SUPER 0xa268 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19_SUPER 0xa269 -#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20_SUPER 0xa26a - -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP1 0xa290 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP2 0xa291 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP3 0xa292 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP4 0xa293 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP5 0xa294 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP6 0xa295 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP7 0xa296 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP8 0xa297 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP9 0xa298 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP10 0xa299 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP11 0xa29a -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP12 0xa29b -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP13 0xa29c -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP14 0xa29d -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP15 0xa29e -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP16 0xa29f -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP17 0xa2e7 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP18 0xa2e8 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP19 0xa2e9 -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP20 0xa2ea -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP21 0xa2eb -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP22 0xa2ec -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP23 0xa2ed -#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP24 0xa2ee - -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP1 0x9db8 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP2 0x9db9 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP3 0x9dba -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP4 0x9dbb -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP5 0x9dbc -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP6 0x9dbd -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP7 0x9dbe -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP8 0x9dbf -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP9 0x9db0 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP10 0x9db1 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP11 0x9db2 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP12 0x9db3 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP13 0x9db4 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP14 0x9db5 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP15 0x9db6 -#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP16 0x9db7 - -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP1 0x34b8 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP2 0x34b9 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP3 0x34ba -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP4 0x34bb -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP5 0x34bc -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP6 0x34bd -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP7 0x34be -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP8 0x34bf -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP9 0x34b0 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP10 0x34b1 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP11 0x34b2 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP12 0x34b3 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP13 0x34b4 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP14 0x34b5 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP15 0x34b6 -#define PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP16 0x34b7 - -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP1 0xa0b8 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP2 0xa0b9 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP3 0xa0ba -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP4 0xa0bb -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP5 0xa0bc -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP6 0xa0bd -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP7 0xa0be -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP8 0xa0bf -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP9 0xa0b0 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP10 0xa0b1 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP11 0xa0b2 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP12 0xa0b3 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP13 0xa0b4 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP14 0xa0b5 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP15 0xa0b6 -#define PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP16 0xa0b7 - -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP1 0x43b8 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP2 0x43b9 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP3 0x43ba -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP4 0x43bb -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP5 0x43bc -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP6 0x43bd -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP7 0x43be -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP8 0x43bf -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP9 0x43b0 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP10 0x43b1 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP11 0x43b2 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP12 0x43b3 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP13 0x43b4 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP14 0x43b5 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP15 0x43b6 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP16 0x43b7 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP17 0x43c0 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP18 0x43c1 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP19 0x43c2 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP20 0x43c3 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP21 0x43c4 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP22 0x43c5 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP23 0x43c6 -#define PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP24 0x43c7 - -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP1 0xa338 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP2 0xa339 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP3 0xa33a -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP4 0xa33b -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP5 0xa33c -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP6 0xa33d -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP7 0xa33e -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP8 0xa33f -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP9 0xa330 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP10 0xa331 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP11 0xa332 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP12 0xa333 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP13 0xa334 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP14 0xa335 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP15 0xa336 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP16 0xa337 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP17 0xa340 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP18 0xa341 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP19 0xa342 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP20 0xa343 -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP21 0xa32c -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP22 0xa32d -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP23 0xa32e -#define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP24 0xa32f - -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP1 0x02b8 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP2 0x02b9 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP3 0x02ba -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP4 0x02bb -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP5 0x02bc -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP6 0x02bd -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP7 0x02be -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP8 0x02bf -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP9 0x02b0 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP10 0x02b1 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP11 0x02b2 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP12 0x02b3 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP13 0x02b4 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP14 0x02b5 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP15 0x02b6 -#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP16 0x02b7 - -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP1 0x06b8 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP2 0x06b9 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP3 0x06ba -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP4 0x06bb -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP5 0x06bc -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP6 0x06bd -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP7 0x06be -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP8 0x06bf -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP9 0x06b0 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP10 0x06b1 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP11 0x06b2 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP12 0x06b3 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP13 0x06b4 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP14 0x06b5 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP15 0x06b6 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP16 0x06b7 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP17 0x06c0 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP18 0x06c1 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP19 0x06c2 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP20 0x06c3 -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP21 0x06ac -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP22 0x06ad -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP23 0x06ae -#define PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP24 0x06af - -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP1 0x4db8 -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP2 0x4db9 -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP3 0x4dba -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP4 0x4dbb -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP5 0x4dbc -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP6 0x4dbd -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP7 0x4dbe -#define PCI_DEVICE_ID_INTEL_JSP_PCIE_RP8 0x4dbf - -#define PCI_DEVICE_ID_INTEL_MCC_PCIE_RP1 0x4b38 -#define PCI_DEVICE_ID_INTEL_MCC_PCIE_RP2 0x4b39 -#define PCI_DEVICE_ID_INTEL_MCC_PCIE_RP3 0x4b3a -#define PCI_DEVICE_ID_INTEL_MCC_PCIE_RP4 0x4b3b -#define PCI_DEVICE_ID_INTEL_MCC_PCIE_RP5 0x4b3c -#define PCI_DEVICE_ID_INTEL_MCC_PCIE_RP6 0x4b3d -#define PCI_DEVICE_ID_INTEL_MCC_PCIE_RP7 0x4b3e - -#define PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP1 0x464d -#define PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP2 0x460d -#define PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP3 0x463d - -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP1 0x51b8 -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP2 0x51b9 -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP3 0x51ba -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP4 0x51bb -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP5 0x51bc -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP6 0x51bd -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP7 0x51be -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP8 0x51bf -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP9 0x51b0 -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP10 0x51b1 -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP11 0x51b2 -#define PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP12 0x51b3 - -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP1 0x7ab8 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP2 0x7ab9 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP3 0x7aba -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP4 0x7abb -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP5 0x7abc -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP6 0x7abd -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP7 0x7abe -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP8 0x7abf -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP9 0x7ab0 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP10 0x7ab1 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP11 0x7ab2 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP12 0x7ab3 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP13 0x7ab4 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP14 0x7ab5 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP15 0x7ab6 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP16 0x7ab7 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP17 0x7ac0 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP18 0x7ac1 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP19 0x7ac2 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP20 0x7ac3 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP21 0x7ac4 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP22 0x7ac5 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP23 0x7ac6 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP24 0x7ac7 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP25 0x7ac8 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP26 0x7ac9 -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP27 0x7aca -#define PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP28 0x7acb - -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP1 0x54b8 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP2 0x54b9 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP3 0x54ba -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP4 0x54bb -#define PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP5 0x54bc -#define PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP6 0x54bd -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP7 0x54be -#define PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP8 0x54bf -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP9 0x54b0 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP10 0x54b1 -#define PCI_DEVICE_ID_INTEL_ADP_N_PCIE_RP11 0x54b2 -#define PCI_DEVICE_ID_INTEL_ADP_N_PCIE_RP12 0x54b3 +#define PCI_DID_INTEL_LPT_H_PCIE_RP1 0x8c10 +#define PCI_DID_INTEL_LPT_H_PCIE_RP2 0x8c12 +#define PCI_DID_INTEL_LPT_H_PCIE_RP3 0x8c14 +#define PCI_DID_INTEL_LPT_H_PCIE_RP4 0x8c16 +#define PCI_DID_INTEL_LPT_H_PCIE_RP5 0x8c18 +#define PCI_DID_INTEL_LPT_H_PCIE_RP6 0x8c1a +#define PCI_DID_INTEL_LPT_H_PCIE_RP7 0x8c1c +#define PCI_DID_INTEL_LPT_H_PCIE_RP8 0x8c1e +#define PCI_DID_INTEL_LPT_LP_PCIE_RP1 0x9c10 +#define PCI_DID_INTEL_LPT_LP_PCIE_RP2 0x9c12 +#define PCI_DID_INTEL_LPT_LP_PCIE_RP3 0x9c14 +#define PCI_DID_INTEL_LPT_LP_PCIE_RP4 0x9c16 +#define PCI_DID_INTEL_LPT_LP_PCIE_RP5 0x9c18 +#define PCI_DID_INTEL_LPT_LP_PCIE_RP6 0x9c1a + +#define PCI_DID_INTEL_SPT_LP_PCIE_RP1 0x9d10 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP2 0x9d11 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP3 0x9d12 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP4 0x9d13 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP5 0x9d14 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP6 0x9d15 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP7 0x9d16 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP8 0x9d17 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP9 0x9d18 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP10 0x9d19 +#define PCI_DID_INTEL_SPT_LP_PCIE_RP11 0x9d1a +#define PCI_DID_INTEL_SPT_LP_PCIE_RP12 0x9d1b + +#define PCI_DID_INTEL_SPT_H_PCIE_RP1 0xa110 +#define PCI_DID_INTEL_SPT_H_PCIE_RP2 0xa111 +#define PCI_DID_INTEL_SPT_H_PCIE_RP3 0xa112 +#define PCI_DID_INTEL_SPT_H_PCIE_RP4 0xa113 +#define PCI_DID_INTEL_SPT_H_PCIE_RP5 0xa114 +#define PCI_DID_INTEL_SPT_H_PCIE_RP6 0xa115 +#define PCI_DID_INTEL_SPT_H_PCIE_RP7 0xa116 +#define PCI_DID_INTEL_SPT_H_PCIE_RP8 0xa117 +#define PCI_DID_INTEL_SPT_H_PCIE_RP9 0xa118 +#define PCI_DID_INTEL_SPT_H_PCIE_RP10 0xa119 +#define PCI_DID_INTEL_SPT_H_PCIE_RP11 0xa11a +#define PCI_DID_INTEL_SPT_H_PCIE_RP12 0xa11b +#define PCI_DID_INTEL_SPT_H_PCIE_RP13 0xa11c +#define PCI_DID_INTEL_SPT_H_PCIE_RP14 0xa11d +#define PCI_DID_INTEL_SPT_H_PCIE_RP15 0xa11e +#define PCI_DID_INTEL_SPT_H_PCIE_RP16 0xa11f +#define PCI_DID_INTEL_SPT_H_PCIE_RP17 0xa167 +#define PCI_DID_INTEL_SPT_H_PCIE_RP18 0xa168 +#define PCI_DID_INTEL_SPT_H_PCIE_RP19 0xa169 +#define PCI_DID_INTEL_SPT_H_PCIE_RP20 0xa16a + +#define PCI_DID_INTEL_LWB_PCIE_RP1 0xa190 +#define PCI_DID_INTEL_LWB_PCIE_RP2 0xa191 +#define PCI_DID_INTEL_LWB_PCIE_RP3 0xa192 +#define PCI_DID_INTEL_LWB_PCIE_RP4 0xa193 +#define PCI_DID_INTEL_LWB_PCIE_RP5 0xa194 +#define PCI_DID_INTEL_LWB_PCIE_RP6 0xa195 +#define PCI_DID_INTEL_LWB_PCIE_RP7 0xa196 +#define PCI_DID_INTEL_LWB_PCIE_RP8 0xa197 +#define PCI_DID_INTEL_LWB_PCIE_RP9 0xa198 +#define PCI_DID_INTEL_LWB_PCIE_RP10 0xa199 +#define PCI_DID_INTEL_LWB_PCIE_RP11 0xa19a +#define PCI_DID_INTEL_LWB_PCIE_RP12 0xa19b +#define PCI_DID_INTEL_LWB_PCIE_RP13 0xa19c +#define PCI_DID_INTEL_LWB_PCIE_RP14 0xa19d +#define PCI_DID_INTEL_LWB_PCIE_RP15 0xa19e +#define PCI_DID_INTEL_LWB_PCIE_RP16 0xa19f +#define PCI_DID_INTEL_LWB_PCIE_RP17 0xa1e7 +#define PCI_DID_INTEL_LWB_PCIE_RP18 0xa1e8 +#define PCI_DID_INTEL_LWB_PCIE_RP19 0xa1e9 +#define PCI_DID_INTEL_LWB_PCIE_RP20 0xa1ea + +#define PCI_DID_INTEL_LWB_PCIE_RP1_SUPER 0xa210 +#define PCI_DID_INTEL_LWB_PCIE_RP2_SUPER 0xa211 +#define PCI_DID_INTEL_LWB_PCIE_RP3_SUPER 0xa212 +#define PCI_DID_INTEL_LWB_PCIE_RP4_SUPER 0xa213 +#define PCI_DID_INTEL_LWB_PCIE_RP5_SUPER 0xa214 +#define PCI_DID_INTEL_LWB_PCIE_RP6_SUPER 0xa215 +#define PCI_DID_INTEL_LWB_PCIE_RP7_SUPER 0xa216 +#define PCI_DID_INTEL_LWB_PCIE_RP8_SUPER 0xa217 +#define PCI_DID_INTEL_LWB_PCIE_RP9_SUPER 0xa218 +#define PCI_DID_INTEL_LWB_PCIE_RP10_SUPER 0xa219 +#define PCI_DID_INTEL_LWB_PCIE_RP11_SUPER 0xa21a +#define PCI_DID_INTEL_LWB_PCIE_RP12_SUPER 0xa21b +#define PCI_DID_INTEL_LWB_PCIE_RP13_SUPER 0xa21c +#define PCI_DID_INTEL_LWB_PCIE_RP14_SUPER 0xa21d +#define PCI_DID_INTEL_LWB_PCIE_RP15_SUPER 0xa21e +#define PCI_DID_INTEL_LWB_PCIE_RP16_SUPER 0xa21f +#define PCI_DID_INTEL_LWB_PCIE_RP17_SUPER 0xa267 +#define PCI_DID_INTEL_LWB_PCIE_RP18_SUPER 0xa268 +#define PCI_DID_INTEL_LWB_PCIE_RP19_SUPER 0xa269 +#define PCI_DID_INTEL_LWB_PCIE_RP20_SUPER 0xa26a + +#define PCI_DID_INTEL_UPT_H_PCIE_RP1 0xa290 +#define PCI_DID_INTEL_UPT_H_PCIE_RP2 0xa291 +#define PCI_DID_INTEL_UPT_H_PCIE_RP3 0xa292 +#define PCI_DID_INTEL_UPT_H_PCIE_RP4 0xa293 +#define PCI_DID_INTEL_UPT_H_PCIE_RP5 0xa294 +#define PCI_DID_INTEL_UPT_H_PCIE_RP6 0xa295 +#define PCI_DID_INTEL_UPT_H_PCIE_RP7 0xa296 +#define PCI_DID_INTEL_UPT_H_PCIE_RP8 0xa297 +#define PCI_DID_INTEL_UPT_H_PCIE_RP9 0xa298 +#define PCI_DID_INTEL_UPT_H_PCIE_RP10 0xa299 +#define PCI_DID_INTEL_UPT_H_PCIE_RP11 0xa29a +#define PCI_DID_INTEL_UPT_H_PCIE_RP12 0xa29b +#define PCI_DID_INTEL_UPT_H_PCIE_RP13 0xa29c +#define PCI_DID_INTEL_UPT_H_PCIE_RP14 0xa29d +#define PCI_DID_INTEL_UPT_H_PCIE_RP15 0xa29e +#define PCI_DID_INTEL_UPT_H_PCIE_RP16 0xa29f +#define PCI_DID_INTEL_UPT_H_PCIE_RP17 0xa2e7 +#define PCI_DID_INTEL_UPT_H_PCIE_RP18 0xa2e8 +#define PCI_DID_INTEL_UPT_H_PCIE_RP19 0xa2e9 +#define PCI_DID_INTEL_UPT_H_PCIE_RP20 0xa2ea +#define PCI_DID_INTEL_UPT_H_PCIE_RP21 0xa2eb +#define PCI_DID_INTEL_UPT_H_PCIE_RP22 0xa2ec +#define PCI_DID_INTEL_UPT_H_PCIE_RP23 0xa2ed +#define PCI_DID_INTEL_UPT_H_PCIE_RP24 0xa2ee + +#define PCI_DID_INTEL_CNL_LP_PCIE_RP1 0x9db8 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP2 0x9db9 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP3 0x9dba +#define PCI_DID_INTEL_CNL_LP_PCIE_RP4 0x9dbb +#define PCI_DID_INTEL_CNL_LP_PCIE_RP5 0x9dbc +#define PCI_DID_INTEL_CNL_LP_PCIE_RP6 0x9dbd +#define PCI_DID_INTEL_CNL_LP_PCIE_RP7 0x9dbe +#define PCI_DID_INTEL_CNL_LP_PCIE_RP8 0x9dbf +#define PCI_DID_INTEL_CNL_LP_PCIE_RP9 0x9db0 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP10 0x9db1 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP11 0x9db2 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP12 0x9db3 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP13 0x9db4 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP14 0x9db5 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP15 0x9db6 +#define PCI_DID_INTEL_CNL_LP_PCIE_RP16 0x9db7 + +#define PCI_DID_INTEL_ICP_LP_PCIE_RP1 0x34b8 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP2 0x34b9 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP3 0x34ba +#define PCI_DID_INTEL_ICP_LP_PCIE_RP4 0x34bb +#define PCI_DID_INTEL_ICP_LP_PCIE_RP5 0x34bc +#define PCI_DID_INTEL_ICP_LP_PCIE_RP6 0x34bd +#define PCI_DID_INTEL_ICP_LP_PCIE_RP7 0x34be +#define PCI_DID_INTEL_ICP_LP_PCIE_RP8 0x34bf +#define PCI_DID_INTEL_ICP_LP_PCIE_RP9 0x34b0 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP10 0x34b1 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP11 0x34b2 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP12 0x34b3 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP13 0x34b4 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP14 0x34b5 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP15 0x34b6 +#define PCI_DID_INTEL_ICP_LP_PCIE_RP16 0x34b7 + +#define PCI_DID_INTEL_TGP_LP_PCIE_RP1 0xa0b8 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP2 0xa0b9 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP3 0xa0ba +#define PCI_DID_INTEL_TGP_LP_PCIE_RP4 0xa0bb +#define PCI_DID_INTEL_TGP_LP_PCIE_RP5 0xa0bc +#define PCI_DID_INTEL_TGP_LP_PCIE_RP6 0xa0bd +#define PCI_DID_INTEL_TGP_LP_PCIE_RP7 0xa0be +#define PCI_DID_INTEL_TGP_LP_PCIE_RP8 0xa0bf +#define PCI_DID_INTEL_TGP_LP_PCIE_RP9 0xa0b0 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP10 0xa0b1 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP11 0xa0b2 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP12 0xa0b3 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP13 0xa0b4 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP14 0xa0b5 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP15 0xa0b6 +#define PCI_DID_INTEL_TGP_LP_PCIE_RP16 0xa0b7 + +#define PCI_DID_INTEL_TGP_H_PCIE_RP1 0x43b8 +#define PCI_DID_INTEL_TGP_H_PCIE_RP2 0x43b9 +#define PCI_DID_INTEL_TGP_H_PCIE_RP3 0x43ba +#define PCI_DID_INTEL_TGP_H_PCIE_RP4 0x43bb +#define PCI_DID_INTEL_TGP_H_PCIE_RP5 0x43bc +#define PCI_DID_INTEL_TGP_H_PCIE_RP6 0x43bd +#define PCI_DID_INTEL_TGP_H_PCIE_RP7 0x43be +#define PCI_DID_INTEL_TGP_H_PCIE_RP8 0x43bf +#define PCI_DID_INTEL_TGP_H_PCIE_RP9 0x43b0 +#define PCI_DID_INTEL_TGP_H_PCIE_RP10 0x43b1 +#define PCI_DID_INTEL_TGP_H_PCIE_RP11 0x43b2 +#define PCI_DID_INTEL_TGP_H_PCIE_RP12 0x43b3 +#define PCI_DID_INTEL_TGP_H_PCIE_RP13 0x43b4 +#define PCI_DID_INTEL_TGP_H_PCIE_RP14 0x43b5 +#define PCI_DID_INTEL_TGP_H_PCIE_RP15 0x43b6 +#define PCI_DID_INTEL_TGP_H_PCIE_RP16 0x43b7 +#define PCI_DID_INTEL_TGP_H_PCIE_RP17 0x43c0 +#define PCI_DID_INTEL_TGP_H_PCIE_RP18 0x43c1 +#define PCI_DID_INTEL_TGP_H_PCIE_RP19 0x43c2 +#define PCI_DID_INTEL_TGP_H_PCIE_RP20 0x43c3 +#define PCI_DID_INTEL_TGP_H_PCIE_RP21 0x43c4 +#define PCI_DID_INTEL_TGP_H_PCIE_RP22 0x43c5 +#define PCI_DID_INTEL_TGP_H_PCIE_RP23 0x43c6 +#define PCI_DID_INTEL_TGP_H_PCIE_RP24 0x43c7 + +#define PCI_DID_INTEL_CNP_H_PCIE_RP1 0xa338 +#define PCI_DID_INTEL_CNP_H_PCIE_RP2 0xa339 +#define PCI_DID_INTEL_CNP_H_PCIE_RP3 0xa33a +#define PCI_DID_INTEL_CNP_H_PCIE_RP4 0xa33b +#define PCI_DID_INTEL_CNP_H_PCIE_RP5 0xa33c +#define PCI_DID_INTEL_CNP_H_PCIE_RP6 0xa33d +#define PCI_DID_INTEL_CNP_H_PCIE_RP7 0xa33e +#define PCI_DID_INTEL_CNP_H_PCIE_RP8 0xa33f +#define PCI_DID_INTEL_CNP_H_PCIE_RP9 0xa330 +#define PCI_DID_INTEL_CNP_H_PCIE_RP10 0xa331 +#define PCI_DID_INTEL_CNP_H_PCIE_RP11 0xa332 +#define PCI_DID_INTEL_CNP_H_PCIE_RP12 0xa333 +#define PCI_DID_INTEL_CNP_H_PCIE_RP13 0xa334 +#define PCI_DID_INTEL_CNP_H_PCIE_RP14 0xa335 +#define PCI_DID_INTEL_CNP_H_PCIE_RP15 0xa336 +#define PCI_DID_INTEL_CNP_H_PCIE_RP16 0xa337 +#define PCI_DID_INTEL_CNP_H_PCIE_RP17 0xa340 +#define PCI_DID_INTEL_CNP_H_PCIE_RP18 0xa341 +#define PCI_DID_INTEL_CNP_H_PCIE_RP19 0xa342 +#define PCI_DID_INTEL_CNP_H_PCIE_RP20 0xa343 +#define PCI_DID_INTEL_CNP_H_PCIE_RP21 0xa32c +#define PCI_DID_INTEL_CNP_H_PCIE_RP22 0xa32d +#define PCI_DID_INTEL_CNP_H_PCIE_RP23 0xa32e +#define PCI_DID_INTEL_CNP_H_PCIE_RP24 0xa32f + +#define PCI_DID_INTEL_CMP_LP_PCIE_RP1 0x02b8 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP2 0x02b9 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP3 0x02ba +#define PCI_DID_INTEL_CMP_LP_PCIE_RP4 0x02bb +#define PCI_DID_INTEL_CMP_LP_PCIE_RP5 0x02bc +#define PCI_DID_INTEL_CMP_LP_PCIE_RP6 0x02bd +#define PCI_DID_INTEL_CMP_LP_PCIE_RP7 0x02be +#define PCI_DID_INTEL_CMP_LP_PCIE_RP8 0x02bf +#define PCI_DID_INTEL_CMP_LP_PCIE_RP9 0x02b0 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP10 0x02b1 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP11 0x02b2 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP12 0x02b3 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP13 0x02b4 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP14 0x02b5 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP15 0x02b6 +#define PCI_DID_INTEL_CMP_LP_PCIE_RP16 0x02b7 + +#define PCI_DID_INTEL_CMP_H_PCIE_RP1 0x06b8 +#define PCI_DID_INTEL_CMP_H_PCIE_RP2 0x06b9 +#define PCI_DID_INTEL_CMP_H_PCIE_RP3 0x06ba +#define PCI_DID_INTEL_CMP_H_PCIE_RP4 0x06bb +#define PCI_DID_INTEL_CMP_H_PCIE_RP5 0x06bc +#define PCI_DID_INTEL_CMP_H_PCIE_RP6 0x06bd +#define PCI_DID_INTEL_CMP_H_PCIE_RP7 0x06be +#define PCI_DID_INTEL_CMP_H_PCIE_RP8 0x06bf +#define PCI_DID_INTEL_CMP_H_PCIE_RP9 0x06b0 +#define PCI_DID_INTEL_CMP_H_PCIE_RP10 0x06b1 +#define PCI_DID_INTEL_CMP_H_PCIE_RP11 0x06b2 +#define PCI_DID_INTEL_CMP_H_PCIE_RP12 0x06b3 +#define PCI_DID_INTEL_CMP_H_PCIE_RP13 0x06b4 +#define PCI_DID_INTEL_CMP_H_PCIE_RP14 0x06b5 +#define PCI_DID_INTEL_CMP_H_PCIE_RP15 0x06b6 +#define PCI_DID_INTEL_CMP_H_PCIE_RP16 0x06b7 +#define PCI_DID_INTEL_CMP_H_PCIE_RP17 0x06c0 +#define PCI_DID_INTEL_CMP_H_PCIE_RP18 0x06c1 +#define PCI_DID_INTEL_CMP_H_PCIE_RP19 0x06c2 +#define PCI_DID_INTEL_CMP_H_PCIE_RP20 0x06c3 +#define PCI_DID_INTEL_CMP_H_PCIE_RP21 0x06ac +#define PCI_DID_INTEL_CMP_H_PCIE_RP22 0x06ad +#define PCI_DID_INTEL_CMP_H_PCIE_RP23 0x06ae +#define PCI_DID_INTEL_CMP_H_PCIE_RP24 0x06af + +#define PCI_DID_INTEL_JSP_PCIE_RP1 0x4db8 +#define PCI_DID_INTEL_JSP_PCIE_RP2 0x4db9 +#define PCI_DID_INTEL_JSP_PCIE_RP3 0x4dba +#define PCI_DID_INTEL_JSP_PCIE_RP4 0x4dbb +#define PCI_DID_INTEL_JSP_PCIE_RP5 0x4dbc +#define PCI_DID_INTEL_JSP_PCIE_RP6 0x4dbd +#define PCI_DID_INTEL_JSP_PCIE_RP7 0x4dbe +#define PCI_DID_INTEL_JSP_PCIE_RP8 0x4dbf + +#define PCI_DID_INTEL_MCC_PCIE_RP1 0x4b38 +#define PCI_DID_INTEL_MCC_PCIE_RP2 0x4b39 +#define PCI_DID_INTEL_MCC_PCIE_RP3 0x4b3a +#define PCI_DID_INTEL_MCC_PCIE_RP4 0x4b3b +#define PCI_DID_INTEL_MCC_PCIE_RP5 0x4b3c +#define PCI_DID_INTEL_MCC_PCIE_RP6 0x4b3d +#define PCI_DID_INTEL_MCC_PCIE_RP7 0x4b3e + +#define PCI_DID_INTEL_ADL_P_PCIE_RP1 0x464d +#define PCI_DID_INTEL_ADL_P_PCIE_RP2 0x460d +#define PCI_DID_INTEL_ADL_P_PCIE_RP3 0x463d + +#define PCI_DID_INTEL_ADP_P_PCIE_RP1 0x51b8 +#define PCI_DID_INTEL_ADP_P_PCIE_RP2 0x51b9 +#define PCI_DID_INTEL_ADP_P_PCIE_RP3 0x51ba +#define PCI_DID_INTEL_ADP_P_PCIE_RP4 0x51bb +#define PCI_DID_INTEL_ADP_P_PCIE_RP5 0x51bc +#define PCI_DID_INTEL_ADP_P_PCIE_RP6 0x51bd +#define PCI_DID_INTEL_ADP_P_PCIE_RP7 0x51be +#define PCI_DID_INTEL_ADP_P_PCIE_RP8 0x51bf +#define PCI_DID_INTEL_ADP_P_PCIE_RP9 0x51b0 +#define PCI_DID_INTEL_ADP_P_PCIE_RP10 0x51b1 +#define PCI_DID_INTEL_ADP_P_PCIE_RP11 0x51b2 +#define PCI_DID_INTEL_ADP_P_PCIE_RP12 0x51b3 + +#define PCI_DID_INTEL_ADP_S_PCIE_RP1 0x7ab8 +#define PCI_DID_INTEL_ADP_S_PCIE_RP2 0x7ab9 +#define PCI_DID_INTEL_ADP_S_PCIE_RP3 0x7aba +#define PCI_DID_INTEL_ADP_S_PCIE_RP4 0x7abb +#define PCI_DID_INTEL_ADP_S_PCIE_RP5 0x7abc +#define PCI_DID_INTEL_ADP_S_PCIE_RP6 0x7abd +#define PCI_DID_INTEL_ADP_S_PCIE_RP7 0x7abe +#define PCI_DID_INTEL_ADP_S_PCIE_RP8 0x7abf +#define PCI_DID_INTEL_ADP_S_PCIE_RP9 0x7ab0 +#define PCI_DID_INTEL_ADP_S_PCIE_RP10 0x7ab1 +#define PCI_DID_INTEL_ADP_S_PCIE_RP11 0x7ab2 +#define PCI_DID_INTEL_ADP_S_PCIE_RP12 0x7ab3 +#define PCI_DID_INTEL_ADP_S_PCIE_RP13 0x7ab4 +#define PCI_DID_INTEL_ADP_S_PCIE_RP14 0x7ab5 +#define PCI_DID_INTEL_ADP_S_PCIE_RP15 0x7ab6 +#define PCI_DID_INTEL_ADP_S_PCIE_RP16 0x7ab7 +#define PCI_DID_INTEL_ADP_S_PCIE_RP17 0x7ac0 +#define PCI_DID_INTEL_ADP_S_PCIE_RP18 0x7ac1 +#define PCI_DID_INTEL_ADP_S_PCIE_RP19 0x7ac2 +#define PCI_DID_INTEL_ADP_S_PCIE_RP20 0x7ac3 +#define PCI_DID_INTEL_ADP_S_PCIE_RP21 0x7ac4 +#define PCI_DID_INTEL_ADP_S_PCIE_RP22 0x7ac5 +#define PCI_DID_INTEL_ADP_S_PCIE_RP23 0x7ac6 +#define PCI_DID_INTEL_ADP_S_PCIE_RP24 0x7ac7 +#define PCI_DID_INTEL_ADP_S_PCIE_RP25 0x7ac8 +#define PCI_DID_INTEL_ADP_S_PCIE_RP26 0x7ac9 +#define PCI_DID_INTEL_ADP_S_PCIE_RP27 0x7aca +#define PCI_DID_INTEL_ADP_S_PCIE_RP28 0x7acb + +#define PCI_DID_INTEL_ADP_M_N_PCIE_RP1 0x54b8 +#define PCI_DID_INTEL_ADP_M_N_PCIE_RP2 0x54b9 +#define PCI_DID_INTEL_ADP_M_N_PCIE_RP3 0x54ba +#define PCI_DID_INTEL_ADP_M_N_PCIE_RP4 0x54bb +#define PCI_DID_INTEL_ADP_M_PCIE_RP5 0x54bc +#define PCI_DID_INTEL_ADP_M_PCIE_RP6 0x54bd +#define PCI_DID_INTEL_ADP_M_N_PCIE_RP7 0x54be +#define PCI_DID_INTEL_ADP_M_PCIE_RP8 0x54bf +#define PCI_DID_INTEL_ADP_M_N_PCIE_RP9 0x54b0 +#define PCI_DID_INTEL_ADP_M_N_PCIE_RP10 0x54b1 +#define PCI_DID_INTEL_ADP_N_PCIE_RP11 0x54b2 +#define PCI_DID_INTEL_ADP_N_PCIE_RP12 0x54b3 /* Intel SATA device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE 0x8c00 -#define PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_AHCI 0x8c02 -#define PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_1 0x8c04 -#define PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM 0x8c06 -#define PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45 0x8c08 -#define PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_2 0x8c0e -#define PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE 0x8c01 -#define PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_AHCI 0x8c03 -#define PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_1 0x8c05 -#define PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM 0x8c07 -#define PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE_P45 0x8c09 -#define PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_2 0x8c0f -#define PCI_DEVICE_ID_INTEL_LPT_LP_SATA_AHCI 0x9c03 -#define PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_1 0x9c05 -#define PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_PREM 0x9c07 -#define PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_2 0x9c0f - -#define PCI_DEVICE_ID_INTEL_SPT_U_SATA 0x9d03 -#define PCI_DEVICE_ID_INTEL_SPT_U_Y_PREMIUM_SATA 0x9d07 -#define PCI_DEVICE_ID_INTEL_SPT_KBL_SATA 0x282a -#define PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI 0xa182 -#define PCI_DEVICE_ID_INTEL_LWB_SATA_RAID 0xa186 -#define PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI 0xa1d2 -#define PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID 0xa1d6 -#define PCI_DEVICE_ID_INTEL_LWB_SATA_ALT 0x2822 -#define PCI_DEVICE_ID_INTEL_LWB_SATA_ALT_RST 0x2826 -#define PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI_SUPER 0xa202 -#define PCI_DEVICE_ID_INTEL_LWB_SATA_RAID_SUPER 0xa206 -#define PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI_SUPER 0xa252 -#define PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID_SUPER 0xa256 -#define PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT 0x2823 -#define PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT_RST 0x2827 -#define PCI_DEVICE_ID_INTEL_APL_SATA 0x5ae0 -#define PCI_DEVICE_ID_INTEL_GLK_SATA 0x31e3 -#define PCI_DEVICE_ID_INTEL_CNL_SATA 0x9dd5 -#define PCI_DEVICE_ID_INTEL_CNL_PREMIUM_SATA 0x9dd7 -#define PCI_DEVICE_ID_INTEL_CNP_CMP_COMPAT_SATA 0x282a -#define PCI_DEVICE_ID_INTEL_CNP_H_SATA 0xa352 -#define PCI_DEVICE_ID_INTEL_CNP_H_HALO_SATA 0xa353 -#define PCI_DEVICE_ID_INTEL_CNP_LP_SATA 0x9dd3 -#define PCI_DEVICE_ID_INTEL_ICP_U_SATA 0x34d3 -#define PCI_DEVICE_ID_INTEL_CMP_SATA 0x02d5 -#define PCI_DEVICE_ID_INTEL_CMP_PREMIUM_SATA 0x02d7 -#define PCI_DEVICE_ID_INTEL_CMP_LP_SATA 0x02d3 -#define PCI_DEVICE_ID_INTEL_CMP_H_SATA 0x06d2 -#define PCI_DEVICE_ID_INTEL_CMP_H_HALO_SATA 0x06d3 -#define PCI_DEVICE_ID_INTEL_CMP_H_PREMIUM_SATA 0x06d7 -#define PCI_DEVICE_ID_INTEL_TGP_LP_SATA 0xa0d3 -#define PCI_DEVICE_ID_INTEL_TGP_SATA 0xa0d5 -#define PCI_DEVICE_ID_INTEL_TGP_PREMIUM_SATA 0xa0d7 -#define PCI_DEVICE_ID_INTEL_TGP_COMPAT_SATA 0x282a -#define PCI_DEVICE_ID_INTEL_TGP_H_SATA 0x43d3 -#define PCI_DEVICE_ID_INTEL_MCC_AHCI_SATA 0x4b60 -#define PCI_DEVICE_ID_INTEL_JSP_SATA_1 0x4dd2 -#define PCI_DEVICE_ID_INTEL_JSP_SATA_2 0x4dd3 -#define PCI_DEVICE_ID_INTEL_ADP_P_SATA_1 0x7a52 -#define PCI_DEVICE_ID_INTEL_ADP_P_SATA_2 0x7a53 -#define PCI_DEVICE_ID_INTEL_ADP_P_SATA_3 0x7a54 -#define PCI_DEVICE_ID_INTEL_ADP_P_SATA_4 0x7a55 -#define PCI_DEVICE_ID_INTEL_ADP_P_SATA_5 0x7a56 -#define PCI_DEVICE_ID_INTEL_ADP_P_SATA_6 0x7a57 -#define PCI_DEVICE_ID_INTEL_ADP_S_SATA_1 0x7ae2 -#define PCI_DEVICE_ID_INTEL_ADP_S_SATA_2 0x7ae3 -#define PCI_DEVICE_ID_INTEL_ADP_S_SATA_3 0x7ae4 -#define PCI_DEVICE_ID_INTEL_ADP_S_SATA_4 0x7ae5 -#define PCI_DEVICE_ID_INTEL_ADP_S_SATA_5 0x7ae6 -#define PCI_DEVICE_ID_INTEL_ADP_S_SATA_6 0x7ae7 -#define PCI_DEVICE_ID_INTEL_ADP_M_SATA_1 0x54d3 -#define PCI_DEVICE_ID_INTEL_ADP_M_SATA_2 0x54d7 -#define PCI_DEVICE_ID_INTEL_ADP_M_SATA_3 0x282a +#define PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE 0x8c00 +#define PCI_DID_INTEL_LPT_H_DESKTOP_SATA_AHCI 0x8c02 +#define PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_1 0x8c04 +#define PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM 0x8c06 +#define PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45 0x8c08 +#define PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_2 0x8c0e +#define PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE 0x8c01 +#define PCI_DID_INTEL_LPT_H_MOBILE_SATA_AHCI 0x8c03 +#define PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_1 0x8c05 +#define PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM 0x8c07 +#define PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE_P45 0x8c09 +#define PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_2 0x8c0f +#define PCI_DID_INTEL_LPT_LP_SATA_AHCI 0x9c03 +#define PCI_DID_INTEL_LPT_LP_SATA_RAID_1 0x9c05 +#define PCI_DID_INTEL_LPT_LP_SATA_RAID_PREM 0x9c07 +#define PCI_DID_INTEL_LPT_LP_SATA_RAID_2 0x9c0f + +#define PCI_DID_INTEL_SPT_U_SATA 0x9d03 +#define PCI_DID_INTEL_SPT_U_Y_PREMIUM_SATA 0x9d07 +#define PCI_DID_INTEL_SPT_KBL_SATA 0x282a +#define PCI_DID_INTEL_LWB_SATA_AHCI 0xa182 +#define PCI_DID_INTEL_LWB_SATA_RAID 0xa186 +#define PCI_DID_INTEL_LWB_SSATA_AHCI 0xa1d2 +#define PCI_DID_INTEL_LWB_SSATA_RAID 0xa1d6 +#define PCI_DID_INTEL_LWB_SATA_ALT 0x2822 +#define PCI_DID_INTEL_LWB_SATA_ALT_RST 0x2826 +#define PCI_DID_INTEL_LWB_SATA_AHCI_SUPER 0xa202 +#define PCI_DID_INTEL_LWB_SATA_RAID_SUPER 0xa206 +#define PCI_DID_INTEL_LWB_SSATA_AHCI_SUPER 0xa252 +#define PCI_DID_INTEL_LWB_SSATA_RAID_SUPER 0xa256 +#define PCI_DID_INTEL_LWB_SSATA_ALT 0x2823 +#define PCI_DID_INTEL_LWB_SSATA_ALT_RST 0x2827 +#define PCI_DID_INTEL_APL_SATA 0x5ae0 +#define PCI_DID_INTEL_GLK_SATA 0x31e3 +#define PCI_DID_INTEL_CNL_SATA 0x9dd5 +#define PCI_DID_INTEL_CNL_PREMIUM_SATA 0x9dd7 +#define PCI_DID_INTEL_CNP_CMP_COMPAT_SATA 0x282a +#define PCI_DID_INTEL_CNP_H_SATA 0xa352 +#define PCI_DID_INTEL_CNP_H_HALO_SATA 0xa353 +#define PCI_DID_INTEL_CNP_LP_SATA 0x9dd3 +#define PCI_DID_INTEL_ICP_U_SATA 0x34d3 +#define PCI_DID_INTEL_CMP_SATA 0x02d5 +#define PCI_DID_INTEL_CMP_PREMIUM_SATA 0x02d7 +#define PCI_DID_INTEL_CMP_LP_SATA 0x02d3 +#define PCI_DID_INTEL_CMP_H_SATA 0x06d2 +#define PCI_DID_INTEL_CMP_H_HALO_SATA 0x06d3 +#define PCI_DID_INTEL_CMP_H_PREMIUM_SATA 0x06d7 +#define PCI_DID_INTEL_TGP_LP_SATA 0xa0d3 +#define PCI_DID_INTEL_TGP_SATA 0xa0d5 +#define PCI_DID_INTEL_TGP_PREMIUM_SATA 0xa0d7 +#define PCI_DID_INTEL_TGP_COMPAT_SATA 0x282a +#define PCI_DID_INTEL_TGP_H_SATA 0x43d3 +#define PCI_DID_INTEL_MCC_AHCI_SATA 0x4b60 +#define PCI_DID_INTEL_JSP_SATA_1 0x4dd2 +#define PCI_DID_INTEL_JSP_SATA_2 0x4dd3 +#define PCI_DID_INTEL_ADP_P_SATA_1 0x7a52 +#define PCI_DID_INTEL_ADP_P_SATA_2 0x7a53 +#define PCI_DID_INTEL_ADP_P_SATA_3 0x7a54 +#define PCI_DID_INTEL_ADP_P_SATA_4 0x7a55 +#define PCI_DID_INTEL_ADP_P_SATA_5 0x7a56 +#define PCI_DID_INTEL_ADP_P_SATA_6 0x7a57 +#define PCI_DID_INTEL_ADP_S_SATA_1 0x7ae2 +#define PCI_DID_INTEL_ADP_S_SATA_2 0x7ae3 +#define PCI_DID_INTEL_ADP_S_SATA_3 0x7ae4 +#define PCI_DID_INTEL_ADP_S_SATA_4 0x7ae5 +#define PCI_DID_INTEL_ADP_S_SATA_5 0x7ae6 +#define PCI_DID_INTEL_ADP_S_SATA_6 0x7ae7 +#define PCI_DID_INTEL_ADP_M_SATA_1 0x54d3 +#define PCI_DID_INTEL_ADP_M_SATA_2 0x54d7 +#define PCI_DID_INTEL_ADP_M_SATA_3 0x282a /* Intel PMC device Ids */ -#define PCI_DEVICE_ID_INTEL_SPT_LP_PMC 0x9d21 -#define PCI_DEVICE_ID_INTEL_SPT_H_PMC 0xa121 -#define PCI_DEVICE_ID_INTEL_LWB_PMC 0xa1a1 -#define PCI_DEVICE_ID_INTEL_LWB_PMC_SUPER 0xa221 -#define PCI_DEVICE_ID_INTEL_UPT_H_PMC 0xa2a1 -#define PCI_DEVICE_ID_INTEL_APL_PMC 0x5a94 -#define PCI_DEVICE_ID_INTEL_GLK_PMC 0x3194 -#define PCI_DEVICE_ID_INTEL_CNL_PMC 0x9da1 -#define PCI_DEVICE_ID_INTEL_CNP_H_PMC 0xa321 -#define PCI_DEVICE_ID_INTEL_ICP_PMC 0x34a1 -#define PCI_DEVICE_ID_INTEL_CMP_PMC 0x02a1 -#define PCI_DEVICE_ID_INTEL_CMP_H_PMC 0x06a1 -#define PCI_DEVICE_ID_INTEL_TGP_PMC 0xa0a1 -#define PCI_DEVICE_ID_INTEL_TGP_H_PMC 0x43a1 -#define PCI_DEVICE_ID_INTEL_MCC_PMC 0x4b21 -#define PCI_DEVICE_ID_INTEL_JSP_PMC 0x4da1 -#define PCI_DEVICE_ID_INTEL_ADP_P_PMC 0x7a21 -#define PCI_DEVICE_ID_INTEL_ADP_S_PMC 0x7aa1 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_PMC 0x54a1 +#define PCI_DID_INTEL_SPT_LP_PMC 0x9d21 +#define PCI_DID_INTEL_SPT_H_PMC 0xa121 +#define PCI_DID_INTEL_LWB_PMC 0xa1a1 +#define PCI_DID_INTEL_LWB_PMC_SUPER 0xa221 +#define PCI_DID_INTEL_UPT_H_PMC 0xa2a1 +#define PCI_DID_INTEL_APL_PMC 0x5a94 +#define PCI_DID_INTEL_GLK_PMC 0x3194 +#define PCI_DID_INTEL_CNL_PMC 0x9da1 +#define PCI_DID_INTEL_CNP_H_PMC 0xa321 +#define PCI_DID_INTEL_ICP_PMC 0x34a1 +#define PCI_DID_INTEL_CMP_PMC 0x02a1 +#define PCI_DID_INTEL_CMP_H_PMC 0x06a1 +#define PCI_DID_INTEL_TGP_PMC 0xa0a1 +#define PCI_DID_INTEL_TGP_H_PMC 0x43a1 +#define PCI_DID_INTEL_MCC_PMC 0x4b21 +#define PCI_DID_INTEL_JSP_PMC 0x4da1 +#define PCI_DID_INTEL_ADP_P_PMC 0x7a21 +#define PCI_DID_INTEL_ADP_S_PMC 0x7aa1 +#define PCI_DID_INTEL_ADP_M_N_PMC 0x54a1 /* Intel I2C device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_LP_I2C0 0x9c61 -#define PCI_DEVICE_ID_INTEL_LPT_LP_I2C1 0x9c62 -#define PCI_DEVICE_ID_INTEL_SPT_I2C0 0x9d60 -#define PCI_DEVICE_ID_INTEL_SPT_I2C1 0x9d61 -#define PCI_DEVICE_ID_INTEL_SPT_I2C2 0x9d62 -#define PCI_DEVICE_ID_INTEL_SPT_I2C3 0x9d63 -#define PCI_DEVICE_ID_INTEL_SPT_I2C4 0x9d64 -#define PCI_DEVICE_ID_INTEL_SPT_I2C5 0x9d65 -#define PCI_DEVICE_ID_INTEL_UPT_H_I2C0 0xa2e0 -#define PCI_DEVICE_ID_INTEL_UPT_H_I2C1 0xa2e1 -#define PCI_DEVICE_ID_INTEL_UPT_H_I2C2 0xa2e2 -#define PCI_DEVICE_ID_INTEL_UPT_H_I2C3 0xa2e3 -#define PCI_DEVICE_ID_INTEL_APL_I2C0 0x5aac -#define PCI_DEVICE_ID_INTEL_APL_I2C1 0x5aae -#define PCI_DEVICE_ID_INTEL_APL_I2C2 0x5ab0 -#define PCI_DEVICE_ID_INTEL_APL_I2C3 0x5ab2 -#define PCI_DEVICE_ID_INTEL_APL_I2C4 0x5ab4 -#define PCI_DEVICE_ID_INTEL_APL_I2C5 0x5ab6 -#define PCI_DEVICE_ID_INTEL_APL_I2C6 0x5ab8 -#define PCI_DEVICE_ID_INTEL_APL_I2C7 0x5aba -#define PCI_DEVICE_ID_INTEL_GLK_I2C0 0x31ac -#define PCI_DEVICE_ID_INTEL_GLK_I2C1 0x31ae -#define PCI_DEVICE_ID_INTEL_GLK_I2C2 0x31b0 -#define PCI_DEVICE_ID_INTEL_GLK_I2C3 0x31b2 -#define PCI_DEVICE_ID_INTEL_GLK_I2C4 0x31b4 -#define PCI_DEVICE_ID_INTEL_GLK_I2C5 0x31b6 -#define PCI_DEVICE_ID_INTEL_GLK_I2C6 0x31b8 -#define PCI_DEVICE_ID_INTEL_GLK_I2C7 0x31ba -#define PCI_DEVICE_ID_INTEL_CNL_I2C0 0x9de8 -#define PCI_DEVICE_ID_INTEL_CNL_I2C1 0x9de9 -#define PCI_DEVICE_ID_INTEL_CNL_I2C2 0x9dea -#define PCI_DEVICE_ID_INTEL_CNL_I2C3 0x9deb -#define PCI_DEVICE_ID_INTEL_CNL_I2C4 0x9dc5 -#define PCI_DEVICE_ID_INTEL_CNL_I2C5 0x9dc6 -#define PCI_DEVICE_ID_INTEL_CNP_H_I2C0 0xa368 -#define PCI_DEVICE_ID_INTEL_CNP_H_I2C1 0xa369 -#define PCI_DEVICE_ID_INTEL_CNP_H_I2C2 0xa36a -#define PCI_DEVICE_ID_INTEL_CNP_H_I2C3 0xa36b -#define PCI_DEVICE_ID_INTEL_ICP_I2C0 0x34e8 -#define PCI_DEVICE_ID_INTEL_ICP_I2C1 0x34e9 -#define PCI_DEVICE_ID_INTEL_ICP_I2C2 0x34ea -#define PCI_DEVICE_ID_INTEL_ICP_I2C3 0x34eb -#define PCI_DEVICE_ID_INTEL_ICP_I2C4 0x34c5 -#define PCI_DEVICE_ID_INTEL_ICP_I2C5 0x34c6 -#define PCI_DEVICE_ID_INTEL_CMP_I2C0 0x02e8 -#define PCI_DEVICE_ID_INTEL_CMP_I2C1 0x02e9 -#define PCI_DEVICE_ID_INTEL_CMP_I2C2 0x02ea -#define PCI_DEVICE_ID_INTEL_CMP_I2C3 0x02eb -#define PCI_DEVICE_ID_INTEL_CMP_I2C4 0x02c5 -#define PCI_DEVICE_ID_INTEL_CMP_I2C5 0x02c6 -#define PCI_DEVICE_ID_INTEL_CMP_H_I2C0 0x06e8 -#define PCI_DEVICE_ID_INTEL_CMP_H_I2C1 0x06e9 -#define PCI_DEVICE_ID_INTEL_CMP_H_I2C2 0x06ea -#define PCI_DEVICE_ID_INTEL_CMP_H_I2C3 0x06eb -#define PCI_DEVICE_ID_INTEL_TGP_I2C0 0xa0e8 -#define PCI_DEVICE_ID_INTEL_TGP_I2C1 0xa0e9 -#define PCI_DEVICE_ID_INTEL_TGP_I2C2 0xa0ea -#define PCI_DEVICE_ID_INTEL_TGP_I2C3 0xa0eb -#define PCI_DEVICE_ID_INTEL_TGP_I2C4 0xa0c5 -#define PCI_DEVICE_ID_INTEL_TGP_I2C5 0xa0c6 -#define PCI_DEVICE_ID_INTEL_TGP_I2C6 0xa0d8 -#define PCI_DEVICE_ID_INTEL_TGP_I2C7 0xa0d9 -#define PCI_DEVICE_ID_INTEL_TGP_H_I2C0 0x43e8 -#define PCI_DEVICE_ID_INTEL_TGP_H_I2C1 0x43e9 -#define PCI_DEVICE_ID_INTEL_TGP_H_I2C2 0x43ea -#define PCI_DEVICE_ID_INTEL_TGP_H_I2C3 0x43eb -#define PCI_DEVICE_ID_INTEL_TGP_H_I2C4 0x43ad -#define PCI_DEVICE_ID_INTEL_TGP_H_I2C5 0x43ae -#define PCI_DEVICE_ID_INTEL_TGP_H_I2C6 0x43d8 -#define PCI_DEVICE_ID_INTEL_MCC_I2C0 0x4b78 -#define PCI_DEVICE_ID_INTEL_MCC_I2C1 0x4b79 -#define PCI_DEVICE_ID_INTEL_MCC_I2C2 0x4b7a -#define PCI_DEVICE_ID_INTEL_MCC_I2C3 0x4b7b -#define PCI_DEVICE_ID_INTEL_MCC_I2C4 0x4b4b -#define PCI_DEVICE_ID_INTEL_MCC_I2C5 0x4b4c -#define PCI_DEVICE_ID_INTEL_MCC_I2C6 0x4b44 -#define PCI_DEVICE_ID_INTEL_MCC_I2C7 0x4b45 - -#define PCI_DEVICE_ID_INTEL_JSP_I2C0 0x4de8 -#define PCI_DEVICE_ID_INTEL_JSP_I2C1 0x4de9 -#define PCI_DEVICE_ID_INTEL_JSP_I2C2 0x4dea -#define PCI_DEVICE_ID_INTEL_JSP_I2C3 0x4deb -#define PCI_DEVICE_ID_INTEL_JSP_I2C4 0x4dc5 -#define PCI_DEVICE_ID_INTEL_JSP_I2C5 0x4dc6 - -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C0 0x51e8 -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C1 0x51e9 -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C2 0x51ea -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C3 0x51eb -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C4 0x51c5 -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C5 0x51c6 -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C6 0x51d8 -#define PCI_DEVICE_ID_INTEL_ADP_P_I2C7 0x51d9 - -#define PCI_DEVICE_ID_INTEL_ADP_S_I2C0 0x7acc -#define PCI_DEVICE_ID_INTEL_ADP_S_I2C1 0x7acd -#define PCI_DEVICE_ID_INTEL_ADP_S_I2C2 0x7ace -#define PCI_DEVICE_ID_INTEL_ADP_S_I2C3 0x7acf -#define PCI_DEVICE_ID_INTEL_ADP_S_I2C4 0x7afc -#define PCI_DEVICE_ID_INTEL_ADP_S_I2C5 0x7afd - -#define PCI_DEVICE_ID_INTEL_ADP_M_N_I2C0 0x54e8 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_I2C1 0x54e9 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_I2C2 0x54ea -#define PCI_DEVICE_ID_INTEL_ADP_M_N_I2C3 0x54eb -#define PCI_DEVICE_ID_INTEL_ADP_M_N_I2C4 0x54c5 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_I2C5 0x54c6 +#define PCI_DID_INTEL_LPT_LP_I2C0 0x9c61 +#define PCI_DID_INTEL_LPT_LP_I2C1 0x9c62 +#define PCI_DID_INTEL_SPT_I2C0 0x9d60 +#define PCI_DID_INTEL_SPT_I2C1 0x9d61 +#define PCI_DID_INTEL_SPT_I2C2 0x9d62 +#define PCI_DID_INTEL_SPT_I2C3 0x9d63 +#define PCI_DID_INTEL_SPT_I2C4 0x9d64 +#define PCI_DID_INTEL_SPT_I2C5 0x9d65 +#define PCI_DID_INTEL_UPT_H_I2C0 0xa2e0 +#define PCI_DID_INTEL_UPT_H_I2C1 0xa2e1 +#define PCI_DID_INTEL_UPT_H_I2C2 0xa2e2 +#define PCI_DID_INTEL_UPT_H_I2C3 0xa2e3 +#define PCI_DID_INTEL_APL_I2C0 0x5aac +#define PCI_DID_INTEL_APL_I2C1 0x5aae +#define PCI_DID_INTEL_APL_I2C2 0x5ab0 +#define PCI_DID_INTEL_APL_I2C3 0x5ab2 +#define PCI_DID_INTEL_APL_I2C4 0x5ab4 +#define PCI_DID_INTEL_APL_I2C5 0x5ab6 +#define PCI_DID_INTEL_APL_I2C6 0x5ab8 +#define PCI_DID_INTEL_APL_I2C7 0x5aba +#define PCI_DID_INTEL_GLK_I2C0 0x31ac +#define PCI_DID_INTEL_GLK_I2C1 0x31ae +#define PCI_DID_INTEL_GLK_I2C2 0x31b0 +#define PCI_DID_INTEL_GLK_I2C3 0x31b2 +#define PCI_DID_INTEL_GLK_I2C4 0x31b4 +#define PCI_DID_INTEL_GLK_I2C5 0x31b6 +#define PCI_DID_INTEL_GLK_I2C6 0x31b8 +#define PCI_DID_INTEL_GLK_I2C7 0x31ba +#define PCI_DID_INTEL_CNL_I2C0 0x9de8 +#define PCI_DID_INTEL_CNL_I2C1 0x9de9 +#define PCI_DID_INTEL_CNL_I2C2 0x9dea +#define PCI_DID_INTEL_CNL_I2C3 0x9deb +#define PCI_DID_INTEL_CNL_I2C4 0x9dc5 +#define PCI_DID_INTEL_CNL_I2C5 0x9dc6 +#define PCI_DID_INTEL_CNP_H_I2C0 0xa368 +#define PCI_DID_INTEL_CNP_H_I2C1 0xa369 +#define PCI_DID_INTEL_CNP_H_I2C2 0xa36a +#define PCI_DID_INTEL_CNP_H_I2C3 0xa36b +#define PCI_DID_INTEL_ICP_I2C0 0x34e8 +#define PCI_DID_INTEL_ICP_I2C1 0x34e9 +#define PCI_DID_INTEL_ICP_I2C2 0x34ea +#define PCI_DID_INTEL_ICP_I2C3 0x34eb +#define PCI_DID_INTEL_ICP_I2C4 0x34c5 +#define PCI_DID_INTEL_ICP_I2C5 0x34c6 +#define PCI_DID_INTEL_CMP_I2C0 0x02e8 +#define PCI_DID_INTEL_CMP_I2C1 0x02e9 +#define PCI_DID_INTEL_CMP_I2C2 0x02ea +#define PCI_DID_INTEL_CMP_I2C3 0x02eb +#define PCI_DID_INTEL_CMP_I2C4 0x02c5 +#define PCI_DID_INTEL_CMP_I2C5 0x02c6 +#define PCI_DID_INTEL_CMP_H_I2C0 0x06e8 +#define PCI_DID_INTEL_CMP_H_I2C1 0x06e9 +#define PCI_DID_INTEL_CMP_H_I2C2 0x06ea +#define PCI_DID_INTEL_CMP_H_I2C3 0x06eb +#define PCI_DID_INTEL_TGP_I2C0 0xa0e8 +#define PCI_DID_INTEL_TGP_I2C1 0xa0e9 +#define PCI_DID_INTEL_TGP_I2C2 0xa0ea +#define PCI_DID_INTEL_TGP_I2C3 0xa0eb +#define PCI_DID_INTEL_TGP_I2C4 0xa0c5 +#define PCI_DID_INTEL_TGP_I2C5 0xa0c6 +#define PCI_DID_INTEL_TGP_I2C6 0xa0d8 +#define PCI_DID_INTEL_TGP_I2C7 0xa0d9 +#define PCI_DID_INTEL_TGP_H_I2C0 0x43e8 +#define PCI_DID_INTEL_TGP_H_I2C1 0x43e9 +#define PCI_DID_INTEL_TGP_H_I2C2 0x43ea +#define PCI_DID_INTEL_TGP_H_I2C3 0x43eb +#define PCI_DID_INTEL_TGP_H_I2C4 0x43ad +#define PCI_DID_INTEL_TGP_H_I2C5 0x43ae +#define PCI_DID_INTEL_TGP_H_I2C6 0x43d8 +#define PCI_DID_INTEL_MCC_I2C0 0x4b78 +#define PCI_DID_INTEL_MCC_I2C1 0x4b79 +#define PCI_DID_INTEL_MCC_I2C2 0x4b7a +#define PCI_DID_INTEL_MCC_I2C3 0x4b7b +#define PCI_DID_INTEL_MCC_I2C4 0x4b4b +#define PCI_DID_INTEL_MCC_I2C5 0x4b4c +#define PCI_DID_INTEL_MCC_I2C6 0x4b44 +#define PCI_DID_INTEL_MCC_I2C7 0x4b45 + +#define PCI_DID_INTEL_JSP_I2C0 0x4de8 +#define PCI_DID_INTEL_JSP_I2C1 0x4de9 +#define PCI_DID_INTEL_JSP_I2C2 0x4dea +#define PCI_DID_INTEL_JSP_I2C3 0x4deb +#define PCI_DID_INTEL_JSP_I2C4 0x4dc5 +#define PCI_DID_INTEL_JSP_I2C5 0x4dc6 + +#define PCI_DID_INTEL_ADP_P_I2C0 0x51e8 +#define PCI_DID_INTEL_ADP_P_I2C1 0x51e9 +#define PCI_DID_INTEL_ADP_P_I2C2 0x51ea +#define PCI_DID_INTEL_ADP_P_I2C3 0x51eb +#define PCI_DID_INTEL_ADP_P_I2C4 0x51c5 +#define PCI_DID_INTEL_ADP_P_I2C5 0x51c6 +#define PCI_DID_INTEL_ADP_P_I2C6 0x51d8 +#define PCI_DID_INTEL_ADP_P_I2C7 0x51d9 + +#define PCI_DID_INTEL_ADP_S_I2C0 0x7acc +#define PCI_DID_INTEL_ADP_S_I2C1 0x7acd +#define PCI_DID_INTEL_ADP_S_I2C2 0x7ace +#define PCI_DID_INTEL_ADP_S_I2C3 0x7acf +#define PCI_DID_INTEL_ADP_S_I2C4 0x7afc +#define PCI_DID_INTEL_ADP_S_I2C5 0x7afd + +#define PCI_DID_INTEL_ADP_M_N_I2C0 0x54e8 +#define PCI_DID_INTEL_ADP_M_N_I2C1 0x54e9 +#define PCI_DID_INTEL_ADP_M_N_I2C2 0x54ea +#define PCI_DID_INTEL_ADP_M_N_I2C3 0x54eb +#define PCI_DID_INTEL_ADP_M_N_I2C4 0x54c5 +#define PCI_DID_INTEL_ADP_M_N_I2C5 0x54c6 /* Intel UART device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_LP_UART0 0x9c63 -#define PCI_DEVICE_ID_INTEL_LPT_LP_UART1 0x9c64 -#define PCI_DEVICE_ID_INTEL_SPT_UART0 0x9d27 -#define PCI_DEVICE_ID_INTEL_SPT_UART1 0x9d28 -#define PCI_DEVICE_ID_INTEL_SPT_UART2 0x9d66 -#define PCI_DEVICE_ID_INTEL_SPT_H_UART0 0xa127 -#define PCI_DEVICE_ID_INTEL_SPT_H_UART1 0xa128 -#define PCI_DEVICE_ID_INTEL_SPT_H_UART2 0xa166 -#define PCI_DEVICE_ID_INTEL_UPT_H_UART0 0xa2a7 -#define PCI_DEVICE_ID_INTEL_UPT_H_UART1 0xa2a8 -#define PCI_DEVICE_ID_INTEL_UPT_H_UART2 0xa2e6 -#define PCI_DEVICE_ID_INTEL_APL_UART0 0x5abc -#define PCI_DEVICE_ID_INTEL_APL_UART1 0x5abe -#define PCI_DEVICE_ID_INTEL_APL_UART2 0x5ac0 -#define PCI_DEVICE_ID_INTEL_APL_UART3 0x5aee -#define PCI_DEVICE_ID_INTEL_GLK_UART0 0x31bc -#define PCI_DEVICE_ID_INTEL_GLK_UART1 0x31be -#define PCI_DEVICE_ID_INTEL_GLK_UART2 0x31c0 -#define PCI_DEVICE_ID_INTEL_GLK_UART3 0x31ee -#define PCI_DEVICE_ID_INTEL_CNL_UART0 0x9da8 -#define PCI_DEVICE_ID_INTEL_CNL_UART1 0x9da9 -#define PCI_DEVICE_ID_INTEL_CNL_UART2 0x9dc7 -#define PCI_DEVICE_ID_INTEL_CNP_H_UART0 0xa328 -#define PCI_DEVICE_ID_INTEL_CNP_H_UART1 0xa329 -#define PCI_DEVICE_ID_INTEL_CNP_H_UART2 0xa347 -#define PCI_DEVICE_ID_INTEL_ICP_UART0 0x34a8 -#define PCI_DEVICE_ID_INTEL_ICP_UART1 0x34a9 -#define PCI_DEVICE_ID_INTEL_ICP_UART2 0x34c7 -#define PCI_DEVICE_ID_INTEL_CMP_UART0 0x02a8 -#define PCI_DEVICE_ID_INTEL_CMP_UART1 0x02a9 -#define PCI_DEVICE_ID_INTEL_CMP_UART2 0x02c7 -#define PCI_DEVICE_ID_INTEL_CMP_H_UART0 0x06a8 -#define PCI_DEVICE_ID_INTEL_CMP_H_UART1 0x06a9 -#define PCI_DEVICE_ID_INTEL_CMP_H_UART2 0x06c7 -#define PCI_DEVICE_ID_INTEL_TGP_UART0 0xa0a8 -#define PCI_DEVICE_ID_INTEL_TGP_UART1 0xa0a9 -#define PCI_DEVICE_ID_INTEL_TGP_UART2 0xa0c7 -#define PCI_DEVICE_ID_INTEL_TGP_H_UART0 0x43a8 -#define PCI_DEVICE_ID_INTEL_TGP_H_UART1 0x43a9 -#define PCI_DEVICE_ID_INTEL_TGP_H_UART2 0x43a7 -#define PCI_DEVICE_ID_INTEL_TGP_H_UART3 0x43da -#define PCI_DEVICE_ID_INTEL_MCC_UART0 0x4b28 -#define PCI_DEVICE_ID_INTEL_MCC_UART1 0x4b29 -#define PCI_DEVICE_ID_INTEL_MCC_UART2 0x4b4d -#define PCI_DEVICE_ID_INTEL_JSP_UART0 0x4da8 -#define PCI_DEVICE_ID_INTEL_JSP_UART1 0x4da9 -#define PCI_DEVICE_ID_INTEL_JSP_UART2 0x4dc7 - -#define PCI_DEVICE_ID_INTEL_ADP_P_UART0 0x51a8 -#define PCI_DEVICE_ID_INTEL_ADP_P_UART1 0x51a9 -#define PCI_DEVICE_ID_INTEL_ADP_P_UART2 0x51c7 -#define PCI_DEVICE_ID_INTEL_ADP_P_UART3 0x51da -#define PCI_DEVICE_ID_INTEL_ADP_P_UART4 0x51db -#define PCI_DEVICE_ID_INTEL_ADP_P_UART5 0x51dc -#define PCI_DEVICE_ID_INTEL_ADP_P_UART6 0x51dd - -#define PCI_DEVICE_ID_INTEL_ADP_S_UART0 0x7aa8 -#define PCI_DEVICE_ID_INTEL_ADP_S_UART1 0x7aa9 -#define PCI_DEVICE_ID_INTEL_ADP_S_UART2 0x7afe -#define PCI_DEVICE_ID_INTEL_ADP_S_UART3 0x7adc -#define PCI_DEVICE_ID_INTEL_ADP_S_UART4 0x7add -#define PCI_DEVICE_ID_INTEL_ADP_S_UART5 0x7ade -#define PCI_DEVICE_ID_INTEL_ADP_S_UART6 0x7adf - -#define PCI_DEVICE_ID_INTEL_ADP_M_N_UART0 0x54a8 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_UART1 0x54a9 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_UART2 0x54c7 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_UART3 0x54da +#define PCI_DID_INTEL_LPT_LP_UART0 0x9c63 +#define PCI_DID_INTEL_LPT_LP_UART1 0x9c64 +#define PCI_DID_INTEL_SPT_UART0 0x9d27 +#define PCI_DID_INTEL_SPT_UART1 0x9d28 +#define PCI_DID_INTEL_SPT_UART2 0x9d66 +#define PCI_DID_INTEL_SPT_H_UART0 0xa127 +#define PCI_DID_INTEL_SPT_H_UART1 0xa128 +#define PCI_DID_INTEL_SPT_H_UART2 0xa166 +#define PCI_DID_INTEL_UPT_H_UART0 0xa2a7 +#define PCI_DID_INTEL_UPT_H_UART1 0xa2a8 +#define PCI_DID_INTEL_UPT_H_UART2 0xa2e6 +#define PCI_DID_INTEL_APL_UART0 0x5abc +#define PCI_DID_INTEL_APL_UART1 0x5abe +#define PCI_DID_INTEL_APL_UART2 0x5ac0 +#define PCI_DID_INTEL_APL_UART3 0x5aee +#define PCI_DID_INTEL_GLK_UART0 0x31bc +#define PCI_DID_INTEL_GLK_UART1 0x31be +#define PCI_DID_INTEL_GLK_UART2 0x31c0 +#define PCI_DID_INTEL_GLK_UART3 0x31ee +#define PCI_DID_INTEL_CNL_UART0 0x9da8 +#define PCI_DID_INTEL_CNL_UART1 0x9da9 +#define PCI_DID_INTEL_CNL_UART2 0x9dc7 +#define PCI_DID_INTEL_CNP_H_UART0 0xa328 +#define PCI_DID_INTEL_CNP_H_UART1 0xa329 +#define PCI_DID_INTEL_CNP_H_UART2 0xa347 +#define PCI_DID_INTEL_ICP_UART0 0x34a8 +#define PCI_DID_INTEL_ICP_UART1 0x34a9 +#define PCI_DID_INTEL_ICP_UART2 0x34c7 +#define PCI_DID_INTEL_CMP_UART0 0x02a8 +#define PCI_DID_INTEL_CMP_UART1 0x02a9 +#define PCI_DID_INTEL_CMP_UART2 0x02c7 +#define PCI_DID_INTEL_CMP_H_UART0 0x06a8 +#define PCI_DID_INTEL_CMP_H_UART1 0x06a9 +#define PCI_DID_INTEL_CMP_H_UART2 0x06c7 +#define PCI_DID_INTEL_TGP_UART0 0xa0a8 +#define PCI_DID_INTEL_TGP_UART1 0xa0a9 +#define PCI_DID_INTEL_TGP_UART2 0xa0c7 +#define PCI_DID_INTEL_TGP_H_UART0 0x43a8 +#define PCI_DID_INTEL_TGP_H_UART1 0x43a9 +#define PCI_DID_INTEL_TGP_H_UART2 0x43a7 +#define PCI_DID_INTEL_TGP_H_UART3 0x43da +#define PCI_DID_INTEL_MCC_UART0 0x4b28 +#define PCI_DID_INTEL_MCC_UART1 0x4b29 +#define PCI_DID_INTEL_MCC_UART2 0x4b4d +#define PCI_DID_INTEL_JSP_UART0 0x4da8 +#define PCI_DID_INTEL_JSP_UART1 0x4da9 +#define PCI_DID_INTEL_JSP_UART2 0x4dc7 + +#define PCI_DID_INTEL_ADP_P_UART0 0x51a8 +#define PCI_DID_INTEL_ADP_P_UART1 0x51a9 +#define PCI_DID_INTEL_ADP_P_UART2 0x51c7 +#define PCI_DID_INTEL_ADP_P_UART3 0x51da +#define PCI_DID_INTEL_ADP_P_UART4 0x51db +#define PCI_DID_INTEL_ADP_P_UART5 0x51dc +#define PCI_DID_INTEL_ADP_P_UART6 0x51dd + +#define PCI_DID_INTEL_ADP_S_UART0 0x7aa8 +#define PCI_DID_INTEL_ADP_S_UART1 0x7aa9 +#define PCI_DID_INTEL_ADP_S_UART2 0x7afe +#define PCI_DID_INTEL_ADP_S_UART3 0x7adc +#define PCI_DID_INTEL_ADP_S_UART4 0x7add +#define PCI_DID_INTEL_ADP_S_UART5 0x7ade +#define PCI_DID_INTEL_ADP_S_UART6 0x7adf + +#define PCI_DID_INTEL_ADP_M_N_UART0 0x54a8 +#define PCI_DID_INTEL_ADP_M_N_UART1 0x54a9 +#define PCI_DID_INTEL_ADP_M_N_UART2 0x54c7 +#define PCI_DID_INTEL_ADP_M_N_UART3 0x54da /* Intel SPI device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_LP_GSPI0 0x9c65 -#define PCI_DEVICE_ID_INTEL_LPT_LP_GSPI1 0x9c66 -#define PCI_DEVICE_ID_INTEL_SPT_SPI1 0x9d24 -#define PCI_DEVICE_ID_INTEL_SPT_SPI2 0x9d29 -#define PCI_DEVICE_ID_INTEL_SPT_SPI3 0x9d2a -#define PCI_DEVICE_ID_INTEL_APL_SPI0 0x5ac2 -#define PCI_DEVICE_ID_INTEL_APL_SPI1 0x5ac4 -#define PCI_DEVICE_ID_INTEL_APL_SPI2 0x5ac6 -#define PCI_DEVICE_ID_INTEL_APL_HWSEQ_SPI 0x5a96 -#define PCI_DEVICE_ID_INTEL_GLK_SPI0 0x31c2 -#define PCI_DEVICE_ID_INTEL_GLK_SPI1 0x31c4 -#define PCI_DEVICE_ID_INTEL_GLK_SPI2 0x31c6 -#define PCI_DEVICE_ID_INTEL_CNL_SPI0 0x9daa -#define PCI_DEVICE_ID_INTEL_CNL_SPI1 0x9dab -#define PCI_DEVICE_ID_INTEL_CNL_SPI2 0x9dfb -#define PCI_DEVICE_ID_INTEL_CNL_HWSEQ_SPI 0x9da4 -#define PCI_DEVICE_ID_INTEL_LWB_SPI 0xa1a4 -#define PCI_DEVICE_ID_INTEL_LWB_SPI_SUPER 0xa224 -#define PCI_DEVICE_ID_INTEL_CNP_H_SPI0 0xa32a -#define PCI_DEVICE_ID_INTEL_CNP_H_SPI1 0xa32b -#define PCI_DEVICE_ID_INTEL_CNP_H_SPI2 0xa37b -#define PCI_DEVICE_ID_INTEL_CNP_H_HWSEQ_SPI 0xa324 -#define PCI_DEVICE_ID_INTEL_ICP_SPI0 0x34aa -#define PCI_DEVICE_ID_INTEL_ICP_SPI1 0x34ab -#define PCI_DEVICE_ID_INTEL_ICP_SPI2 0x34fb -#define PCI_DEVICE_ID_INTEL_ICP_HWSEQ_SPI 0x34a4 -#define PCI_DEVICE_ID_INTEL_CMP_SPI0 0x02aa -#define PCI_DEVICE_ID_INTEL_CMP_SPI1 0x02ab -#define PCI_DEVICE_ID_INTEL_CMP_SPI2 0x02fb -#define PCI_DEVICE_ID_INTEL_CMP_HWSEQ_SPI 0x02a4 -#define PCI_DEVICE_ID_INTEL_CMP_H_SPI0 0x06aa -#define PCI_DEVICE_ID_INTEL_CMP_H_SPI1 0x06ab -#define PCI_DEVICE_ID_INTEL_CMP_H_SPI2 0x06fb -#define PCI_DEVICE_ID_INTEL_CMP_H_HWSEQ_SPI 0x06a4 -#define PCI_DEVICE_ID_INTEL_TGP_SPI0 0xa0a4 -#define PCI_DEVICE_ID_INTEL_TGP_GSPI0 0xa0aa -#define PCI_DEVICE_ID_INTEL_TGP_GSPI1 0xa0ab -#define PCI_DEVICE_ID_INTEL_TGP_GSPI2 0xa0fb -#define PCI_DEVICE_ID_INTEL_TGP_GSPI3 0xa0fd -#define PCI_DEVICE_ID_INTEL_TGP_GSPI4 0xa0fe -#define PCI_DEVICE_ID_INTEL_TGP_GSPI5 0xa0de -#define PCI_DEVICE_ID_INTEL_TGP_GSPI6 0xa0df -#define PCI_DEVICE_ID_INTEL_TGP_H_SPI0 0x43a4 -#define PCI_DEVICE_ID_INTEL_TGP_H_GSPI0 0x43aa -#define PCI_DEVICE_ID_INTEL_TGP_H_GSPI1 0x43ab -#define PCI_DEVICE_ID_INTEL_TGP_H_GSPI2 0x43fb -#define PCI_DEVICE_ID_INTEL_TGP_H_GSPI3 0x43fd -#define PCI_DEVICE_ID_INTEL_MCC_SPI0 0x4b24 -#define PCI_DEVICE_ID_INTEL_MCC_GSPI0 0x4b2a -#define PCI_DEVICE_ID_INTEL_MCC_GSPI1 0x4b2b -#define PCI_DEVICE_ID_INTEL_MCC_GSPI2 0x4b37 -#define PCI_DEVICE_ID_INTEL_JSP_SPI0 0x4daa -#define PCI_DEVICE_ID_INTEL_JSP_SPI1 0x4dab -#define PCI_DEVICE_ID_INTEL_JSP_SPI2 0x4dfb -#define PCI_DEVICE_ID_INTEL_JSP_HWSEQ_SPI 0x4da4 - -#define PCI_DEVICE_ID_INTEL_ADP_P_HWSEQ_SPI 0x51a4 -#define PCI_DEVICE_ID_INTEL_ADP_P_SPI0 0x51aa -#define PCI_DEVICE_ID_INTEL_ADP_P_SPI1 0x51ab -#define PCI_DEVICE_ID_INTEL_ADP_P_SPI2 0x51fb -#define PCI_DEVICE_ID_INTEL_ADP_P_SPI3 0x51fd -#define PCI_DEVICE_ID_INTEL_ADP_P_SPI4 0x51fe -#define PCI_DEVICE_ID_INTEL_ADP_P_SPI5 0x51de -#define PCI_DEVICE_ID_INTEL_ADP_P_SPI6 0x51df - -#define PCI_DEVICE_ID_INTEL_ADP_S_HWSEQ_SPI 0x7aa4 -#define PCI_DEVICE_ID_INTEL_ADP_S_SPI0 0x7aaa -#define PCI_DEVICE_ID_INTEL_ADP_S_SPI1 0x7aab -#define PCI_DEVICE_ID_INTEL_ADP_S_SPI2 0x7afb -#define PCI_DEVICE_ID_INTEL_ADP_S_SPI3 0x7af9 -#define PCI_DEVICE_ID_INTEL_ADP_S_SPI4 0x7afa -#define PCI_DEVICE_ID_INTEL_ADP_S_SPI5 0x7aee -#define PCI_DEVICE_ID_INTEL_ADP_S_SPI6 0x7aef - -#define PCI_DEVICE_ID_INTEL_ADP_M_N_HWSEQ_SPI 0x54a4 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_SPI0 0x54aa -#define PCI_DEVICE_ID_INTEL_ADP_M_N_SPI1 0x54ab -#define PCI_DEVICE_ID_INTEL_ADP_M_SPI2 0x54fb - -#define PCI_DEVICE_ID_INTEL_SPR_HWSEQ_SPI 0x1bca +#define PCI_DID_INTEL_LPT_LP_GSPI0 0x9c65 +#define PCI_DID_INTEL_LPT_LP_GSPI1 0x9c66 +#define PCI_DID_INTEL_SPT_SPI1 0x9d24 +#define PCI_DID_INTEL_SPT_SPI2 0x9d29 +#define PCI_DID_INTEL_SPT_SPI3 0x9d2a +#define PCI_DID_INTEL_APL_SPI0 0x5ac2 +#define PCI_DID_INTEL_APL_SPI1 0x5ac4 +#define PCI_DID_INTEL_APL_SPI2 0x5ac6 +#define PCI_DID_INTEL_APL_HWSEQ_SPI 0x5a96 +#define PCI_DID_INTEL_GLK_SPI0 0x31c2 +#define PCI_DID_INTEL_GLK_SPI1 0x31c4 +#define PCI_DID_INTEL_GLK_SPI2 0x31c6 +#define PCI_DID_INTEL_CNL_SPI0 0x9daa +#define PCI_DID_INTEL_CNL_SPI1 0x9dab +#define PCI_DID_INTEL_CNL_SPI2 0x9dfb +#define PCI_DID_INTEL_CNL_HWSEQ_SPI 0x9da4 +#define PCI_DID_INTEL_LWB_SPI 0xa1a4 +#define PCI_DID_INTEL_LWB_SPI_SUPER 0xa224 +#define PCI_DID_INTEL_CNP_H_SPI0 0xa32a +#define PCI_DID_INTEL_CNP_H_SPI1 0xa32b +#define PCI_DID_INTEL_CNP_H_SPI2 0xa37b +#define PCI_DID_INTEL_CNP_H_HWSEQ_SPI 0xa324 +#define PCI_DID_INTEL_ICP_SPI0 0x34aa +#define PCI_DID_INTEL_ICP_SPI1 0x34ab +#define PCI_DID_INTEL_ICP_SPI2 0x34fb +#define PCI_DID_INTEL_ICP_HWSEQ_SPI 0x34a4 +#define PCI_DID_INTEL_CMP_SPI0 0x02aa +#define PCI_DID_INTEL_CMP_SPI1 0x02ab +#define PCI_DID_INTEL_CMP_SPI2 0x02fb +#define PCI_DID_INTEL_CMP_HWSEQ_SPI 0x02a4 +#define PCI_DID_INTEL_CMP_H_SPI0 0x06aa +#define PCI_DID_INTEL_CMP_H_SPI1 0x06ab +#define PCI_DID_INTEL_CMP_H_SPI2 0x06fb +#define PCI_DID_INTEL_CMP_H_HWSEQ_SPI 0x06a4 +#define PCI_DID_INTEL_TGP_SPI0 0xa0a4 +#define PCI_DID_INTEL_TGP_GSPI0 0xa0aa +#define PCI_DID_INTEL_TGP_GSPI1 0xa0ab +#define PCI_DID_INTEL_TGP_GSPI2 0xa0fb +#define PCI_DID_INTEL_TGP_GSPI3 0xa0fd +#define PCI_DID_INTEL_TGP_GSPI4 0xa0fe +#define PCI_DID_INTEL_TGP_GSPI5 0xa0de +#define PCI_DID_INTEL_TGP_GSPI6 0xa0df +#define PCI_DID_INTEL_TGP_H_SPI0 0x43a4 +#define PCI_DID_INTEL_TGP_H_GSPI0 0x43aa +#define PCI_DID_INTEL_TGP_H_GSPI1 0x43ab +#define PCI_DID_INTEL_TGP_H_GSPI2 0x43fb +#define PCI_DID_INTEL_TGP_H_GSPI3 0x43fd +#define PCI_DID_INTEL_MCC_SPI0 0x4b24 +#define PCI_DID_INTEL_MCC_GSPI0 0x4b2a +#define PCI_DID_INTEL_MCC_GSPI1 0x4b2b +#define PCI_DID_INTEL_MCC_GSPI2 0x4b37 +#define PCI_DID_INTEL_JSP_SPI0 0x4daa +#define PCI_DID_INTEL_JSP_SPI1 0x4dab +#define PCI_DID_INTEL_JSP_SPI2 0x4dfb +#define PCI_DID_INTEL_JSP_HWSEQ_SPI 0x4da4 + +#define PCI_DID_INTEL_ADP_P_HWSEQ_SPI 0x51a4 +#define PCI_DID_INTEL_ADP_P_SPI0 0x51aa +#define PCI_DID_INTEL_ADP_P_SPI1 0x51ab +#define PCI_DID_INTEL_ADP_P_SPI2 0x51fb +#define PCI_DID_INTEL_ADP_P_SPI3 0x51fd +#define PCI_DID_INTEL_ADP_P_SPI4 0x51fe +#define PCI_DID_INTEL_ADP_P_SPI5 0x51de +#define PCI_DID_INTEL_ADP_P_SPI6 0x51df + +#define PCI_DID_INTEL_ADP_S_HWSEQ_SPI 0x7aa4 +#define PCI_DID_INTEL_ADP_S_SPI0 0x7aaa +#define PCI_DID_INTEL_ADP_S_SPI1 0x7aab +#define PCI_DID_INTEL_ADP_S_SPI2 0x7afb +#define PCI_DID_INTEL_ADP_S_SPI3 0x7af9 +#define PCI_DID_INTEL_ADP_S_SPI4 0x7afa +#define PCI_DID_INTEL_ADP_S_SPI5 0x7aee +#define PCI_DID_INTEL_ADP_S_SPI6 0x7aef + +#define PCI_DID_INTEL_ADP_M_N_HWSEQ_SPI 0x54a4 +#define PCI_DID_INTEL_ADP_M_N_SPI0 0x54aa +#define PCI_DID_INTEL_ADP_M_N_SPI1 0x54ab +#define PCI_DID_INTEL_ADP_M_SPI2 0x54fb + +#define PCI_DID_INTEL_SPR_HWSEQ_SPI 0x1bca /* Intel IGD device Ids */ -#define PCI_DEVICE_ID_INTEL_SKL_GT1F_DT2 0x1902 -#define PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM 0x1906 -#define PCI_DEVICE_ID_INTEL_SKL_GT1F_SHALM 0x190B -#define PCI_DEVICE_ID_INTEL_SKL_GT2_DT2P1 0x1912 -#define PCI_DEVICE_ID_INTEL_SKL_GT2_SULTM 0x1916 -#define PCI_DEVICE_ID_INTEL_SKL_GT2_SHALM 0x191B -#define PCI_DEVICE_ID_INTEL_SKL_GT2_SWKSM 0x191D -#define PCI_DEVICE_ID_INTEL_SKL_GT2_SULXM 0x191E -#define PCI_DEVICE_ID_INTEL_SKL_GT3_SULTM 0x1923 -#define PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1 0x1926 -#define PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_2 0x1927 -#define PCI_DEVICE_ID_INTEL_SKL_GT3FE_SSRVM 0x192D -#define PCI_DEVICE_ID_INTEL_SKL_GT4_SHALM 0x193B -#define PCI_DEVICE_ID_INTEL_SKL_GT4E_SWSTM 0x193D -#define PCI_DEVICE_ID_INTEL_KBL_GT1F_DT2 0x5902 -#define PCI_DEVICE_ID_INTEL_KBL_GT1_SULTM 0x5906 -#define PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_1 0x5908 -#define PCI_DEVICE_ID_INTEL_KBL_GT1_SSRVM 0x590A -#define PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_2 0x590B -#define PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2 0x5912 -#define PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM 0x5916 -#define PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR 0x5917 -#define PCI_DEVICE_ID_INTEL_KBL_GT2F_SULTM 0x5921 -#define PCI_DEVICE_ID_INTEL_KBL_GT2_SSRVM 0x591A -#define PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM 0x591B -#define PCI_DEVICE_ID_INTEL_KBL_GT2_SWSTM 0x591D -#define PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM 0x591E -#define PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1 0x5926 -#define PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2 0x5927 -#define PCI_DEVICE_ID_INTEL_KBL_GT4_SHALM 0x593B - -#define PCI_DEVICE_ID_INTEL_AML_GT2_ULX 0x591C -#define PCI_DEVICE_ID_INTEL_APL_IGD_HD_505 0x5a84 -#define PCI_DEVICE_ID_INTEL_APL_IGD_HD_500 0x5a85 -#define PCI_DEVICE_ID_INTEL_GLK_IGD 0x3184 -#define PCI_DEVICE_ID_INTEL_GLK_IGD_EU12 0x3185 -#define PCI_DEVICE_ID_INTEL_WHL_GT1_ULT_1 0x3EA1 -#define PCI_DEVICE_ID_INTEL_WHL_GT2_ULT_1 0x3EA0 -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_1 0x5A51 -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_2 0x5A59 -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_3 0x5A41 -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_4 0x5A49 -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_1 0x5A52 -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_2 0x5A5A -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_3 0x5A42 -#define PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_4 0x5A4A -#define PCI_DEVICE_ID_INTEL_CFL_GT2_ULT 0x3EA5 -#define PCI_DEVICE_ID_INTEL_CFL_H_GT2 0x3e9b -#define PCI_DEVICE_ID_INTEL_CFL_H_XEON_GT2 0x3e94 -#define PCI_DEVICE_ID_INTEL_CFL_S_GT1_1 0x3e90 -#define PCI_DEVICE_ID_INTEL_CFL_S_GT1_2 0x3e93 -#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_1 0x3e92 -#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_2 0x3e98 -#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_3 0x3e9a -#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_4 0x3e91 -#define PCI_DEVICE_ID_INTEL_CFL_S_GT2_5 0x3e96 -#define PCI_DEVICE_ID_INTEL_ICL_GT0_ULT 0x8A70 -#define PCI_DEVICE_ID_INTEL_ICL_GT0_5_ULT 0x8A71 -#define PCI_DEVICE_ID_INTEL_ICL_GT1_ULT 0x8A40 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_0 0x8A50 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_1 0x8A5D -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_1 0x8A5B -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_2 0x8A5C -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_2 0x8A5A -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_3 0x8A51 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_3 0x8A52 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_4 0x8A53 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_4 0x8A54 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_5 0x8A55 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_5 0x8A56 -#define PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_6 0x8A57 -#define PCI_DEVICE_ID_INTEL_ICL_GT3_ULT 0x8A62 -#define PCI_DEVICE_ID_INTEL_CML_GT1_ULT_1 0x9B21 -#define PCI_DEVICE_ID_INTEL_CML_GT1_ULT_2 0x9B2A -#define PCI_DEVICE_ID_INTEL_CML_GT2_ULT_1 0x9B41 -#define PCI_DEVICE_ID_INTEL_CML_GT2_ULT_2 0x9B4A -#define PCI_DEVICE_ID_INTEL_CML_GT1_ULT_3 0x9B2B -#define PCI_DEVICE_ID_INTEL_CML_GT1_ULT_4 0x9B2C -#define PCI_DEVICE_ID_INTEL_CML_GT2_ULT_5 0x9BAA -#define PCI_DEVICE_ID_INTEL_CML_GT2_ULT_6 0x9BCA -#define PCI_DEVICE_ID_INTEL_CML_GT2_ULT_3 0x9B4B -#define PCI_DEVICE_ID_INTEL_CML_GT2_ULT_4 0x9B4C -#define PCI_DEVICE_ID_INTEL_CML_GT1_ULX_1 0x9B20 -#define PCI_DEVICE_ID_INTEL_CML_GT2_ULX_1 0x9B40 -#define PCI_DEVICE_ID_INTEL_CML_GT1_S_1 0x9B25 -#define PCI_DEVICE_ID_INTEL_CML_GT1_S_2 0x9B28 -#define PCI_DEVICE_ID_INTEL_CML_GT2_S_1 0x9B45 -#define PCI_DEVICE_ID_INTEL_CML_GT2_S_2 0x9B48 -#define PCI_DEVICE_ID_INTEL_CML_GT1_H_1 0x9B24 -#define PCI_DEVICE_ID_INTEL_CML_GT1_H_2 0x9B22 -#define PCI_DEVICE_ID_INTEL_CML_GT2_H_1 0x9B44 -#define PCI_DEVICE_ID_INTEL_CML_GT2_H_2 0x9B42 -#define PCI_DEVICE_ID_INTEL_CML_GT2_S_G0 0x9BC8 -#define PCI_DEVICE_ID_INTEL_CML_GT2_S_P0 0x9BC5 -#define PCI_DEVICE_ID_INTEL_CML_GT2_H_R0 0x3E9B -#define PCI_DEVICE_ID_INTEL_CML_GT2_H_R1 0x9BC4 -#define PCI_DEVICE_ID_INTEL_TGL_GT1 0x9A60 -#define PCI_DEVICE_ID_INTEL_TGL_GT2_UY 0x9A49 -#define PCI_DEVICE_ID_INTEL_TGL_GT2 0xFF20 -#define PCI_DEVICE_ID_INTEL_TGL_GT2_Y 0x9A40 -#define PCI_DEVICE_ID_INTEL_TGL_GT0 0x9A7F -#define PCI_DEVICE_ID_INTEL_TGL_GT1_H_32 0x9A60 -#define PCI_DEVICE_ID_INTEL_TGL_GT1_H_16 0x9A68 -#define PCI_DEVICE_ID_INTEL_TGL_GT2_ULT 0x9A49 -#define PCI_DEVICE_ID_INTEL_TGL_GT3_ULT 0x9A52 -#define PCI_DEVICE_ID_INTEL_TGL_GT2_ULX 0x9A40 -#define PCI_DEVICE_ID_INTEL_TGL_GT2_ULT_1 0x9A78 -#define PCI_DEVICE_ID_INTEL_EHL_GT1_1 0x4541 -#define PCI_DEVICE_ID_INTEL_EHL_GT2_1 0x4540 -#define PCI_DEVICE_ID_INTEL_EHL_GT1_2 0x4551 -#define PCI_DEVICE_ID_INTEL_EHL_GT1_2_1 0x4555 -#define PCI_DEVICE_ID_INTEL_EHL_GT2_2 0x4550 -#define PCI_DEVICE_ID_INTEL_EHL_GT1_3 0x4571 -#define PCI_DEVICE_ID_INTEL_EHL_GT2_3 0x4570 -#define PCI_DEVICE_ID_INTEL_JSL_GT1 0x4E51 -#define PCI_DEVICE_ID_INTEL_JSL_GT2 0x4E71 -#define PCI_DEVICE_ID_INTEL_JSL_GT3 0x4E61 -#define PCI_DEVICE_ID_INTEL_JSL_GT4 0x4E55 - -#define PCI_DEVICE_ID_INTEL_ADL_GT0 0x46ff -#define PCI_DEVICE_ID_INTEL_ADL_GT1 0x4600 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_1 0x4601 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_2 0x4602 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_3 0x4603 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_4 0x4610 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_5 0x4611 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_6 0x4612 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_7 0x4613 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_8 0x4618 -#define PCI_DEVICE_ID_INTEL_ADL_GT1_9 0x4619 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2 0x46a0 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_1 0x46b0 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_2 0x46a1 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_3 0x46a3 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_4 0x46a8 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_5 0x46b3 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_6 0x46a6 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_7 0x4628 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_8 0x46b1 -#define PCI_DEVICE_ID_INTEL_ADL_P_GT2_9 0x4626 -#define PCI_DEVICE_ID_INTEL_ADL_S_GT1 0x4680 -#define PCI_DEVICE_ID_INTEL_ADL_M_GT1 0x46c0 -#define PCI_DEVICE_ID_INTEL_ADL_M_GT2 0x46aa -#define PCI_DEVICE_ID_INTEL_ADL_M_GT3 0x46c3 -#define PCI_DEVICE_ID_INTEL_ADL_N_GT1 0x46D0 -#define PCI_DEVICE_ID_INTEL_ADL_N_GT2 0x46D1 -#define PCI_DEVICE_ID_INTEL_ADL_N_GT3 0x46D2 +#define PCI_DID_INTEL_SKL_GT1F_DT2 0x1902 +#define PCI_DID_INTEL_SKL_GT1_SULTM 0x1906 +#define PCI_DID_INTEL_SKL_GT1F_SHALM 0x190B +#define PCI_DID_INTEL_SKL_GT2_DT2P1 0x1912 +#define PCI_DID_INTEL_SKL_GT2_SULTM 0x1916 +#define PCI_DID_INTEL_SKL_GT2_SHALM 0x191B +#define PCI_DID_INTEL_SKL_GT2_SWKSM 0x191D +#define PCI_DID_INTEL_SKL_GT2_SULXM 0x191E +#define PCI_DID_INTEL_SKL_GT3_SULTM 0x1923 +#define PCI_DID_INTEL_SKL_GT3E_SULTM_1 0x1926 +#define PCI_DID_INTEL_SKL_GT3E_SULTM_2 0x1927 +#define PCI_DID_INTEL_SKL_GT3FE_SSRVM 0x192D +#define PCI_DID_INTEL_SKL_GT4_SHALM 0x193B +#define PCI_DID_INTEL_SKL_GT4E_SWSTM 0x193D +#define PCI_DID_INTEL_KBL_GT1F_DT2 0x5902 +#define PCI_DID_INTEL_KBL_GT1_SULTM 0x5906 +#define PCI_DID_INTEL_KBL_GT1_SHALM_1 0x5908 +#define PCI_DID_INTEL_KBL_GT1_SSRVM 0x590A +#define PCI_DID_INTEL_KBL_GT1_SHALM_2 0x590B +#define PCI_DID_INTEL_KBL_GT2_DT2P2 0x5912 +#define PCI_DID_INTEL_KBL_GT2_SULTM 0x5916 +#define PCI_DID_INTEL_KBL_GT2_SULTMR 0x5917 +#define PCI_DID_INTEL_KBL_GT2F_SULTM 0x5921 +#define PCI_DID_INTEL_KBL_GT2_SSRVM 0x591A +#define PCI_DID_INTEL_KBL_GT2_SHALM 0x591B +#define PCI_DID_INTEL_KBL_GT2_SWSTM 0x591D +#define PCI_DID_INTEL_KBL_GT2_SULXM 0x591E +#define PCI_DID_INTEL_KBL_GT3E_SULTM_1 0x5926 +#define PCI_DID_INTEL_KBL_GT3E_SULTM_2 0x5927 +#define PCI_DID_INTEL_KBL_GT4_SHALM 0x593B + +#define PCI_DID_INTEL_AML_GT2_ULX 0x591C +#define PCI_DID_INTEL_APL_IGD_HD_505 0x5a84 +#define PCI_DID_INTEL_APL_IGD_HD_500 0x5a85 +#define PCI_DID_INTEL_GLK_IGD 0x3184 +#define PCI_DID_INTEL_GLK_IGD_EU12 0x3185 +#define PCI_DID_INTEL_WHL_GT1_ULT_1 0x3EA1 +#define PCI_DID_INTEL_WHL_GT2_ULT_1 0x3EA0 +#define PCI_DID_INTEL_CNL_GT2_ULX_1 0x5A51 +#define PCI_DID_INTEL_CNL_GT2_ULX_2 0x5A59 +#define PCI_DID_INTEL_CNL_GT2_ULX_3 0x5A41 +#define PCI_DID_INTEL_CNL_GT2_ULX_4 0x5A49 +#define PCI_DID_INTEL_CNL_GT2_ULT_1 0x5A52 +#define PCI_DID_INTEL_CNL_GT2_ULT_2 0x5A5A +#define PCI_DID_INTEL_CNL_GT2_ULT_3 0x5A42 +#define PCI_DID_INTEL_CNL_GT2_ULT_4 0x5A4A +#define PCI_DID_INTEL_CFL_GT2_ULT 0x3EA5 +#define PCI_DID_INTEL_CFL_H_GT2 0x3e9b +#define PCI_DID_INTEL_CFL_H_XEON_GT2 0x3e94 +#define PCI_DID_INTEL_CFL_S_GT1_1 0x3e90 +#define PCI_DID_INTEL_CFL_S_GT1_2 0x3e93 +#define PCI_DID_INTEL_CFL_S_GT2_1 0x3e92 +#define PCI_DID_INTEL_CFL_S_GT2_2 0x3e98 +#define PCI_DID_INTEL_CFL_S_GT2_3 0x3e9a +#define PCI_DID_INTEL_CFL_S_GT2_4 0x3e91 +#define PCI_DID_INTEL_CFL_S_GT2_5 0x3e96 +#define PCI_DID_INTEL_ICL_GT0_ULT 0x8A70 +#define PCI_DID_INTEL_ICL_GT0_5_ULT 0x8A71 +#define PCI_DID_INTEL_ICL_GT1_ULT 0x8A40 +#define PCI_DID_INTEL_ICL_GT2_ULX_0 0x8A50 +#define PCI_DID_INTEL_ICL_GT2_ULX_1 0x8A5D +#define PCI_DID_INTEL_ICL_GT2_ULT_1 0x8A5B +#define PCI_DID_INTEL_ICL_GT2_ULX_2 0x8A5C +#define PCI_DID_INTEL_ICL_GT2_ULT_2 0x8A5A +#define PCI_DID_INTEL_ICL_GT2_ULX_3 0x8A51 +#define PCI_DID_INTEL_ICL_GT2_ULT_3 0x8A52 +#define PCI_DID_INTEL_ICL_GT2_ULX_4 0x8A53 +#define PCI_DID_INTEL_ICL_GT2_ULT_4 0x8A54 +#define PCI_DID_INTEL_ICL_GT2_ULX_5 0x8A55 +#define PCI_DID_INTEL_ICL_GT2_ULT_5 0x8A56 +#define PCI_DID_INTEL_ICL_GT2_ULX_6 0x8A57 +#define PCI_DID_INTEL_ICL_GT3_ULT 0x8A62 +#define PCI_DID_INTEL_CML_GT1_ULT_1 0x9B21 +#define PCI_DID_INTEL_CML_GT1_ULT_2 0x9B2A +#define PCI_DID_INTEL_CML_GT2_ULT_1 0x9B41 +#define PCI_DID_INTEL_CML_GT2_ULT_2 0x9B4A +#define PCI_DID_INTEL_CML_GT1_ULT_3 0x9B2B +#define PCI_DID_INTEL_CML_GT1_ULT_4 0x9B2C +#define PCI_DID_INTEL_CML_GT2_ULT_5 0x9BAA +#define PCI_DID_INTEL_CML_GT2_ULT_6 0x9BCA +#define PCI_DID_INTEL_CML_GT2_ULT_3 0x9B4B +#define PCI_DID_INTEL_CML_GT2_ULT_4 0x9B4C +#define PCI_DID_INTEL_CML_GT1_ULX_1 0x9B20 +#define PCI_DID_INTEL_CML_GT2_ULX_1 0x9B40 +#define PCI_DID_INTEL_CML_GT1_S_1 0x9B25 +#define PCI_DID_INTEL_CML_GT1_S_2 0x9B28 +#define PCI_DID_INTEL_CML_GT2_S_1 0x9B45 +#define PCI_DID_INTEL_CML_GT2_S_2 0x9B48 +#define PCI_DID_INTEL_CML_GT1_H_1 0x9B24 +#define PCI_DID_INTEL_CML_GT1_H_2 0x9B22 +#define PCI_DID_INTEL_CML_GT2_H_1 0x9B44 +#define PCI_DID_INTEL_CML_GT2_H_2 0x9B42 +#define PCI_DID_INTEL_CML_GT2_S_G0 0x9BC8 +#define PCI_DID_INTEL_CML_GT2_S_P0 0x9BC5 +#define PCI_DID_INTEL_CML_GT2_H_R0 0x3E9B +#define PCI_DID_INTEL_CML_GT2_H_R1 0x9BC4 +#define PCI_DID_INTEL_TGL_GT1 0x9A60 +#define PCI_DID_INTEL_TGL_GT2_UY 0x9A49 +#define PCI_DID_INTEL_TGL_GT2 0xFF20 +#define PCI_DID_INTEL_TGL_GT2_Y 0x9A40 +#define PCI_DID_INTEL_TGL_GT0 0x9A7F +#define PCI_DID_INTEL_TGL_GT1_H_32 0x9A60 +#define PCI_DID_INTEL_TGL_GT1_H_16 0x9A68 +#define PCI_DID_INTEL_TGL_GT2_ULT 0x9A49 +#define PCI_DID_INTEL_TGL_GT3_ULT 0x9A52 +#define PCI_DID_INTEL_TGL_GT2_ULX 0x9A40 +#define PCI_DID_INTEL_TGL_GT2_ULT_1 0x9A78 +#define PCI_DID_INTEL_EHL_GT1_1 0x4541 +#define PCI_DID_INTEL_EHL_GT2_1 0x4540 +#define PCI_DID_INTEL_EHL_GT1_2 0x4551 +#define PCI_DID_INTEL_EHL_GT1_2_1 0x4555 +#define PCI_DID_INTEL_EHL_GT2_2 0x4550 +#define PCI_DID_INTEL_EHL_GT1_3 0x4571 +#define PCI_DID_INTEL_EHL_GT2_3 0x4570 +#define PCI_DID_INTEL_JSL_GT1 0x4E51 +#define PCI_DID_INTEL_JSL_GT2 0x4E71 +#define PCI_DID_INTEL_JSL_GT3 0x4E61 +#define PCI_DID_INTEL_JSL_GT4 0x4E55 + +#define PCI_DID_INTEL_ADL_GT0 0x46ff +#define PCI_DID_INTEL_ADL_GT1 0x4600 +#define PCI_DID_INTEL_ADL_GT1_1 0x4601 +#define PCI_DID_INTEL_ADL_GT1_2 0x4602 +#define PCI_DID_INTEL_ADL_GT1_3 0x4603 +#define PCI_DID_INTEL_ADL_GT1_4 0x4610 +#define PCI_DID_INTEL_ADL_GT1_5 0x4611 +#define PCI_DID_INTEL_ADL_GT1_6 0x4612 +#define PCI_DID_INTEL_ADL_GT1_7 0x4613 +#define PCI_DID_INTEL_ADL_GT1_8 0x4618 +#define PCI_DID_INTEL_ADL_GT1_9 0x4619 +#define PCI_DID_INTEL_ADL_P_GT2 0x46a0 +#define PCI_DID_INTEL_ADL_P_GT2_1 0x46b0 +#define PCI_DID_INTEL_ADL_P_GT2_2 0x46a1 +#define PCI_DID_INTEL_ADL_P_GT2_3 0x46a3 +#define PCI_DID_INTEL_ADL_P_GT2_4 0x46a8 +#define PCI_DID_INTEL_ADL_P_GT2_5 0x46b3 +#define PCI_DID_INTEL_ADL_P_GT2_6 0x46a6 +#define PCI_DID_INTEL_ADL_P_GT2_7 0x4628 +#define PCI_DID_INTEL_ADL_P_GT2_8 0x46b1 +#define PCI_DID_INTEL_ADL_P_GT2_9 0x4626 +#define PCI_DID_INTEL_ADL_S_GT1 0x4680 +#define PCI_DID_INTEL_ADL_M_GT1 0x46c0 +#define PCI_DID_INTEL_ADL_M_GT2 0x46aa +#define PCI_DID_INTEL_ADL_M_GT3 0x46c3 +#define PCI_DID_INTEL_ADL_N_GT1 0x46D0 +#define PCI_DID_INTEL_ADL_N_GT2 0x46D1 +#define PCI_DID_INTEL_ADL_N_GT3 0x46D2 /* Intel Northbridge Ids */ -#define PCI_DEVICE_ID_INTEL_APL_NB 0x5af0 -#define PCI_DEVICE_ID_INTEL_GLK_NB 0x31f0 -#define PCI_DEVICE_ID_INTEL_SKL_ID_U 0x1904 -#define PCI_DEVICE_ID_INTEL_SKL_ID_Y 0x190c -#define PCI_DEVICE_ID_INTEL_SKL_ID_ULX 0x1924 -#define PCI_DEVICE_ID_INTEL_SKL_ID_H_2 0x1900 -#define PCI_DEVICE_ID_INTEL_SKL_ID_H_4 0x1910 -#define PCI_DEVICE_ID_INTEL_SKL_ID_S_2 0x190f -#define PCI_DEVICE_ID_INTEL_SKL_ID_S_4 0x191f -#define PCI_DEVICE_ID_INTEL_KBL_ID_S 0x590f -#define PCI_DEVICE_ID_INTEL_SKL_ID_H_EM 0x1918 -#define PCI_DEVICE_ID_INTEL_KBL_ID_U 0x5904 -#define PCI_DEVICE_ID_INTEL_KBL_ID_Y 0x590c -#define PCI_DEVICE_ID_INTEL_KBL_ID_H 0x5910 -#define PCI_DEVICE_ID_INTEL_KBL_U_R 0x5914 -#define PCI_DEVICE_ID_INTEL_KBL_ID_DT_2 0x5918 -#define PCI_DEVICE_ID_INTEL_KBL_ID_DT 0x591f -#define PCI_DEVICE_ID_INTEL_CNL_ID_U 0x5A04 -#define PCI_DEVICE_ID_INTEL_CNL_ID_Y 0x5A02 -#define PCI_DEVICE_ID_INTEL_WHL_ID_W_4 0x3E34 -#define PCI_DEVICE_ID_INTEL_WHL_ID_W_2 0x3E35 -#define PCI_DEVICE_ID_INTEL_CFL_ID_U 0x3ED0 -#define PCI_DEVICE_ID_INTEL_CFL_ID_U_2 0x3ECC -#define PCI_DEVICE_ID_INTEL_CFL_ID_H 0x3ec4 -#define PCI_DEVICE_ID_INTEL_CFL_ID_H_4 0x3e10 -#define PCI_DEVICE_ID_INTEL_CFL_ID_H_8 0x3e20 -#define PCI_DEVICE_ID_INTEL_CFL_ID_S 0x3ec2 -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2 0x3e0f -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4 0x3e1f -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8 0x3e30 -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4 0x3e18 -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6 0x3ec6 -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8 0x3e31 -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4 0x3e33 -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6 0x3eca -#define PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8 0x3e32 -#define PCI_DEVICE_ID_INTEL_ICL_ID_U 0x8A12 -#define PCI_DEVICE_ID_INTEL_ICL_ID_U_2_2 0x8A02 -#define PCI_DEVICE_ID_INTEL_ICL_ID_Y 0x8A10 -#define PCI_DEVICE_ID_INTEL_ICL_ID_Y_2 0x8A00 -#define PCI_DEVICE_ID_INTEL_CML_ULT 0x9B61 -#define PCI_DEVICE_ID_INTEL_CML_ULT_2_2 0x9B71 -#define PCI_DEVICE_ID_INTEL_CML_ULT_6_2 0x9B51 -#define PCI_DEVICE_ID_INTEL_CML_ULX 0x9B60 -#define PCI_DEVICE_ID_INTEL_CML_S 0x9B55 -#define PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2 0x9B33 -#define PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2 0x9B43 -#define PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2 0x9B53 -#define PCI_DEVICE_ID_INTEL_CML_S_G0G1_4 0x9B63 -#define PCI_DEVICE_ID_INTEL_CML_S_G0G1_2 0x9B73 -#define PCI_DEVICE_ID_INTEL_CML_H 0x9B54 -#define PCI_DEVICE_ID_INTEL_CML_H_4_2 0x9B64 -#define PCI_DEVICE_ID_INTEL_CML_H_8_2 0x9B44 -#define PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2 0x9A04 -#define PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2 0x9A14 -#define PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2 0x9A02 -#define PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2 0x9A12 -#define PCI_DEVICE_ID_INTEL_TGL_ID_H_6_1 0x9A26 -#define PCI_DEVICE_ID_INTEL_TGL_ID_H_8_1 0x9A36 -#define PCI_DEVICE_ID_INTEL_EHL_ID_0 0x4510 -#define PCI_DEVICE_ID_INTEL_EHL_ID_1 0x4522 -#define PCI_DEVICE_ID_INTEL_EHL_ID_1A 0x4538 -#define PCI_DEVICE_ID_INTEL_EHL_ID_2 0x4524 -#define PCI_DEVICE_ID_INTEL_EHL_ID_2_1 0x453A -#define PCI_DEVICE_ID_INTEL_EHL_ID_3 0x4512 -#define PCI_DEVICE_ID_INTEL_EHL_ID_3A 0x451E -#define PCI_DEVICE_ID_INTEL_EHL_ID_4 0x4526 -#define PCI_DEVICE_ID_INTEL_EHL_ID_5 0x4514 -#define PCI_DEVICE_ID_INTEL_EHL_ID_6 0x4528 -#define PCI_DEVICE_ID_INTEL_EHL_ID_7 0x452A -#define PCI_DEVICE_ID_INTEL_EHL_ID_8 0x4516 -#define PCI_DEVICE_ID_INTEL_EHL_ID_9 0x452C -#define PCI_DEVICE_ID_INTEL_EHL_ID_10 0x452E -#define PCI_DEVICE_ID_INTEL_EHL_ID_11 0x4532 -#define PCI_DEVICE_ID_INTEL_EHL_ID_12 0x4518 -#define PCI_DEVICE_ID_INTEL_EHL_ID_13 0x451A -#define PCI_DEVICE_ID_INTEL_EHL_ID_14 0x4536 -#define PCI_DEVICE_ID_INTEL_EHL_ID_15 0x451C -#define PCI_DEVICE_ID_INTEL_JSL_ID_1 0x4e22 -#define PCI_DEVICE_ID_INTEL_JSL_ID_2 0x4e26 -#define PCI_DEVICE_ID_INTEL_JSL_ID_3 0x4e12 -#define PCI_DEVICE_ID_INTEL_JSL_ID_4 0x4e14 -#define PCI_DEVICE_ID_INTEL_JSL_ID_5 0x4e24 - -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_1 0x4660 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_2 0x4664 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_3 0x4668 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_4 0x466c -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_5 0x4670 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_6 0x4640 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_7 0x4644 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_8 0x4648 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_9 0x464c -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_10 0x4650 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_11 0x4630 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_12 0x4610 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_13 0x4673 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_14 0x4623 -#define PCI_DEVICE_ID_INTEL_ADL_S_ID_15 0x0060 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_1 0x4629 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_3 0x4641 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_4 0x4649 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_5 0x4621 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_6 0x4609 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_7 0x4601 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_8 0x4661 -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_9 0x467f -#define PCI_DEVICE_ID_INTEL_ADL_P_ID_10 0x4619 -#define PCI_DEVICE_ID_INTEL_ADL_M_ID_1 0x4602 -#define PCI_DEVICE_ID_INTEL_ADL_M_ID_2 0x460a -#define PCI_DEVICE_ID_INTEL_ADL_N_ID_1 0x4617 -#define PCI_DEVICE_ID_INTEL_ADL_N_ID_2 0x461B -#define PCI_DEVICE_ID_INTEL_ADL_N_ID_3 0x461c -#define PCI_DEVICE_ID_INTEL_ADL_N_ID_4 0x4614 +#define PCI_DID_INTEL_APL_NB 0x5af0 +#define PCI_DID_INTEL_GLK_NB 0x31f0 +#define PCI_DID_INTEL_SKL_ID_U 0x1904 +#define PCI_DID_INTEL_SKL_ID_Y 0x190c +#define PCI_DID_INTEL_SKL_ID_ULX 0x1924 +#define PCI_DID_INTEL_SKL_ID_H_2 0x1900 +#define PCI_DID_INTEL_SKL_ID_H_4 0x1910 +#define PCI_DID_INTEL_SKL_ID_S_2 0x190f +#define PCI_DID_INTEL_SKL_ID_S_4 0x191f +#define PCI_DID_INTEL_KBL_ID_S 0x590f +#define PCI_DID_INTEL_SKL_ID_H_EM 0x1918 +#define PCI_DID_INTEL_KBL_ID_U 0x5904 +#define PCI_DID_INTEL_KBL_ID_Y 0x590c +#define PCI_DID_INTEL_KBL_ID_H 0x5910 +#define PCI_DID_INTEL_KBL_U_R 0x5914 +#define PCI_DID_INTEL_KBL_ID_DT_2 0x5918 +#define PCI_DID_INTEL_KBL_ID_DT 0x591f +#define PCI_DID_INTEL_CNL_ID_U 0x5A04 +#define PCI_DID_INTEL_CNL_ID_Y 0x5A02 +#define PCI_DID_INTEL_WHL_ID_W_4 0x3E34 +#define PCI_DID_INTEL_WHL_ID_W_2 0x3E35 +#define PCI_DID_INTEL_CFL_ID_U 0x3ED0 +#define PCI_DID_INTEL_CFL_ID_U_2 0x3ECC +#define PCI_DID_INTEL_CFL_ID_H 0x3ec4 +#define PCI_DID_INTEL_CFL_ID_H_4 0x3e10 +#define PCI_DID_INTEL_CFL_ID_H_8 0x3e20 +#define PCI_DID_INTEL_CFL_ID_S 0x3ec2 +#define PCI_DID_INTEL_CFL_ID_S_DT_2 0x3e0f +#define PCI_DID_INTEL_CFL_ID_S_DT_4 0x3e1f +#define PCI_DID_INTEL_CFL_ID_S_DT_8 0x3e30 +#define PCI_DID_INTEL_CFL_ID_S_WS_4 0x3e18 +#define PCI_DID_INTEL_CFL_ID_S_WS_6 0x3ec6 +#define PCI_DID_INTEL_CFL_ID_S_WS_8 0x3e31 +#define PCI_DID_INTEL_CFL_ID_S_S_4 0x3e33 +#define PCI_DID_INTEL_CFL_ID_S_S_6 0x3eca +#define PCI_DID_INTEL_CFL_ID_S_S_8 0x3e32 +#define PCI_DID_INTEL_ICL_ID_U 0x8A12 +#define PCI_DID_INTEL_ICL_ID_U_2_2 0x8A02 +#define PCI_DID_INTEL_ICL_ID_Y 0x8A10 +#define PCI_DID_INTEL_ICL_ID_Y_2 0x8A00 +#define PCI_DID_INTEL_CML_ULT 0x9B61 +#define PCI_DID_INTEL_CML_ULT_2_2 0x9B71 +#define PCI_DID_INTEL_CML_ULT_6_2 0x9B51 +#define PCI_DID_INTEL_CML_ULX 0x9B60 +#define PCI_DID_INTEL_CML_S 0x9B55 +#define PCI_DID_INTEL_CML_S_P0P1_10_2 0x9B33 +#define PCI_DID_INTEL_CML_S_P0P1_8_2 0x9B43 +#define PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2 0x9B53 +#define PCI_DID_INTEL_CML_S_G0G1_4 0x9B63 +#define PCI_DID_INTEL_CML_S_G0G1_2 0x9B73 +#define PCI_DID_INTEL_CML_H 0x9B54 +#define PCI_DID_INTEL_CML_H_4_2 0x9B64 +#define PCI_DID_INTEL_CML_H_8_2 0x9B44 +#define PCI_DID_INTEL_TGL_ID_U_2_2 0x9A04 +#define PCI_DID_INTEL_TGL_ID_U_4_2 0x9A14 +#define PCI_DID_INTEL_TGL_ID_Y_2_2 0x9A02 +#define PCI_DID_INTEL_TGL_ID_Y_4_2 0x9A12 +#define PCI_DID_INTEL_TGL_ID_H_6_1 0x9A26 +#define PCI_DID_INTEL_TGL_ID_H_8_1 0x9A36 +#define PCI_DID_INTEL_EHL_ID_0 0x4510 +#define PCI_DID_INTEL_EHL_ID_1 0x4522 +#define PCI_DID_INTEL_EHL_ID_1A 0x4538 +#define PCI_DID_INTEL_EHL_ID_2 0x4524 +#define PCI_DID_INTEL_EHL_ID_2_1 0x453A +#define PCI_DID_INTEL_EHL_ID_3 0x4512 +#define PCI_DID_INTEL_EHL_ID_3A 0x451E +#define PCI_DID_INTEL_EHL_ID_4 0x4526 +#define PCI_DID_INTEL_EHL_ID_5 0x4514 +#define PCI_DID_INTEL_EHL_ID_6 0x4528 +#define PCI_DID_INTEL_EHL_ID_7 0x452A +#define PCI_DID_INTEL_EHL_ID_8 0x4516 +#define PCI_DID_INTEL_EHL_ID_9 0x452C +#define PCI_DID_INTEL_EHL_ID_10 0x452E +#define PCI_DID_INTEL_EHL_ID_11 0x4532 +#define PCI_DID_INTEL_EHL_ID_12 0x4518 +#define PCI_DID_INTEL_EHL_ID_13 0x451A +#define PCI_DID_INTEL_EHL_ID_14 0x4536 +#define PCI_DID_INTEL_EHL_ID_15 0x451C +#define PCI_DID_INTEL_JSL_ID_1 0x4e22 +#define PCI_DID_INTEL_JSL_ID_2 0x4e26 +#define PCI_DID_INTEL_JSL_ID_3 0x4e12 +#define PCI_DID_INTEL_JSL_ID_4 0x4e14 +#define PCI_DID_INTEL_JSL_ID_5 0x4e24 + +#define PCI_DID_INTEL_ADL_S_ID_1 0x4660 +#define PCI_DID_INTEL_ADL_S_ID_2 0x4664 +#define PCI_DID_INTEL_ADL_S_ID_3 0x4668 +#define PCI_DID_INTEL_ADL_S_ID_4 0x466c +#define PCI_DID_INTEL_ADL_S_ID_5 0x4670 +#define PCI_DID_INTEL_ADL_S_ID_6 0x4640 +#define PCI_DID_INTEL_ADL_S_ID_7 0x4644 +#define PCI_DID_INTEL_ADL_S_ID_8 0x4648 +#define PCI_DID_INTEL_ADL_S_ID_9 0x464c +#define PCI_DID_INTEL_ADL_S_ID_10 0x4650 +#define PCI_DID_INTEL_ADL_S_ID_11 0x4630 +#define PCI_DID_INTEL_ADL_S_ID_12 0x4610 +#define PCI_DID_INTEL_ADL_S_ID_13 0x4673 +#define PCI_DID_INTEL_ADL_S_ID_14 0x4623 +#define PCI_DID_INTEL_ADL_S_ID_15 0x0060 +#define PCI_DID_INTEL_ADL_P_ID_1 0x4629 +#define PCI_DID_INTEL_ADL_P_ID_3 0x4641 +#define PCI_DID_INTEL_ADL_P_ID_4 0x4649 +#define PCI_DID_INTEL_ADL_P_ID_5 0x4621 +#define PCI_DID_INTEL_ADL_P_ID_6 0x4609 +#define PCI_DID_INTEL_ADL_P_ID_7 0x4601 +#define PCI_DID_INTEL_ADL_P_ID_8 0x4661 +#define PCI_DID_INTEL_ADL_P_ID_9 0x467f +#define PCI_DID_INTEL_ADL_P_ID_10 0x4619 +#define PCI_DID_INTEL_ADL_M_ID_1 0x4602 +#define PCI_DID_INTEL_ADL_M_ID_2 0x460a +#define PCI_DID_INTEL_ADL_N_ID_1 0x4617 +#define PCI_DID_INTEL_ADL_N_ID_2 0x461B +#define PCI_DID_INTEL_ADL_N_ID_3 0x461c +#define PCI_DID_INTEL_ADL_N_ID_4 0x4614 /* Intel SMBUS device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_H_SMBUS 0x8c22 -#define PCI_DEVICE_ID_INTEL_LPT_LP_SMBUS 0x9c22 -#define PCI_DEVICE_ID_INTEL_WPT_LP_SMBUS 0x9ca2 -#define PCI_DEVICE_ID_INTEL_APL_SMBUS 0x5ad4 -#define PCI_DEVICE_ID_INTEL_SPT_LP_SMBUS 0x9d23 -#define PCI_DEVICE_ID_INTEL_SPT_H_SMBUS 0xa123 -#define PCI_DEVICE_ID_INTEL_LWB_SMBUS 0xa1a3 -#define PCI_DEVICE_ID_INTEL_LWB_SMBUS_SUPER 0xa223 -#define PCI_DEVICE_ID_INTEL_CNL_SMBUS 0x9da3 -#define PCI_DEVICE_ID_INTEL_CNP_H_SMBUS 0xa323 -#define PCI_DEVICE_ID_INTEL_ICP_LP_SMBUS 0x34a3 -#define PCI_DEVICE_ID_INTEL_CMP_SMBUS 0x02a3 -#define PCI_DEVICE_ID_INTEL_CMP_H_SMBUS 0x06a3 -#define PCI_DEVICE_ID_INTEL_TGP_LP_SMBUS 0xa0a3 -#define PCI_DEVICE_ID_INTEL_TGP_H_SMBUS 0x43a3 -#define PCI_DEVICE_ID_INTEL_MCC_SMBUS 0x4b23 -#define PCI_DEVICE_ID_INTEL_JSP_SMBUS 0x4da3 -#define PCI_DEVICE_ID_INTEL_ADP_P_SMBUS 0xa0a3 -#define PCI_DEVICE_ID_INTEL_ADP_S_SMBUS 0x7aa3 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_SMBUS 0x54a3 +#define PCI_DID_INTEL_LPT_H_SMBUS 0x8c22 +#define PCI_DID_INTEL_LPT_LP_SMBUS 0x9c22 +#define PCI_DID_INTEL_WPT_LP_SMBUS 0x9ca2 +#define PCI_DID_INTEL_APL_SMBUS 0x5ad4 +#define PCI_DID_INTEL_SPT_LP_SMBUS 0x9d23 +#define PCI_DID_INTEL_SPT_H_SMBUS 0xa123 +#define PCI_DID_INTEL_LWB_SMBUS 0xa1a3 +#define PCI_DID_INTEL_LWB_SMBUS_SUPER 0xa223 +#define PCI_DID_INTEL_CNL_SMBUS 0x9da3 +#define PCI_DID_INTEL_CNP_H_SMBUS 0xa323 +#define PCI_DID_INTEL_ICP_LP_SMBUS 0x34a3 +#define PCI_DID_INTEL_CMP_SMBUS 0x02a3 +#define PCI_DID_INTEL_CMP_H_SMBUS 0x06a3 +#define PCI_DID_INTEL_TGP_LP_SMBUS 0xa0a3 +#define PCI_DID_INTEL_TGP_H_SMBUS 0x43a3 +#define PCI_DID_INTEL_MCC_SMBUS 0x4b23 +#define PCI_DID_INTEL_JSP_SMBUS 0x4da3 +#define PCI_DID_INTEL_ADP_P_SMBUS 0xa0a3 +#define PCI_DID_INTEL_ADP_S_SMBUS 0x7aa3 +#define PCI_DID_INTEL_ADP_M_N_SMBUS 0x54a3 /* Intel EHCI device IDs */ -#define PCI_DEVICE_ID_INTEL_LPT_H_EHCI_1 0x8c26 -#define PCI_DEVICE_ID_INTEL_LPT_H_EHCI_2 0x8c2d -#define PCI_DEVICE_ID_INTEL_LPT_LP_EHCI 0x9c26 +#define PCI_DID_INTEL_LPT_H_EHCI_1 0x8c26 +#define PCI_DID_INTEL_LPT_H_EHCI_2 0x8c2d +#define PCI_DID_INTEL_LPT_LP_EHCI 0x9c26 /* Intel XHCI device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_H_XHCI 0x8c31 -#define PCI_DEVICE_ID_INTEL_LPT_LP_XHCI 0x9c31 -#define PCI_DEVICE_ID_INTEL_APL_XHCI 0x5aa8 -#define PCI_DEVICE_ID_INTEL_GLK_XHCI 0x31a8 -#define PCI_DEVICE_ID_INTEL_SPT_LP_XHCI 0x9d2f -#define PCI_DEVICE_ID_INTEL_SPT_H_XHCI 0xa12f -#define PCI_DEVICE_ID_INTEL_LWB_XHCI 0xa1af -#define PCI_DEVICE_ID_INTEL_LWB_XHCI_SUPER 0xa22f -#define PCI_DEVICE_ID_INTEL_UPT_H_XHCI 0xa2af -#define PCI_DEVICE_ID_INTEL_CNL_LP_XHCI 0x9ded -#define PCI_DEVICE_ID_INTEL_CNP_H_XHCI 0xa36d -#define PCI_DEVICE_ID_INTEL_ICP_LP_XHCI 0x34ed -#define PCI_DEVICE_ID_INTEL_CMP_LP_XHCI 0x02ed -#define PCI_DEVICE_ID_INTEL_CMP_H_XHCI 0x06ed -#define PCI_DEVICE_ID_INTEL_TGP_LP_XHCI 0xa0ed -#define PCI_DEVICE_ID_INTEL_TGP_TCSS_XHCI 0x9a13 -#define PCI_DEVICE_ID_INTEL_TGP_H_XHCI 0x43ed -#define PCI_DEVICE_ID_INTEL_TGP_H_TCSS_XHCI 0x9a17 -#define PCI_DEVICE_ID_INTEL_MCC_XHCI 0x4b7d -#define PCI_DEVICE_ID_INTEL_JSP_XHCI 0x4ded -#define PCI_DEVICE_ID_INTEL_ADP_P_XHCI 0x51ed -#define PCI_DEVICE_ID_INTEL_ADP_S_XHCI 0x7ae0 -#define PCI_DEVICE_ID_INTEL_ADP_TCSS_XHCI 0x461e -#define PCI_DEVICE_ID_INTEL_ADP_M_XHCI 0x54ed +#define PCI_DID_INTEL_LPT_H_XHCI 0x8c31 +#define PCI_DID_INTEL_LPT_LP_XHCI 0x9c31 +#define PCI_DID_INTEL_APL_XHCI 0x5aa8 +#define PCI_DID_INTEL_GLK_XHCI 0x31a8 +#define PCI_DID_INTEL_SPT_LP_XHCI 0x9d2f +#define PCI_DID_INTEL_SPT_H_XHCI 0xa12f +#define PCI_DID_INTEL_LWB_XHCI 0xa1af +#define PCI_DID_INTEL_LWB_XHCI_SUPER 0xa22f +#define PCI_DID_INTEL_UPT_H_XHCI 0xa2af +#define PCI_DID_INTEL_CNL_LP_XHCI 0x9ded +#define PCI_DID_INTEL_CNP_H_XHCI 0xa36d +#define PCI_DID_INTEL_ICP_LP_XHCI 0x34ed +#define PCI_DID_INTEL_CMP_LP_XHCI 0x02ed +#define PCI_DID_INTEL_CMP_H_XHCI 0x06ed +#define PCI_DID_INTEL_TGP_LP_XHCI 0xa0ed +#define PCI_DID_INTEL_TGP_TCSS_XHCI 0x9a13 +#define PCI_DID_INTEL_TGP_H_XHCI 0x43ed +#define PCI_DID_INTEL_TGP_H_TCSS_XHCI 0x9a17 +#define PCI_DID_INTEL_MCC_XHCI 0x4b7d +#define PCI_DID_INTEL_JSP_XHCI 0x4ded +#define PCI_DID_INTEL_ADP_P_XHCI 0x51ed +#define PCI_DID_INTEL_ADP_S_XHCI 0x7ae0 +#define PCI_DID_INTEL_ADP_TCSS_XHCI 0x461e +#define PCI_DID_INTEL_ADP_M_XHCI 0x54ed /* Intel P2SB device Ids */ -#define PCI_DEVICE_ID_INTEL_APL_P2SB 0x5a92 -#define PCI_DEVICE_ID_INTEL_GLK_P2SB 0x3192 -#define PCI_DEVICE_ID_INTEL_LWB_P2SB 0xa1a0 -#define PCI_DEVICE_ID_INTEL_LWB_P2SB_SUPER 0xa220 -#define PCI_DEVICE_ID_INTEL_SKL_LP_P2SB 0x9d20 -#define PCI_DEVICE_ID_INTEL_SKL_P2SB 0xa120 -#define PCI_DEVICE_ID_INTEL_KBL_P2SB 0xa2a0 -#define PCI_DEVICE_ID_INTEL_CNL_P2SB 0x9da0 -#define PCI_DEVICE_ID_INTEL_CNP_H_P2SB 0xa320 -#define PCI_DEVICE_ID_INTEL_ICL_P2SB 0x34a0 -#define PCI_DEVICE_ID_INTEL_CMP_P2SB 0x02a0 -#define PCI_DEVICE_ID_INTEL_CMP_H_P2SB 0x06a0 -#define PCI_DEVICE_ID_INTEL_TGL_P2SB 0xa0a0 -#define PCI_DEVICE_ID_INTEL_TGL_H_P2SB 0x43a0 -#define PCI_DEVICE_ID_INTEL_EHL_P2SB 0x4b20 -#define PCI_DEVICE_ID_INTEL_JSP_P2SB 0x4da0 -#define PCI_DEVICE_ID_INTEL_ADP_P_P2SB 0x7a20 -#define PCI_DEVICE_ID_INTEL_ADP_S_P2SB 0x7aa0 -#define PCI_DEVICE_ID_INTEL_ADP_M_P2SB 0x54a0 +#define PCI_DID_INTEL_APL_P2SB 0x5a92 +#define PCI_DID_INTEL_GLK_P2SB 0x3192 +#define PCI_DID_INTEL_LWB_P2SB 0xa1a0 +#define PCI_DID_INTEL_LWB_P2SB_SUPER 0xa220 +#define PCI_DID_INTEL_SKL_LP_P2SB 0x9d20 +#define PCI_DID_INTEL_SKL_P2SB 0xa120 +#define PCI_DID_INTEL_KBL_P2SB 0xa2a0 +#define PCI_DID_INTEL_CNL_P2SB 0x9da0 +#define PCI_DID_INTEL_CNP_H_P2SB 0xa320 +#define PCI_DID_INTEL_ICL_P2SB 0x34a0 +#define PCI_DID_INTEL_CMP_P2SB 0x02a0 +#define PCI_DID_INTEL_CMP_H_P2SB 0x06a0 +#define PCI_DID_INTEL_TGL_P2SB 0xa0a0 +#define PCI_DID_INTEL_TGL_H_P2SB 0x43a0 +#define PCI_DID_INTEL_EHL_P2SB 0x4b20 +#define PCI_DID_INTEL_JSP_P2SB 0x4da0 +#define PCI_DID_INTEL_ADP_P_P2SB 0x7a20 +#define PCI_DID_INTEL_ADP_S_P2SB 0x7aa0 +#define PCI_DID_INTEL_ADP_M_P2SB 0x54a0 /* Intel SRAM device Ids */ -#define PCI_DEVICE_ID_INTEL_APL_SRAM 0x5aec -#define PCI_DEVICE_ID_INTEL_GLK_SRAM 0x31ec -#define PCI_DEVICE_ID_INTEL_CNL_SRAM 0x9def -#define PCI_DEVICE_ID_INTEL_CNP_H_SRAM 0xa36f -#define PCI_DEVICE_ID_INTEL_ICL_SRAM 0x34ef -#define PCI_DEVICE_ID_INTEL_CMP_SRAM 0x02ef -#define PCI_DEVICE_ID_INTEL_CMP_H_SRAM 0x06ef -#define PCI_DEVICE_ID_INTEL_TGL_H_SRAM 0x43ef -#define PCI_DEVICE_ID_INTEL_MCC_SRAM 0x4b7f -#define PCI_DEVICE_ID_INTEL_JSP_SRAM 0x4def +#define PCI_DID_INTEL_APL_SRAM 0x5aec +#define PCI_DID_INTEL_GLK_SRAM 0x31ec +#define PCI_DID_INTEL_CNL_SRAM 0x9def +#define PCI_DID_INTEL_CNP_H_SRAM 0xa36f +#define PCI_DID_INTEL_ICL_SRAM 0x34ef +#define PCI_DID_INTEL_CMP_SRAM 0x02ef +#define PCI_DID_INTEL_CMP_H_SRAM 0x06ef +#define PCI_DID_INTEL_TGL_H_SRAM 0x43ef +#define PCI_DID_INTEL_MCC_SRAM 0x4b7f +#define PCI_DID_INTEL_JSP_SRAM 0x4def /* Intel AUDIO device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_H_AUDIO 0x8c20 -#define PCI_DEVICE_ID_INTEL_LPT_LP_AUDIO 0x9c20 -#define PCI_DEVICE_ID_INTEL_APL_AUDIO 0x5a98 -#define PCI_DEVICE_ID_INTEL_GLK_AUDIO 0x3198 -#define PCI_DEVICE_ID_INTEL_CNL_AUDIO 0x9dc8 -#define PCI_DEVICE_ID_INTEL_SKL_AUDIO 0x9d70 -#define PCI_DEVICE_ID_INTEL_SKL_H_AUDIO 0xa171 -#define PCI_DEVICE_ID_INTEL_LWB_AUDIO 0xa1f0 -#define PCI_DEVICE_ID_INTEL_LWB_AUDIO_SUPER 0xa270 -#define PCI_DEVICE_ID_INTEL_KBL_AUDIO 0x9d71 -#define PCI_DEVICE_ID_INTEL_CNP_H_AUDIO 0xa348 -#define PCI_DEVICE_ID_INTEL_ICL_AUDIO 0x34c8 -#define PCI_DEVICE_ID_INTEL_CMP_AUDIO 0x02c8 -#define PCI_DEVICE_ID_INTEL_CMP_H_AUDIO 0x06c8 -#define PCI_DEVICE_ID_INTEL_BSW_AUDIO 0x2284 -#define PCI_DEVICE_ID_INTEL_TGL_AUDIO 0xa0c8 -#define PCI_DEVICE_ID_INTEL_TGL_H_AUDIO 0x43c8 -#define PCI_DEVICE_ID_INTEL_MCC_AUDIO 0x4b55 -#define PCI_DEVICE_ID_INTEL_JSP_AUDIO 0x4dc8 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_1 0x7ad0 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_2 0x7ad1 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_3 0x7ad2 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_4 0x7ad3 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_5 0x7ad4 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_6 0x7ad5 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_7 0x7ad6 -#define PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_8 0x7ad7 -#define PCI_DEVICE_ID_INTEL_ADP_P_AUDIO 0x51c8 - -#define PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_1 0x54c8 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_2 0x54c9 -#define PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_3 0x54ca -#define PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_4 0x54cb -#define PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_5 0x54cc -#define PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_6 0x54cd -#define PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_7 0x54ce +#define PCI_DID_INTEL_LPT_H_AUDIO 0x8c20 +#define PCI_DID_INTEL_LPT_LP_AUDIO 0x9c20 +#define PCI_DID_INTEL_APL_AUDIO 0x5a98 +#define PCI_DID_INTEL_GLK_AUDIO 0x3198 +#define PCI_DID_INTEL_CNL_AUDIO 0x9dc8 +#define PCI_DID_INTEL_SKL_AUDIO 0x9d70 +#define PCI_DID_INTEL_SKL_H_AUDIO 0xa171 +#define PCI_DID_INTEL_LWB_AUDIO 0xa1f0 +#define PCI_DID_INTEL_LWB_AUDIO_SUPER 0xa270 +#define PCI_DID_INTEL_KBL_AUDIO 0x9d71 +#define PCI_DID_INTEL_CNP_H_AUDIO 0xa348 +#define PCI_DID_INTEL_ICL_AUDIO 0x34c8 +#define PCI_DID_INTEL_CMP_AUDIO 0x02c8 +#define PCI_DID_INTEL_CMP_H_AUDIO 0x06c8 +#define PCI_DID_INTEL_BSW_AUDIO 0x2284 +#define PCI_DID_INTEL_TGL_AUDIO 0xa0c8 +#define PCI_DID_INTEL_TGL_H_AUDIO 0x43c8 +#define PCI_DID_INTEL_MCC_AUDIO 0x4b55 +#define PCI_DID_INTEL_JSP_AUDIO 0x4dc8 +#define PCI_DID_INTEL_ADP_S_AUDIO_1 0x7ad0 +#define PCI_DID_INTEL_ADP_S_AUDIO_2 0x7ad1 +#define PCI_DID_INTEL_ADP_S_AUDIO_3 0x7ad2 +#define PCI_DID_INTEL_ADP_S_AUDIO_4 0x7ad3 +#define PCI_DID_INTEL_ADP_S_AUDIO_5 0x7ad4 +#define PCI_DID_INTEL_ADP_S_AUDIO_6 0x7ad5 +#define PCI_DID_INTEL_ADP_S_AUDIO_7 0x7ad6 +#define PCI_DID_INTEL_ADP_S_AUDIO_8 0x7ad7 +#define PCI_DID_INTEL_ADP_P_AUDIO 0x51c8 + +#define PCI_DID_INTEL_ADP_M_N_AUDIO_1 0x54c8 +#define PCI_DID_INTEL_ADP_M_N_AUDIO_2 0x54c9 +#define PCI_DID_INTEL_ADP_M_N_AUDIO_3 0x54ca +#define PCI_DID_INTEL_ADP_M_N_AUDIO_4 0x54cb +#define PCI_DID_INTEL_ADP_M_N_AUDIO_5 0x54cc +#define PCI_DID_INTEL_ADP_M_N_AUDIO_6 0x54cd +#define PCI_DID_INTEL_ADP_M_N_AUDIO_7 0x54ce /* Intel HECI/ME device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_H_MEI 0x8c3a -#define PCI_DEVICE_ID_INTEL_LPT_LP_MEI 0x9c3a -#define PCI_DEVICE_ID_INTEL_APL_CSE0 0x5a9a -#define PCI_DEVICE_ID_INTEL_GLK_CSE0 0x319a -#define PCI_DEVICE_ID_INTEL_CNL_CSE0 0x9de0 -#define PCI_DEVICE_ID_INTEL_SKL_CSE0 0x9d3a -#define PCI_DEVICE_ID_INTEL_LWB_CSE0 0xa1ba -#define PCI_DEVICE_ID_INTEL_LWB_CSE1 0xa1bb -#define PCI_DEVICE_ID_INTEL_LWB_CSE2 0xa1be -#define PCI_DEVICE_ID_INTEL_LWB_CSE0_SUPER 0xa23a -#define PCI_DEVICE_ID_INTEL_LWB_CSE1_SUPER 0xa23b -#define PCI_DEVICE_ID_INTEL_LWB_CSE2_SUPER 0xa23e -#define PCI_DEVICE_ID_INTEL_CNP_H_CSE0 0xa360 -#define PCI_DEVICE_ID_INTEL_ICL_CSE0 0x34e0 -#define PCI_DEVICE_ID_INTEL_CMP_CSE0 0x02e0 -#define PCI_DEVICE_ID_INTEL_CMP_H_CSE0 0x06e0 -#define PCI_DEVICE_ID_INTEL_TGL_CSE0 0xa0e0 -#define PCI_DEVICE_ID_INTEL_TGL_H_CSE0 0x43e0 -#define PCI_DEVICE_ID_INTEL_MCC_CSE0 0x4b70 -#define PCI_DEVICE_ID_INTEL_MCC_CSE1 0x4b71 -#define PCI_DEVICE_ID_INTEL_MCC_CSE2 0x4b74 -#define PCI_DEVICE_ID_INTEL_MCC_CSE3 0x4b75 -#define PCI_DEVICE_ID_INTEL_JSP_CSE0 0x4de0 -#define PCI_DEVICE_ID_INTEL_JSP_CSE1 0x4de1 -#define PCI_DEVICE_ID_INTEL_JSP_CSE2 0x4de4 -#define PCI_DEVICE_ID_INTEL_JSP_CSE3 0x4de5 -#define PCI_DEVICE_ID_INTEL_ADP_P_CSE0 0x51e0 -#define PCI_DEVICE_ID_INTEL_ADP_P_CSE1 0x51e1 -#define PCI_DEVICE_ID_INTEL_ADP_P_CSE2 0x51e4 -#define PCI_DEVICE_ID_INTEL_ADP_P_CSE3 0x51e5 -#define PCI_DEVICE_ID_INTEL_ADP_S_CSE0 0x7ae8 -#define PCI_DEVICE_ID_INTEL_ADP_S_CSE1 0x7ae9 -#define PCI_DEVICE_ID_INTEL_ADP_S_CSE2 0x7aec -#define PCI_DEVICE_ID_INTEL_ADP_S_CSE3 0x7aed -#define PCI_DEVICE_ID_INTEL_ADP_M_CSE0 0x54e0 -#define PCI_DEVICE_ID_INTEL_ADP_M_CSE1 0x54e1 -#define PCI_DEVICE_ID_INTEL_ADP_M_CSE2 0x54e4 -#define PCI_DEVICE_ID_INTEL_ADP_M_CSE3 0x54e5 +#define PCI_DID_INTEL_LPT_H_MEI 0x8c3a +#define PCI_DID_INTEL_LPT_LP_MEI 0x9c3a +#define PCI_DID_INTEL_APL_CSE0 0x5a9a +#define PCI_DID_INTEL_GLK_CSE0 0x319a +#define PCI_DID_INTEL_CNL_CSE0 0x9de0 +#define PCI_DID_INTEL_SKL_CSE0 0x9d3a +#define PCI_DID_INTEL_LWB_CSE0 0xa1ba +#define PCI_DID_INTEL_LWB_CSE1 0xa1bb +#define PCI_DID_INTEL_LWB_CSE2 0xa1be +#define PCI_DID_INTEL_LWB_CSE0_SUPER 0xa23a +#define PCI_DID_INTEL_LWB_CSE1_SUPER 0xa23b +#define PCI_DID_INTEL_LWB_CSE2_SUPER 0xa23e +#define PCI_DID_INTEL_CNP_H_CSE0 0xa360 +#define PCI_DID_INTEL_ICL_CSE0 0x34e0 +#define PCI_DID_INTEL_CMP_CSE0 0x02e0 +#define PCI_DID_INTEL_CMP_H_CSE0 0x06e0 +#define PCI_DID_INTEL_TGL_CSE0 0xa0e0 +#define PCI_DID_INTEL_TGL_H_CSE0 0x43e0 +#define PCI_DID_INTEL_MCC_CSE0 0x4b70 +#define PCI_DID_INTEL_MCC_CSE1 0x4b71 +#define PCI_DID_INTEL_MCC_CSE2 0x4b74 +#define PCI_DID_INTEL_MCC_CSE3 0x4b75 +#define PCI_DID_INTEL_JSP_CSE0 0x4de0 +#define PCI_DID_INTEL_JSP_CSE1 0x4de1 +#define PCI_DID_INTEL_JSP_CSE2 0x4de4 +#define PCI_DID_INTEL_JSP_CSE3 0x4de5 +#define PCI_DID_INTEL_ADP_P_CSE0 0x51e0 +#define PCI_DID_INTEL_ADP_P_CSE1 0x51e1 +#define PCI_DID_INTEL_ADP_P_CSE2 0x51e4 +#define PCI_DID_INTEL_ADP_P_CSE3 0x51e5 +#define PCI_DID_INTEL_ADP_S_CSE0 0x7ae8 +#define PCI_DID_INTEL_ADP_S_CSE1 0x7ae9 +#define PCI_DID_INTEL_ADP_S_CSE2 0x7aec +#define PCI_DID_INTEL_ADP_S_CSE3 0x7aed +#define PCI_DID_INTEL_ADP_M_CSE0 0x54e0 +#define PCI_DID_INTEL_ADP_M_CSE1 0x54e1 +#define PCI_DID_INTEL_ADP_M_CSE2 0x54e4 +#define PCI_DID_INTEL_ADP_M_CSE3 0x54e5 /* Intel XDCI device Ids */ -#define PCI_DEVICE_ID_INTEL_APL_XDCI 0x5aaa -#define PCI_DEVICE_ID_INTEL_GLK_XDCI 0x31aa -#define PCI_DEVICE_ID_INTEL_SPT_LP_XDCI 0x9d30 -#define PCI_DEVICE_ID_INTEL_CNL_LP_XDCI 0x9dee -#define PCI_DEVICE_ID_INTEL_CNP_H_XDCI 0xa36e -#define PCI_DEVICE_ID_INTEL_ICP_LP_XDCI 0x34ee -#define PCI_DEVICE_ID_INTEL_CMP_LP_XDCI 0x02ee -#define PCI_DEVICE_ID_INTEL_CMP_H_XDCI 0x06ee -#define PCI_DEVICE_ID_INTEL_TGP_LP_XDCI 0xa0ee -#define PCI_DEVICE_ID_INTEL_TGP_TCSS_XDCI 0x9a15 -#define PCI_DEVICE_ID_INTEL_TGP_H_XDCI 0x43ee -#define PCI_DEVICE_ID_INTEL_MCC_XDCI 0x4b7e -#define PCI_DEVICE_ID_INTEL_JSP_XDCI 0x4dee -#define PCI_DEVICE_ID_INTEL_ADP_P_XDCI 0x51ee -#define PCI_DEVICE_ID_INTEL_ADP_S_XDCI 0x7ae1 -#define PCI_DEVICE_ID_INTEL_ADP_TCSS_XDCI 0x460e -#define PCI_DEVICE_ID_INTEL_ADP_M_XDCI 0x54ee +#define PCI_DID_INTEL_APL_XDCI 0x5aaa +#define PCI_DID_INTEL_GLK_XDCI 0x31aa +#define PCI_DID_INTEL_SPT_LP_XDCI 0x9d30 +#define PCI_DID_INTEL_CNL_LP_XDCI 0x9dee +#define PCI_DID_INTEL_CNP_H_XDCI 0xa36e +#define PCI_DID_INTEL_ICP_LP_XDCI 0x34ee +#define PCI_DID_INTEL_CMP_LP_XDCI 0x02ee +#define PCI_DID_INTEL_CMP_H_XDCI 0x06ee +#define PCI_DID_INTEL_TGP_LP_XDCI 0xa0ee +#define PCI_DID_INTEL_TGP_TCSS_XDCI 0x9a15 +#define PCI_DID_INTEL_TGP_H_XDCI 0x43ee +#define PCI_DID_INTEL_MCC_XDCI 0x4b7e +#define PCI_DID_INTEL_JSP_XDCI 0x4dee +#define PCI_DID_INTEL_ADP_P_XDCI 0x51ee +#define PCI_DID_INTEL_ADP_S_XDCI 0x7ae1 +#define PCI_DID_INTEL_ADP_TCSS_XDCI 0x460e +#define PCI_DID_INTEL_ADP_M_XDCI 0x54ee /* Intel SD device Ids */ -#define PCI_DEVICE_ID_INTEL_LPT_LP_SD 0x9c35 -#define PCI_DEVICE_ID_INTEL_APL_SD 0x5aca -#define PCI_DEVICE_ID_INTEL_GLK_SD 0x31ca -#define PCI_DEVICE_ID_INTEL_SKL_SD 0x9d2d -#define PCI_DEVICE_ID_INTEL_CNL_SD 0x9df5 -#define PCI_DEVICE_ID_INTEL_CNP_H_SD 0xa375 -#define PCI_DEVICE_ID_INTEL_ICL_SD 0x34f8 -#define PCI_DEVICE_ID_INTEL_CMP_SD 0x02f5 -#define PCI_DEVICE_ID_INTEL_CMP_H_SD 0x06f5 -#define PCI_DEVICE_ID_INTEL_MCC_SD 0x4b48 -#define PCI_DEVICE_ID_INTEL_JSP_SD 0x4df8 +#define PCI_DID_INTEL_LPT_LP_SD 0x9c35 +#define PCI_DID_INTEL_APL_SD 0x5aca +#define PCI_DID_INTEL_GLK_SD 0x31ca +#define PCI_DID_INTEL_SKL_SD 0x9d2d +#define PCI_DID_INTEL_CNL_SD 0x9df5 +#define PCI_DID_INTEL_CNP_H_SD 0xa375 +#define PCI_DID_INTEL_ICL_SD 0x34f8 +#define PCI_DID_INTEL_CMP_SD 0x02f5 +#define PCI_DID_INTEL_CMP_H_SD 0x06f5 +#define PCI_DID_INTEL_MCC_SD 0x4b48 +#define PCI_DID_INTEL_JSP_SD 0x4df8 /* Intel EMMC device Ids */ -#define PCI_DEVICE_ID_INTEL_SKL_EMMC 0x9d2b -#define PCI_DEVICE_ID_INTEL_CMP_EMMC 0x02c4 -#define PCI_DEVICE_ID_INTEL_JSP_EMMC 0x4dc4 -#define PCI_DEVICE_ID_INTEL_ADP_EMMC 0x54c4 +#define PCI_DID_INTEL_SKL_EMMC 0x9d2b +#define PCI_DID_INTEL_CMP_EMMC 0x02c4 +#define PCI_DID_INTEL_JSP_EMMC 0x4dc4 +#define PCI_DID_INTEL_ADP_EMMC 0x54c4 /* Intel UFS device Ids */ -#define PCI_DEVICE_ID_INTEL_ADP_UFS 0x54ff +#define PCI_DID_INTEL_ADP_UFS 0x54ff /* Intel Thunderbolt device Ids */ -#define PCI_DEVICE_ID_INTEL_TGL_TBT_RP0 0x9a23 -#define PCI_DEVICE_ID_INTEL_TGL_TBT_RP1 0x9a25 -#define PCI_DEVICE_ID_INTEL_TGL_TBT_RP2 0x9a27 -#define PCI_DEVICE_ID_INTEL_TGL_TBT_RP3 0x9a29 -#define PCI_DEVICE_ID_INTEL_TGL_H_TBT_RP0 0x9a2b -#define PCI_DEVICE_ID_INTEL_TGL_H_TBT_RP1 0x9a2d -#define PCI_DEVICE_ID_INTEL_TGL_H_TBT_RP2 0x9a2f -#define PCI_DEVICE_ID_INTEL_TGL_H_TBT_RP3 0x9a31 -#define PCI_DEVICE_ID_INTEL_ADL_TBT_RP0 0x466e -#define PCI_DEVICE_ID_INTEL_ADL_TBT_RP1 0x463f -#define PCI_DEVICE_ID_INTEL_ADL_TBT_RP2 0x462f -#define PCI_DEVICE_ID_INTEL_ADL_TBT_RP3 0x461f -#define PCI_DEVICE_ID_INTEL_TGL_TBT_DMA0 0x9a1b -#define PCI_DEVICE_ID_INTEL_TGL_TBT_DMA1 0x9a1d -#define PCI_DEVICE_ID_INTEL_TGL_H_TBT_DMA0 0x9a1f -#define PCI_DEVICE_ID_INTEL_TGL_H_TBT_DMA1 0x9a21 -#define PCI_DEVICE_ID_INTEL_ADL_TBT_DMA0 0x463e -#define PCI_DEVICE_ID_INTEL_ADL_TBT_DMA1 0x466d +#define PCI_DID_INTEL_TGL_TBT_RP0 0x9a23 +#define PCI_DID_INTEL_TGL_TBT_RP1 0x9a25 +#define PCI_DID_INTEL_TGL_TBT_RP2 0x9a27 +#define PCI_DID_INTEL_TGL_TBT_RP3 0x9a29 +#define PCI_DID_INTEL_TGL_H_TBT_RP0 0x9a2b +#define PCI_DID_INTEL_TGL_H_TBT_RP1 0x9a2d +#define PCI_DID_INTEL_TGL_H_TBT_RP2 0x9a2f +#define PCI_DID_INTEL_TGL_H_TBT_RP3 0x9a31 +#define PCI_DID_INTEL_ADL_TBT_RP0 0x466e +#define PCI_DID_INTEL_ADL_TBT_RP1 0x463f +#define PCI_DID_INTEL_ADL_TBT_RP2 0x462f +#define PCI_DID_INTEL_ADL_TBT_RP3 0x461f +#define PCI_DID_INTEL_TGL_TBT_DMA0 0x9a1b +#define PCI_DID_INTEL_TGL_TBT_DMA1 0x9a1d +#define PCI_DID_INTEL_TGL_H_TBT_DMA0 0x9a1f +#define PCI_DID_INTEL_TGL_H_TBT_DMA1 0x9a21 +#define PCI_DID_INTEL_ADL_TBT_DMA0 0x463e +#define PCI_DID_INTEL_ADL_TBT_DMA1 0x466d /* Intel WIFI Ids */ -#define PCI_DEVICE_ID_1000_SERIES_WIFI 0x0084 -#define PCI_DEVICE_ID_6005_SERIES_WIFI 0x0085 -#define PCI_DEVICE_ID_6005_I_SERIES_WIFI 0x0089 -#define PCI_DEVICE_ID_1030_SERIES_WIFI 0x008b -#define PCI_DEVICE_ID_6030_I_SERIES_WIFI 0x008e -#define PCI_DEVICE_ID_6030_SERIES_WIFI 0x0090 -#define PCI_DEVICE_ID_6150_SERIES_WIFI 0x0886 -#define PCI_DEVICE_ID_2030_SERIES_WIFI 0x0888 -#define PCI_DEVICE_ID_2000_SERIES_WIFI 0x0891 -#define PCI_DEVICE_ID_0135_SERIES_WIFI 0x0893 -#define PCI_DEVICE_ID_0105_SERIES_WIFI 0x0895 -#define PCI_DEVICE_ID_6035_SERIES_WIFI 0x088f -#define PCI_DEVICE_ID_5300_SERIES_WIFI 0x4236 -#define PCI_DEVICE_ID_5100_SERIES_WIFI 0x4237 -#define PCI_DEVICE_ID_6000_SERIES_WIFI 0x4238 -#define PCI_DEVICE_ID_6000_I_SERIES_WIFI 0x4239 -#define PCI_DEVICE_ID_5350_SERIES_WIFI 0x423b -#define PCI_DEVICE_ID_5150_SERIES_WIFI 0x423d -#define PCI_DEVICE_ID_WP_7260_SERIES_1_WIFI 0x08b1 -#define PCI_DEVICE_ID_WP_7260_SERIES_2_WIFI 0x08b2 -#define PCI_DEVICE_ID_SP_7265_SERIES_1_WIFI 0x095a -#define PCI_DEVICE_ID_SP_7265_SERIES_2_WIFI 0x095b -#define PCI_DEVICE_ID_SFP_8260_SERIES_1_WIFI 0x24f3 -#define PCI_DEVICE_ID_SFP_8260_SERIES_2_WIFI 0x24f4 -#define PCI_DEVICE_ID_WSP_8275_SERIES_1_WIFI 0x24fd -#define PCI_DEVICE_ID_TP_9260_SERIES_WIFI 0x2526 -#define PCI_DEVICE_ID_CyP_6SERIES_WIFI 0x2723 -#define PCI_DEVICE_ID_TyP_6SERIES_WIFI 0x2725 -#define PCI_DEVICE_ID_GrP_6SERIES_1_WIFI 0x51f0 -#define PCI_DEVICE_ID_GrP_6SERIES_2_WIFI 0x7af0 - -#define PCI_DEVICE_ID_INTEL_TGL_IPU 0x9a19 -#define PCI_DEVICE_ID_INTEL_TGL_H_IPU 0x9a39 -#define PCI_DEVICE_ID_INTEL_JSL_IPU 0x4e19 -#define PCI_DEVICE_ID_INTEL_ADL_IPU 0x465d -#define PCI_DEVICE_ID_INTEL_ADL_N_IPU 0x462e +#define PCI_DID_1000_SERIES_WIFI 0x0084 +#define PCI_DID_6005_SERIES_WIFI 0x0085 +#define PCI_DID_6005_I_SERIES_WIFI 0x0089 +#define PCI_DID_1030_SERIES_WIFI 0x008b +#define PCI_DID_6030_I_SERIES_WIFI 0x008e +#define PCI_DID_6030_SERIES_WIFI 0x0090 +#define PCI_DID_6150_SERIES_WIFI 0x0886 +#define PCI_DID_2030_SERIES_WIFI 0x0888 +#define PCI_DID_2000_SERIES_WIFI 0x0891 +#define PCI_DID_0135_SERIES_WIFI 0x0893 +#define PCI_DID_0105_SERIES_WIFI 0x0895 +#define PCI_DID_6035_SERIES_WIFI 0x088f +#define PCI_DID_5300_SERIES_WIFI 0x4236 +#define PCI_DID_5100_SERIES_WIFI 0x4237 +#define PCI_DID_6000_SERIES_WIFI 0x4238 +#define PCI_DID_6000_I_SERIES_WIFI 0x4239 +#define PCI_DID_5350_SERIES_WIFI 0x423b +#define PCI_DID_5150_SERIES_WIFI 0x423d +#define PCI_DID_WP_7260_SERIES_1_WIFI 0x08b1 +#define PCI_DID_WP_7260_SERIES_2_WIFI 0x08b2 +#define PCI_DID_SP_7265_SERIES_1_WIFI 0x095a +#define PCI_DID_SP_7265_SERIES_2_WIFI 0x095b +#define PCI_DID_SFP_8260_SERIES_1_WIFI 0x24f3 +#define PCI_DID_SFP_8260_SERIES_2_WIFI 0x24f4 +#define PCI_DID_WSP_8275_SERIES_1_WIFI 0x24fd +#define PCI_DID_TP_9260_SERIES_WIFI 0x2526 +#define PCI_DID_CyP_6SERIES_WIFI 0x2723 +#define PCI_DID_TyP_6SERIES_WIFI 0x2725 +#define PCI_DID_GrP_6SERIES_1_WIFI 0x51f0 +#define PCI_DID_GrP_6SERIES_2_WIFI 0x7af0 + +#define PCI_DID_INTEL_TGL_IPU 0x9a19 +#define PCI_DID_INTEL_TGL_H_IPU 0x9a39 +#define PCI_DID_INTEL_JSL_IPU 0x4e19 +#define PCI_DID_INTEL_ADL_IPU 0x465d +#define PCI_DID_INTEL_ADL_N_IPU 0x462e /* Intel Dynamic Tuning Technology Device */ -#define PCI_DEVICE_ID_INTEL_CML_DTT 0x1903 -#define PCI_DEVICE_ID_INTEL_TGL_DTT 0x9A03 -#define PCI_DEVICE_ID_INTEL_JSL_DTT 0x4E03 -#define PCI_DEVICE_ID_INTEL_ADL_DTT 0x461d +#define PCI_DID_INTEL_CML_DTT 0x1903 +#define PCI_DID_INTEL_TGL_DTT 0x9A03 +#define PCI_DID_INTEL_JSL_DTT 0x4E03 +#define PCI_DID_INTEL_ADL_DTT 0x461d /* Intel CNVi WiFi/BT device IDs */ -#define PCI_DEVICE_ID_INTEL_CML_LP_CNVI_WIFI 0x02f0 -#define PCI_DEVICE_ID_INTEL_CML_H_CNVI_WIFI 0x06f0 -#define PCI_DEVICE_ID_INTEL_CNL_LP_CNVI_WIFI 0x9df0 -#define PCI_DEVICE_ID_INTEL_CNL_H_CNVI_WIFI 0xa370 -#define PCI_DEVICE_ID_INTEL_GLK_CNVI_WIFI 0x31dc -#define PCI_DEVICE_ID_INTEL_ICL_CNVI_WIFI 0x34f0 -#define PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_0 0x4df0 -#define PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_1 0x4df1 -#define PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_2 0x4df2 -#define PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_3 0x4df3 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_0 0xa0f0 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_1 0xa0f1 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_2 0xa0f2 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_3 0xa0f3 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_0 0xa0f5 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_1 0xa0f6 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_2 0xa0f7 -#define PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_3 0xa0f8 -#define PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_0 0x43f0 -#define PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_1 0x43f1 -#define PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_2 0x43f2 -#define PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_3 0x43f3 -#define PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_0 0x43f5 -#define PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_1 0x43f6 -#define PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_2 0x43f7 -#define PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_0 0x54f0 -#define PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_1 0x54f1 -#define PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_2 0x54f2 -#define PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_3 0x54f3 +#define PCI_DID_INTEL_CML_LP_CNVI_WIFI 0x02f0 +#define PCI_DID_INTEL_CML_H_CNVI_WIFI 0x06f0 +#define PCI_DID_INTEL_CNL_LP_CNVI_WIFI 0x9df0 +#define PCI_DID_INTEL_CNL_H_CNVI_WIFI 0xa370 +#define PCI_DID_INTEL_GLK_CNVI_WIFI 0x31dc +#define PCI_DID_INTEL_ICL_CNVI_WIFI 0x34f0 +#define PCI_DID_INTEL_JSL_CNVI_WIFI_0 0x4df0 +#define PCI_DID_INTEL_JSL_CNVI_WIFI_1 0x4df1 +#define PCI_DID_INTEL_JSL_CNVI_WIFI_2 0x4df2 +#define PCI_DID_INTEL_JSL_CNVI_WIFI_3 0x4df3 +#define PCI_DID_INTEL_TGL_CNVI_WIFI_0 0xa0f0 +#define PCI_DID_INTEL_TGL_CNVI_WIFI_1 0xa0f1 +#define PCI_DID_INTEL_TGL_CNVI_WIFI_2 0xa0f2 +#define PCI_DID_INTEL_TGL_CNVI_WIFI_3 0xa0f3 +#define PCI_DID_INTEL_TGL_CNVI_BT_0 0xa0f5 +#define PCI_DID_INTEL_TGL_CNVI_BT_1 0xa0f6 +#define PCI_DID_INTEL_TGL_CNVI_BT_2 0xa0f7 +#define PCI_DID_INTEL_TGL_CNVI_BT_3 0xa0f8 +#define PCI_DID_INTEL_TGL_H_CNVI_WIFI_0 0x43f0 +#define PCI_DID_INTEL_TGL_H_CNVI_WIFI_1 0x43f1 +#define PCI_DID_INTEL_TGL_H_CNVI_WIFI_2 0x43f2 +#define PCI_DID_INTEL_TGL_H_CNVI_WIFI_3 0x43f3 +#define PCI_DID_INTEL_TGL_H_CNVI_BT_0 0x43f5 +#define PCI_DID_INTEL_TGL_H_CNVI_BT_1 0x43f6 +#define PCI_DID_INTEL_TGL_H_CNVI_BT_2 0x43f7 +#define PCI_DID_INTEL_ADL_N_CNVI_WIFI_0 0x54f0 +#define PCI_DID_INTEL_ADL_N_CNVI_WIFI_1 0x54f1 +#define PCI_DID_INTEL_ADL_N_CNVI_WIFI_2 0x54f2 +#define PCI_DID_INTEL_ADL_N_CNVI_WIFI_3 0x54f3 /* Intel Crashlog */ -#define PCI_DEVICE_ID_INTEL_TGL_CPU_CRASHLOG_SRAM 0x9a0d -#define PCI_DEVICE_ID_INTEL_ADL_CPU_CRASHLOG_SRAM 0x467d -#define PCI_DEVICE_ID_INTEL_ADP_S_PMC_CRASHLOG_SRAM 0x7aa7 -#define PCI_DEVICE_ID_INTEL_ADP_P_PMC_CRASHLOG_SRAM 0x51ef -#define PCI_DEVICE_ID_INTEL_ADP_N_PMC_CRASHLOG_SRAM 0x54ef -#define PCI_DEVICE_ID_INTEL_TGP_PMC_CRASHLOG_SRAM 0xa0ef - -#define PCI_VENDOR_ID_COMPUTONE 0x8e0e -#define PCI_DEVICE_ID_COMPUTONE_IP2EX 0x0291 -#define PCI_DEVICE_ID_COMPUTONE_PG 0x0302 +#define PCI_DID_INTEL_TGL_CPU_CRASHLOG_SRAM 0x9a0d +#define PCI_DID_INTEL_ADL_CPU_CRASHLOG_SRAM 0x467d +#define PCI_DID_INTEL_ADP_S_PMC_CRASHLOG_SRAM 0x7aa7 +#define PCI_DID_INTEL_ADP_P_PMC_CRASHLOG_SRAM 0x51ef +#define PCI_DID_INTEL_ADP_N_PMC_CRASHLOG_SRAM 0x54ef +#define PCI_DID_INTEL_TGP_PMC_CRASHLOG_SRAM 0xa0ef + +#define PCI_VID_COMPUTONE 0x8e0e +#define PCI_DID_COMPUTONE_IP2EX 0x0291 +#define PCI_DID_COMPUTONE_PG 0x0302 #define PCI_SUBVENDOR_ID_COMPUTONE 0x8e0e #define PCI_SUBDEVICE_ID_COMPUTONE_PG4 0x0001 #define PCI_SUBDEVICE_ID_COMPUTONE_PG8 0x0002 #define PCI_SUBDEVICE_ID_COMPUTONE_PG6 0x0003 -#define PCI_VENDOR_ID_KTI 0x8e2e -#define PCI_DEVICE_ID_KTI_ET32P2 0x3000 - -#define PCI_VENDOR_ID_ADAPTEC 0x9004 -#define PCI_DEVICE_ID_ADAPTEC_7810 0x1078 -#define PCI_DEVICE_ID_ADAPTEC_7821 0x2178 -#define PCI_DEVICE_ID_ADAPTEC_38602 0x3860 -#define PCI_DEVICE_ID_ADAPTEC_7850 0x5078 -#define PCI_DEVICE_ID_ADAPTEC_7855 0x5578 -#define PCI_DEVICE_ID_ADAPTEC_5800 0x5800 -#define PCI_DEVICE_ID_ADAPTEC_3860 0x6038 -#define PCI_DEVICE_ID_ADAPTEC_1480A 0x6075 -#define PCI_DEVICE_ID_ADAPTEC_7860 0x6078 -#define PCI_DEVICE_ID_ADAPTEC_7861 0x6178 -#define PCI_DEVICE_ID_ADAPTEC_7870 0x7078 -#define PCI_DEVICE_ID_ADAPTEC_7871 0x7178 -#define PCI_DEVICE_ID_ADAPTEC_7872 0x7278 -#define PCI_DEVICE_ID_ADAPTEC_7873 0x7378 -#define PCI_DEVICE_ID_ADAPTEC_7874 0x7478 -#define PCI_DEVICE_ID_ADAPTEC_7895 0x7895 -#define PCI_DEVICE_ID_ADAPTEC_7880 0x8078 -#define PCI_DEVICE_ID_ADAPTEC_7881 0x8178 -#define PCI_DEVICE_ID_ADAPTEC_7882 0x8278 -#define PCI_DEVICE_ID_ADAPTEC_7883 0x8378 -#define PCI_DEVICE_ID_ADAPTEC_7884 0x8478 -#define PCI_DEVICE_ID_ADAPTEC_7885 0x8578 -#define PCI_DEVICE_ID_ADAPTEC_7886 0x8678 -#define PCI_DEVICE_ID_ADAPTEC_7887 0x8778 -#define PCI_DEVICE_ID_ADAPTEC_7888 0x8878 -#define PCI_DEVICE_ID_ADAPTEC_1030 0x8b78 -#define PCI_VENDOR_ID_ADAPTEC2 0x9005 -#define PCI_DEVICE_ID_ADAPTEC2_2940U2 0x0010 -#define PCI_DEVICE_ID_ADAPTEC2_2930U2 0x0011 -#define PCI_DEVICE_ID_ADAPTEC2_7890B 0x0013 -#define PCI_DEVICE_ID_ADAPTEC2_7890 0x001f -#define PCI_DEVICE_ID_ADAPTEC2_3940U2 0x0050 -#define PCI_DEVICE_ID_ADAPTEC2_3950U2D 0x0051 -#define PCI_DEVICE_ID_ADAPTEC2_7896 0x005f -#define PCI_DEVICE_ID_ADAPTEC2_7892A 0x0080 -#define PCI_DEVICE_ID_ADAPTEC2_7892B 0x0081 -#define PCI_DEVICE_ID_ADAPTEC2_7892D 0x0083 -#define PCI_DEVICE_ID_ADAPTEC2_7892P 0x008f -#define PCI_DEVICE_ID_ADAPTEC2_7899A 0x00c0 -#define PCI_DEVICE_ID_ADAPTEC2_7899B 0x00c1 -#define PCI_DEVICE_ID_ADAPTEC2_7899D 0x00c3 -#define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf -#define PCI_DEVICE_ID_ADAPTEC2_7902 0x8012 - -#define PCI_VENDOR_ID_ATRONICS 0x907f -#define PCI_DEVICE_ID_ATRONICS_2015 0x2015 - -#define PCI_VENDOR_ID_HOLTEK 0x9412 -#define PCI_DEVICE_ID_HOLTEK_6565 0x6565 - -#define PCI_VENDOR_ID_NETMOS 0x9710 -#define PCI_DEVICE_ID_NETMOS_9735 0x9735 -#define PCI_DEVICE_ID_NETMOS_9835 0x9835 +#define PCI_VID_KTI 0x8e2e +#define PCI_DID_KTI_ET32P2 0x3000 + +#define PCI_VID_ADAPTEC 0x9004 +#define PCI_DID_ADAPTEC_7810 0x1078 +#define PCI_DID_ADAPTEC_7821 0x2178 +#define PCI_DID_ADAPTEC_38602 0x3860 +#define PCI_DID_ADAPTEC_7850 0x5078 +#define PCI_DID_ADAPTEC_7855 0x5578 +#define PCI_DID_ADAPTEC_5800 0x5800 +#define PCI_DID_ADAPTEC_3860 0x6038 +#define PCI_DID_ADAPTEC_1480A 0x6075 +#define PCI_DID_ADAPTEC_7860 0x6078 +#define PCI_DID_ADAPTEC_7861 0x6178 +#define PCI_DID_ADAPTEC_7870 0x7078 +#define PCI_DID_ADAPTEC_7871 0x7178 +#define PCI_DID_ADAPTEC_7872 0x7278 +#define PCI_DID_ADAPTEC_7873 0x7378 +#define PCI_DID_ADAPTEC_7874 0x7478 +#define PCI_DID_ADAPTEC_7895 0x7895 +#define PCI_DID_ADAPTEC_7880 0x8078 +#define PCI_DID_ADAPTEC_7881 0x8178 +#define PCI_DID_ADAPTEC_7882 0x8278 +#define PCI_DID_ADAPTEC_7883 0x8378 +#define PCI_DID_ADAPTEC_7884 0x8478 +#define PCI_DID_ADAPTEC_7885 0x8578 +#define PCI_DID_ADAPTEC_7886 0x8678 +#define PCI_DID_ADAPTEC_7887 0x8778 +#define PCI_DID_ADAPTEC_7888 0x8878 +#define PCI_DID_ADAPTEC_1030 0x8b78 +#define PCI_VID_ADAPTEC2 0x9005 +#define PCI_DID_ADAPTEC2_2940U2 0x0010 +#define PCI_DID_ADAPTEC2_2930U2 0x0011 +#define PCI_DID_ADAPTEC2_7890B 0x0013 +#define PCI_DID_ADAPTEC2_7890 0x001f +#define PCI_DID_ADAPTEC2_3940U2 0x0050 +#define PCI_DID_ADAPTEC2_3950U2D 0x0051 +#define PCI_DID_ADAPTEC2_7896 0x005f +#define PCI_DID_ADAPTEC2_7892A 0x0080 +#define PCI_DID_ADAPTEC2_7892B 0x0081 +#define PCI_DID_ADAPTEC2_7892D 0x0083 +#define PCI_DID_ADAPTEC2_7892P 0x008f +#define PCI_DID_ADAPTEC2_7899A 0x00c0 +#define PCI_DID_ADAPTEC2_7899B 0x00c1 +#define PCI_DID_ADAPTEC2_7899D 0x00c3 +#define PCI_DID_ADAPTEC2_7899P 0x00cf +#define PCI_DID_ADAPTEC2_7902 0x8012 + +#define PCI_VID_ATRONICS 0x907f +#define PCI_DID_ATRONICS_2015 0x2015 + +#define PCI_VID_HOLTEK 0x9412 +#define PCI_DID_HOLTEK_6565 0x6565 + +#define PCI_VID_NETMOS 0x9710 +#define PCI_DID_NETMOS_9735 0x9735 +#define PCI_DID_NETMOS_9835 0x9835 #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 -#define PCI_VENDOR_ID_TIGERJET 0xe159 -#define PCI_DEVICE_ID_TIGERJET_300 0x0001 -#define PCI_DEVICE_ID_TIGERJET_100 0x0002 +#define PCI_VID_TIGERJET 0xe159 +#define PCI_DID_TIGERJET_300 0x0001 +#define PCI_DID_TIGERJET_100 0x0002 -#define PCI_VENDOR_ID_ARK 0xedd8 -#define PCI_DEVICE_ID_ARK_STING 0xa091 -#define PCI_DEVICE_ID_ARK_STINGARK 0xa099 -#define PCI_DEVICE_ID_ARK_2000MT 0xa0a1 +#define PCI_VID_ARK 0xedd8 +#define PCI_DID_ARK_STING 0xa091 +#define PCI_DID_ARK_STINGARK 0xa099 +#define PCI_DID_ARK_2000MT 0xa0a1 -#define PCI_VENDOR_ID_MICROGATE 0x13c0 -#define PCI_DEVICE_ID_MICROGATE_USC 0x0010 -#define PCI_DEVICE_ID_MICROGATE_SCC 0x0020 -#define PCI_DEVICE_ID_MICROGATE_SCA 0x0030 +#define PCI_VID_MICROGATE 0x13c0 +#define PCI_DID_MICROGATE_USC 0x0010 +#define PCI_DID_MICROGATE_SCC 0x0020 +#define PCI_DID_MICROGATE_SCA 0x0030 -#define PCI_VENDOR_ID_SIS 0x1039 -#define PCI_DEVICE_ID_SIS_AGP 0x0002 +#define PCI_VID_SIS 0x1039 +#define PCI_DID_SIS_AGP 0x0002 /* SiS 761GX NORTH BRIDGE */ -#define PCI_DEVICE_ID_SIS_SIS761 0x0761 -#define PCI_DEVICE_ID_SIS_SIS761_PCIE 0x0004 +#define PCI_DID_SIS_SIS761 0x0761 +#define PCI_DID_SIS_SIS761_PCIE 0x0004 /* SiS 964(L) SOUTH BRIDGE */ -#define PCI_DEVICE_ID_SIS_SIS964_LPC 0x0964 /* D2F0 */ -#define PCI_DEVICE_ID_SIS_SIS964_IDE 0x5513 /* D2F5 */ -#define PCI_DEVICE_ID_SIS_SIS964_AC97_MODEM 0x7013 /* D2F6 */ -#define PCI_DEVICE_ID_SIS_SIS964_AC97_AUDIO 0x7012 /* D2F7 */ -#define PCI_DEVICE_ID_SIS_SIS964_USB 0x7001 /* D3F0,D3F1 */ -#define PCI_DEVICE_ID_SIS_SIS964_USB2 0x7002 /* D3F3 */ -#define PCI_DEVICE_ID_SIS_SIS964_NIC 0x0900 /* D4F0 */ -#define PCI_DEVICE_ID_SIS_SIS964_SATA 0x0181 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS964_SATA_RAID 0x0180 /* D5F0 */ +#define PCI_DID_SIS_SIS964_LPC 0x0964 /* D2F0 */ +#define PCI_DID_SIS_SIS964_IDE 0x5513 /* D2F5 */ +#define PCI_DID_SIS_SIS964_AC97_MODEM 0x7013 /* D2F6 */ +#define PCI_DID_SIS_SIS964_AC97_AUDIO 0x7012 /* D2F7 */ +#define PCI_DID_SIS_SIS964_USB 0x7001 /* D3F0,D3F1 */ +#define PCI_DID_SIS_SIS964_USB2 0x7002 /* D3F3 */ +#define PCI_DID_SIS_SIS964_NIC 0x0900 /* D4F0 */ +#define PCI_DID_SIS_SIS964_SATA 0x0181 /* D5F0 */ +#define PCI_DID_SIS_SIS964_SATA_RAID 0x0180 /* D5F0 */ /* SiS 965(L) SOUTH BRIDGE */ -#define PCI_DEVICE_ID_SIS_SIS965_LPC 0x0965 /* D2F0 */ -#define PCI_DEVICE_ID_SIS_SIS965_IDE 0x5513 /* D2F5 */ -#define PCI_DEVICE_ID_SIS_SIS965_AC97_MODEM 0x7013 /* D2F6 */ -#define PCI_DEVICE_ID_SIS_SIS965_AC97_AUDIO 0x7012 /* D2F7 */ -#define PCI_DEVICE_ID_SIS_SIS965_USB 0x7001 /* D3F0,D3F1 */ -#define PCI_DEVICE_ID_SIS_SIS965_USB2 0x7002 /* D3F3 */ -#define PCI_DEVICE_ID_SIS_SIS965L_NIC 0x0190 /* D4F0 */ -#define PCI_DEVICE_ID_SIS_SIS965_NIC 0x0191 /* D4F0 */ -#define PCI_DEVICE_ID_SIS_SIS965_SATA 0x0183 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS965_SATA_RAID 0x0182 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS965_PCIE 0x000a /* D6F0,D7F0 */ +#define PCI_DID_SIS_SIS965_LPC 0x0965 /* D2F0 */ +#define PCI_DID_SIS_SIS965_IDE 0x5513 /* D2F5 */ +#define PCI_DID_SIS_SIS965_AC97_MODEM 0x7013 /* D2F6 */ +#define PCI_DID_SIS_SIS965_AC97_AUDIO 0x7012 /* D2F7 */ +#define PCI_DID_SIS_SIS965_USB 0x7001 /* D3F0,D3F1 */ +#define PCI_DID_SIS_SIS965_USB2 0x7002 /* D3F3 */ +#define PCI_DID_SIS_SIS965L_NIC 0x0190 /* D4F0 */ +#define PCI_DID_SIS_SIS965_NIC 0x0191 /* D4F0 */ +#define PCI_DID_SIS_SIS965_SATA 0x0183 /* D5F0 */ +#define PCI_DID_SIS_SIS965_SATA_RAID 0x0182 /* D5F0 */ +#define PCI_DID_SIS_SIS965_PCIE 0x000a /* D6F0,D7F0 */ /* SiS 966(L) SOUTH BRIDGE */ -#define PCI_DEVICE_ID_SIS_SIS966_LPC 0x0966 /* D2F0 */ -#define PCI_DEVICE_ID_SIS_SIS966_IDE 0x5513 /* D2F5 */ -#define PCI_DEVICE_ID_SIS_SIS966_AC97_MODEM 0x7013 /* D2F6 */ -#define PCI_DEVICE_ID_SIS_SIS966_AC97_AUDIO 0x7012 /* D2F7 */ -#define PCI_DEVICE_ID_SIS_SIS966_USB 0x7001 /* D3F0,D3F1 */ -#define PCI_DEVICE_ID_SIS_SIS966_USB2 0x7002 /* D3F3 */ -#define PCI_DEVICE_ID_SIS_SIS966L_NIC 0x0190 /* D4F0 */ -#define PCI_DEVICE_ID_SIS_SIS966_NIC 0x0191 /* D4F0 */ -#define PCI_DEVICE_ID_SIS_SIS966_SATA 0x1183 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS966_SATA_RAID 0x1182 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS966_PCIE 0x000a /* D6F0,D7F0 */ -#define PCI_DEVICE_ID_SIS_SIS966_HD_AUDIO 0x7502 /* DfF0 */ +#define PCI_DID_SIS_SIS966_LPC 0x0966 /* D2F0 */ +#define PCI_DID_SIS_SIS966_IDE 0x5513 /* D2F5 */ +#define PCI_DID_SIS_SIS966_AC97_MODEM 0x7013 /* D2F6 */ +#define PCI_DID_SIS_SIS966_AC97_AUDIO 0x7012 /* D2F7 */ +#define PCI_DID_SIS_SIS966_USB 0x7001 /* D3F0,D3F1 */ +#define PCI_DID_SIS_SIS966_USB2 0x7002 /* D3F3 */ +#define PCI_DID_SIS_SIS966L_NIC 0x0190 /* D4F0 */ +#define PCI_DID_SIS_SIS966_NIC 0x0191 /* D4F0 */ +#define PCI_DID_SIS_SIS966_SATA 0x1183 /* D5F0 */ +#define PCI_DID_SIS_SIS966_SATA_RAID 0x1182 /* D5F0 */ +#define PCI_DID_SIS_SIS966_PCIE 0x000a /* D6F0,D7F0 */ +#define PCI_DID_SIS_SIS966_HD_AUDIO 0x7502 /* DfF0 */ /* SiS 968 SOUTH BRIDGE */ -#define PCI_DEVICE_ID_SIS_SIS968_LPC 0x0968 /* D2F0 */ -#define PCI_DEVICE_ID_SIS_SIS968_IDE 0x5513 /* D2F5 */ -#define PCI_DEVICE_ID_SIS_SIS968_USB 0x7001 /* D3F0,D3F1 */ -#define PCI_DEVICE_ID_SIS_SIS968_USB2 0x7002 /* D3F3 */ -#define PCI_DEVICE_ID_SIS_SIS968_NIC 0x0191 /* D4F0 */ -#define PCI_DEVICE_ID_SIS_SIS968_SATA 0x1183 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS968_SATA_RAID 0x1184 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS968_SATA_AHCI 0x1185 /* D5F0 */ -#define PCI_DEVICE_ID_SIS_SIS968_PCIE 0x000a /* D6F0,D7F0 */ -#define PCI_DEVICE_ID_SIS_SIS968_HD_AUDIO 0x7502 /* DfF0 */ +#define PCI_DID_SIS_SIS968_LPC 0x0968 /* D2F0 */ +#define PCI_DID_SIS_SIS968_IDE 0x5513 /* D2F5 */ +#define PCI_DID_SIS_SIS968_USB 0x7001 /* D3F0,D3F1 */ +#define PCI_DID_SIS_SIS968_USB2 0x7002 /* D3F3 */ +#define PCI_DID_SIS_SIS968_NIC 0x0191 /* D4F0 */ +#define PCI_DID_SIS_SIS968_SATA 0x1183 /* D5F0 */ +#define PCI_DID_SIS_SIS968_SATA_RAID 0x1184 /* D5F0 */ +#define PCI_DID_SIS_SIS968_SATA_AHCI 0x1185 /* D5F0 */ +#define PCI_DID_SIS_SIS968_PCIE 0x000a /* D6F0,D7F0 */ +#define PCI_DID_SIS_SIS968_HD_AUDIO 0x7502 /* DfF0 */ /* OLD USAGE FOR COREBOOT */ -#define PCI_VENDOR_ID_ACER 0x10b9 -#define PCI_DEVICE_ID_ACER_M1535D 0x1533 +#define PCI_VID_ACER 0x10b9 +#define PCI_DID_ACER_M1535D 0x1533 -#define PCI_DEVICE_ID_AMD_761_0 0x700E -#define PCI_DEVICE_ID_AMD_761_1 0x700F -#define PCI_DEVICE_ID_AMD_VIPER_7412 0x7412 +#define PCI_DID_AMD_761_0 0x700E +#define PCI_DID_AMD_761_1 0x700F +#define PCI_DID_AMD_VIPER_7412 0x7412 /* END OLDER USAGE */ diff --git a/src/mainboard/google/brya/variants/brask/ramstage.c b/src/mainboard/google/brya/variants/brask/ramstage.c index c2a5ec3818..ee96c18d45 100644 --- a/src/mainboard/google/brya/variants/brask/ramstage.c +++ b/src/mainboard/google/brya/variants/brask/ramstage.c @@ -10,28 +10,28 @@ const struct cpu_power_limits limits[] = { /* SKU_ID, TDP (Watts), pl1_min, pl1_max, pl2_min, pl2_max, pl4 */ - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, 15, 15000, 15000, 55000, 55000, 123000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, 15000, 15000, 55000, 55000, 123000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, 15000, 15000, 55000, 55000, 123000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, 28000, 28000, 64000, 64000, 90000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, 28000, 28000, 64000, 64000, 140000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 45, 45000, 45000, 95000, 95000, 125000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, 45, 45000, 45000, 115000, 115000, 215000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, 45000, 45000, 115000, 115000, 215000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, 45, 45000, 45000, 95000, 95000, 125000 }, + { PCI_DID_INTEL_ADL_P_ID_10, 15, 15000, 15000, 55000, 55000, 123000 }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, 15000, 15000, 55000, 55000, 123000 }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, 15000, 15000, 55000, 55000, 123000 }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, 28000, 28000, 64000, 64000, 90000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, 28000, 28000, 64000, 64000, 140000 }, + { PCI_DID_INTEL_ADL_P_ID_5, 45, 45000, 45000, 95000, 95000, 125000 }, + { PCI_DID_INTEL_ADL_P_ID_4, 45, 45000, 45000, 115000, 115000, 215000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, 45000, 45000, 115000, 115000, 215000 }, + { PCI_DID_INTEL_ADL_P_ID_1, 45, 45000, 45000, 95000, 95000, 125000 }, }; const struct system_power_limits sys_limits[] = { /* SKU_ID, TDP (Watts), psys_pl2 (Watts) */ - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, 15, 135 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, 135 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, 135 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, 230 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, 230 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 45, 230 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, 45, 230 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, 230 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, 45, 230 }, + { PCI_DID_INTEL_ADL_P_ID_10, 15, 135 }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, 135 }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, 135 }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, 230 }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, 230 }, + { PCI_DID_INTEL_ADL_P_ID_5, 45, 230 }, + { PCI_DID_INTEL_ADL_P_ID_4, 45, 230 }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, 230 }, + { PCI_DID_INTEL_ADL_P_ID_1, 45, 230 }, }; /* diff --git a/src/mainboard/google/brya/variants/brya0/ramstage.c b/src/mainboard/google/brya/variants/brya0/ramstage.c index 06040e485f..970c628f50 100644 --- a/src/mainboard/google/brya/variants/brya0/ramstage.c +++ b/src/mainboard/google/brya/variants/brya0/ramstage.c @@ -6,11 +6,11 @@ const struct cpu_power_limits limits[] = { /* SKU_ID, TDP (Watts), pl1_min, pl1_max, pl2_min, pl2_max, pl4 */ /* All values are for baseline config as per bug:191906315 comment #10 */ - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, 3000, 15000, 39000, 39000, 100000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, 3000, 15000, 39000, 39000, 100000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, 4000, 28000, 43000, 43000, 105000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, 4000, 28000, 43000, 43000, 105000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, 5000, 45000, 80000, 80000, 159000 }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, 3000, 15000, 39000, 39000, 100000 }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, 3000, 15000, 39000, 39000, 100000 }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, 4000, 28000, 43000, 43000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, 4000, 28000, 43000, 43000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, 5000, 45000, 80000, 80000, 159000 }, }; void variant_devtree_update(void) diff --git a/src/mainboard/google/brya/variants/brya4es/ramstage.c b/src/mainboard/google/brya/variants/brya4es/ramstage.c index 06040e485f..970c628f50 100644 --- a/src/mainboard/google/brya/variants/brya4es/ramstage.c +++ b/src/mainboard/google/brya/variants/brya4es/ramstage.c @@ -6,11 +6,11 @@ const struct cpu_power_limits limits[] = { /* SKU_ID, TDP (Watts), pl1_min, pl1_max, pl2_min, pl2_max, pl4 */ /* All values are for baseline config as per bug:191906315 comment #10 */ - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, 3000, 15000, 39000, 39000, 100000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, 3000, 15000, 39000, 39000, 100000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, 4000, 28000, 43000, 43000, 105000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, 4000, 28000, 43000, 43000, 105000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, 5000, 45000, 80000, 80000, 159000 }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, 3000, 15000, 39000, 39000, 100000 }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, 3000, 15000, 39000, 39000, 100000 }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, 4000, 28000, 43000, 43000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, 4000, 28000, 43000, 43000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, 5000, 45000, 80000, 80000, 159000 }, }; void variant_devtree_update(void) diff --git a/src/mainboard/google/brya/variants/kano/ramstage.c b/src/mainboard/google/brya/variants/kano/ramstage.c index 9b26cbb0f2..9bba1df9e9 100644 --- a/src/mainboard/google/brya/variants/kano/ramstage.c +++ b/src/mainboard/google/brya/variants/kano/ramstage.c @@ -5,10 +5,10 @@ const struct cpu_power_limits limits[] = { /* SKU_ID, TDP (Watts), pl1_min, pl1_max, pl2_min, pl2_max, pl4 */ - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, 12000, 15000, 40000, 40000, 105000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, 12000, 15000, 40000, 40000, 105000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, 18000, 28000, 40000, 40000, 105000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, 18000, 28000, 40000, 40000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, 12000, 15000, 40000, 40000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, 12000, 15000, 40000, 40000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, 18000, 28000, 40000, 40000, 105000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, 18000, 28000, 40000, 40000, 105000 }, }; void variant_devtree_update(void) diff --git a/src/mainboard/google/hatch/variants/baseboard/mainboard.c b/src/mainboard/google/hatch/variants/baseboard/mainboard.c index c6c87dc647..c78ad5b154 100644 --- a/src/mainboard/google/hatch/variants/baseboard/mainboard.c +++ b/src/mainboard/google/hatch/variants/baseboard/mainboard.c @@ -113,8 +113,8 @@ static void mainboard_set_power_limits(struct soc_power_limits_config *conf) psyspl2 = SET_PSYSPL2(watts); /* Limit PL2 if the adapter is with lower capability */ - if (mch_id == PCI_DEVICE_ID_INTEL_CML_ULT || - mch_id == PCI_DEVICE_ID_INTEL_CML_ULT_6_2) + if (mch_id == PCI_DID_INTEL_CML_ULT || + mch_id == PCI_DID_INTEL_CML_ULT_6_2) pl2 = (psyspl2 > PUFF_U62_U42_PL2) ? PUFF_U62_U42_PL2 : psyspl2; else pl2 = (psyspl2 > PUFF_U22_PL2) ? PUFF_U22_PL2 : psyspl2; @@ -134,11 +134,11 @@ static void mainboard_set_power_limits(struct soc_power_limits_config *conf) */ volts_mv = BJ_VOLTS_MV; /* Use IGD ID to check if CPU is Core SKUs */ - if (igd_id != PCI_DEVICE_ID_INTEL_CML_GT1_ULT_1 && - igd_id != PCI_DEVICE_ID_INTEL_CML_GT2_ULT_5) { + if (igd_id != PCI_DID_INTEL_CML_GT1_ULT_1 && + igd_id != PCI_DID_INTEL_CML_GT2_ULT_5) { psyspl2 = PUFF_CORE_CPU_PSYSPL2; - if (mch_id == PCI_DEVICE_ID_INTEL_CML_ULT || - mch_id == PCI_DEVICE_ID_INTEL_CML_ULT_6_2) + if (mch_id == PCI_DID_INTEL_CML_ULT || + mch_id == PCI_DID_INTEL_CML_ULT_6_2) pl2 = PUFF_U62_U42_PL2; } } diff --git a/src/mainboard/google/poppy/variants/atlas/mainboard.c b/src/mainboard/google/poppy/variants/atlas/mainboard.c index ea7ee8fdc4..b439e30873 100644 --- a/src/mainboard/google/poppy/variants/atlas/mainboard.c +++ b/src/mainboard/google/poppy/variants/atlas/mainboard.c @@ -17,7 +17,7 @@ static uint32_t get_pl2(void) id = pci_read_config16(igd_dev, PCI_DEVICE_ID); /* Assume we only have KLB-Y and AML-Y SKUs */ - if (id == PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM) + if (id == PCI_DID_INTEL_KBL_GT2_SULXM) return PL2_KBL; return PL2_AML; diff --git a/src/mainboard/google/poppy/variants/nocturne/mainboard.c b/src/mainboard/google/poppy/variants/nocturne/mainboard.c index 1482b3458f..eff5cf5e17 100644 --- a/src/mainboard/google/poppy/variants/nocturne/mainboard.c +++ b/src/mainboard/google/poppy/variants/nocturne/mainboard.c @@ -18,7 +18,7 @@ static uint32_t get_pl2(void) id = pci_read_config16(igd_dev, PCI_DEVICE_ID); /* Assume we only have KLB-Y and AML-Y SKUs */ - if (id == PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM) + if (id == PCI_DID_INTEL_KBL_GT2_SULXM) return PL2_KBL; return PL2_AML; diff --git a/src/mainboard/intel/adlrvp/ramstage.c b/src/mainboard/intel/adlrvp/ramstage.c index 22902bd48b..d0f1fb48ea 100644 --- a/src/mainboard/intel/adlrvp/ramstage.c +++ b/src/mainboard/intel/adlrvp/ramstage.c @@ -16,11 +16,11 @@ const struct cpu_power_limits limits[] = { /* SKU_ID, TDP (Watts), pl1_min, pl1_max, pl2_min, pl2_max, PL4 */ /* PL2 values are for performance configuration */ - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, 3000, 15000, 55000, 55000, 123000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, 3000, 15000, 55000, 55000, 123000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, 4000, 28000, 64000, 64000, 140000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, 4000, 28000, 64000, 64000, 140000 }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, 5000, 45000, 115000, 115000, 215000 }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, 3000, 15000, 55000, 55000, 123000 }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, 3000, 15000, 55000, 55000, 123000 }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, 4000, 28000, 64000, 64000, 140000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, 4000, 28000, 64000, 64000, 140000 }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, 5000, 45000, 115000, 115000, 215000 }, }; WEAK_DEV_PTR(dptf_policy); diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index a9946b25d1..2eb0c389f4 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -48,7 +48,7 @@ static void mainboard_init(struct device *dev) } /* Set SDHCI write protect polarity "SDWPPol" */ - sdhci_dev = dev_find_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C822, 0); + sdhci_dev = dev_find_device(PCI_VID_RICOH, PCI_DID_RICOH_R5C822, 0); if (sdhci_dev) { if (pci_read_config8(sdhci_dev, 0xfa) != 0x20) { /* unlock */ diff --git a/src/mainboard/prodrive/hermes/devicetree.cb b/src/mainboard/prodrive/hermes/devicetree.cb index db573821cf..70ff564b1e 100644 --- a/src/mainboard/prodrive/hermes/devicetree.cb +++ b/src/mainboard/prodrive/hermes/devicetree.cb @@ -174,7 +174,7 @@ chip soc/intel/cannonlake device pci 19.0 hidden end chip soc/intel/common/block/uart device pci 19.2 hidden - register "devid" = "PCI_DEVICE_ID_INTEL_CNP_H_UART2" + register "devid" = "PCI_DID_INTEL_CNP_H_UART2" end # UART #2, in ACPI mode end device pci 1b.4 on # PCIe root port 21 (Slot 1) diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c index 24e61dcf95..269cdd0713 100644 --- a/src/mainboard/siemens/mc_apl1/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/mainboard.c @@ -217,7 +217,7 @@ static void mainboard_final(void *chip_info) /* Set Master Enable for on-board PCI device if allowed. */ if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) { - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403f, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) { pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); } diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/mainboard.c index 769c9f022a..c9d4b29563 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/mainboard.c @@ -24,7 +24,7 @@ void variant_mainboard_final(void) pcr_write16(PID_ITSS, 0x314c, 0x0321); /* Disable clock outputs 1-5 (CLKOUT) for XIO2001 PCIe to PCI Bridge. */ - dev = dev_find_device(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XIO2001, 0); + dev = dev_find_device(PCI_VID_TI, PCI_DID_TI_XIO2001, 0); if (dev) pci_write_config8(dev, 0xd8, 0x3e); diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c index 3951e336ee..430e67e171 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/mainboard.c @@ -12,7 +12,7 @@ void variant_mainboard_final(void) if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) { /* Set Master Enable for on-board PCI device if allowed. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403e, 0); if (dev) { pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); } diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c index 0b05bf912f..bf87109add 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/mainboard.c @@ -37,7 +37,7 @@ void variant_mainboard_final(void) pcr_or32(PID_LPC, PCR_LPC_PRC, (PCR_LPC_CCE_EN | PCR_LPC_PCE_EN)); /* Set Master Enable for on-board PCI device if allowed. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403e, 0); if (dev) { if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); @@ -46,17 +46,17 @@ void variant_mainboard_final(void) * XIO2001 PCIe to PCI Bridge. */ struct device *parent = dev->bus->dev; - if (parent && parent->device == PCI_DEVICE_ID_TI_XIO2001) + if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x1d); } /* Disable clock outputs 2-5 (CLKOUT) for another XIO2001 PCIe to PCI * Bridge on this mainboard. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403f, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) { struct device *parent = dev->bus->dev; - if (parent && parent->device == PCI_DEVICE_ID_TI_XIO2001) + if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x3c); } diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c index f9cca156af..82b8c5bf0f 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/mainboard.c @@ -44,7 +44,7 @@ void variant_mainboard_final(void) pcr_rmw32(PID_MODPHY, TX_DWORD3, (0x00 << 16), (0x4a << 16)); /* Set Master Enable for on-board PCI device if allowed. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403e, 0); if (dev) { if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); @@ -52,17 +52,17 @@ void variant_mainboard_final(void) /* Disable clock outputs 0-3 (CLKOUT) for upstream XIO2001 PCIe * to PCI Bridge. */ struct device *parent = dev->bus->dev; - if (parent && parent->device == PCI_DEVICE_ID_TI_XIO2001) + if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x0f); } /* Disable clock outputs 1-5 (CLKOUT) for another XIO2001 PCIe to PCI * Bridge on this mainboard. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403f, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) { struct device *parent = dev->bus->dev; - if (parent && parent->device == PCI_DEVICE_ID_TI_XIO2001) + if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x3e); } } diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c index a9c1d1ba2e..e730e202c7 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/mainboard.c @@ -37,7 +37,7 @@ void variant_mainboard_final(void) pcr_or32(PID_LPC, PCR_LPC_PRC, (PCR_LPC_CCE_EN | PCR_LPC_PCE_EN)); /* Set Master Enable for on-board PCI device if allowed. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403e, 0); if (dev) { if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); @@ -46,17 +46,17 @@ void variant_mainboard_final(void) * XIO2001 PCIe to PCI Bridge. */ struct device *parent = dev->bus->dev; - if (parent && parent->device == PCI_DEVICE_ID_TI_XIO2001) + if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x0F); } /* Disable clock outputs 2-5 (CLKOUT) for another XIO2001 PCIe to PCI * Bridge on this mainboard. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403f, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) { struct device *parent = dev->bus->dev; - if (parent && parent->device == PCI_DEVICE_ID_TI_XIO2001) + if (parent && parent->device == PCI_DID_TI_XIO2001) pci_write_config8(parent, 0xd8, 0x3c); } diff --git a/src/mainboard/siemens/mc_ehl/mainboard.c b/src/mainboard/siemens/mc_ehl/mainboard.c index 5c8f5849df..94362446fd 100644 --- a/src/mainboard/siemens/mc_ehl/mainboard.c +++ b/src/mainboard/siemens/mc_ehl/mainboard.c @@ -150,11 +150,11 @@ static void mainboard_final(void *chip_info) if (CONFIG(PCI_ALLOW_BUS_MASTER_ANY_DEVICE)) { /* Set Master Enable for on-board PCI devices if allowed. */ - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403e, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403e, 0); if (dev) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); - dev = dev_find_device(PCI_VENDOR_ID_SIEMENS, 0x403f, 0); + dev = dev_find_device(PCI_VID_SIEMENS, 0x403f, 0); if (dev) pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); } diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index 2d9597eba6..5a8b24d0bb 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -791,7 +791,7 @@ static struct device_operations northbridge_operations = { static const struct pci_driver northbridge_driver __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .device = 0x1510, }; diff --git a/src/northbridge/amd/agesa/family15tn/iommu.c b/src/northbridge/amd/agesa/family15tn/iommu.c index 587e737846..b504e173fc 100644 --- a/src/northbridge/amd/agesa/family15tn/iommu.c +++ b/src/northbridge/amd/agesa/family15tn/iommu.c @@ -45,6 +45,6 @@ static struct device_operations iommu_ops = { static const struct pci_driver iommu_driver __pci_driver = { .ops = &iommu_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_IOMMU, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_15H_MODEL_101F_NB_IOMMU, }; diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index bd0a5c8e86..6994781407 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -562,14 +562,14 @@ static struct device_operations northbridge_operations = { static const struct pci_driver family15_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_HT, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_15H_MODEL_101F_NB_HT, }; static const struct pci_driver family10_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_10H_NB_HT, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_10H_NB_HT, }; struct chip_operations northbridge_amd_agesa_family15tn_ops = { diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index 3d5313a333..865f5cfcc3 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -556,14 +556,14 @@ static struct device_operations northbridge_operations = { static const struct pci_driver family16_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_16H_MODEL_000F_NB_HT, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_16H_MODEL_000F_NB_HT, }; static const struct pci_driver family10_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_10H_NB_HT, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_10H_NB_HT, }; static void fam16_finalize(void *chip_info) diff --git a/src/northbridge/amd/pi/00730F01/iommu.c b/src/northbridge/amd/pi/00730F01/iommu.c index 2de53d061c..3c31db49f0 100644 --- a/src/northbridge/amd/pi/00730F01/iommu.c +++ b/src/northbridge/amd/pi/00730F01/iommu.c @@ -30,6 +30,6 @@ static struct device_operations iommu_ops = { static const struct pci_driver iommu_driver __pci_driver = { .ops = &iommu_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_IOMMU, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_16H_MODEL_303F_NB_IOMMU, }; diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index c6614404a9..69dcc62e1a 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -669,14 +669,14 @@ static struct device_operations northbridge_operations = { static const struct pci_driver family16_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_HT, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_16H_MODEL_303F_NB_HT, }; static const struct pci_driver family10_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_10H_NB_HT, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_10H_NB_HT, }; static void fam16_finalize(void *chip_info) diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c index 77bbe3f553..d5e9c48dc6 100644 --- a/src/northbridge/intel/gm45/gma.c +++ b/src/northbridge/intel/gm45/gma.c @@ -217,6 +217,6 @@ static const unsigned short pci_device_ids[] = static const struct pci_driver gma __pci_driver = { .ops = &gma_func0_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index 212b395a78..e1b8b73097 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -492,6 +492,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_lpc __pci_driver = { .ops = &gma_func0_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c index 558f41fd43..6abc6c1c85 100644 --- a/src/northbridge/intel/haswell/minihd.c +++ b/src/northbridge/intel/haswell/minihd.c @@ -97,6 +97,6 @@ static const unsigned short pci_device_ids[] = { 0x0a0c, 0x0c0c, 0x0d0c, 0 }; static const struct pci_driver haswell_minihd __pci_driver = { .ops = &minihd_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c index fd5ffd9579..5e57f9d618 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -557,7 +557,7 @@ static const unsigned short mc_pci_device_ids[] = { static const struct pci_driver mc_driver_hsw __pci_driver = { .ops = &mc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = mc_pci_device_ids, }; diff --git a/src/northbridge/intel/haswell/pcie.c b/src/northbridge/intel/haswell/pcie.c index 95c0240ed3..e8d146b9df 100644 --- a/src/northbridge/intel/haswell/pcie.c +++ b/src/northbridge/intel/haswell/pcie.c @@ -170,6 +170,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c index 2659288070..51621b5014 100644 --- a/src/northbridge/intel/i440bx/northbridge.c +++ b/src/northbridge/intel/i440bx/northbridge.c @@ -23,7 +23,7 @@ static struct device_operations northbridge_operations = { static const struct pci_driver northbridge_driver __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x7190, }; diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index d094a6789f..7f5aa094a1 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -767,12 +767,12 @@ static const unsigned short i945_gma_func1_ids[] = { static const struct pci_driver i945_gma_func0_driver __pci_driver = { .ops = &gma_func0_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = i945_gma_func0_ids, }; static const struct pci_driver i945_gma_func1_driver __pci_driver = { .ops = &gma_func1_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = i945_gma_func1_ids, }; diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 6c055e9ffe..4909143a1f 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -150,7 +150,7 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver mc_driver __pci_driver = { .ops = &mc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/ironlake/gma.c b/src/northbridge/intel/ironlake/gma.c index a0325d12eb..c816ba6b57 100644 --- a/src/northbridge/intel/ironlake/gma.c +++ b/src/northbridge/intel/ironlake/gma.c @@ -208,6 +208,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver gma __pci_driver = { .ops = &gma_func0_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c index 2137e3b419..b74909faf3 100644 --- a/src/northbridge/intel/ironlake/northbridge.c +++ b/src/northbridge/intel/ironlake/northbridge.c @@ -215,7 +215,7 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver mc_driver_ilk __pci_driver = { .ops = &mc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c index e0ed0f0500..ba6f39c5b4 100644 --- a/src/northbridge/intel/pineview/gma.c +++ b/src/northbridge/intel/pineview/gma.c @@ -280,6 +280,6 @@ static const unsigned short pci_device_ids[] = static const struct pci_driver gma __pci_driver = { .ops = &gma_func0_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 9d01533e71..d1b9263980 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -660,6 +660,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver gma __pci_driver = { .ops = &gma_func0_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index f04c4f5e7f..fe769f9dc5 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -389,7 +389,7 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver mc_driver __pci_driver = { .ops = &mc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/sandybridge/pcie.c b/src/northbridge/intel/sandybridge/pcie.c index 4b1bae4662..ec737a2651 100644 --- a/src/northbridge/intel/sandybridge/pcie.c +++ b/src/northbridge/intel/sandybridge/pcie.c @@ -64,6 +64,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c index 096ceb76e9..fe0893b4a3 100644 --- a/src/northbridge/intel/x4x/gma.c +++ b/src/northbridge/intel/x4x/gma.c @@ -87,6 +87,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver gma __pci_driver = { .ops = &gma_func0_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/amd/cezanne/data_fabric.c b/src/soc/amd/cezanne/data_fabric.c index f62532c3e4..43894e98c8 100644 --- a/src/soc/amd/cezanne/data_fabric.c +++ b/src/soc/amd/cezanne/data_fabric.c @@ -101,29 +101,29 @@ void data_fabric_set_mmio_np(void) static const char *data_fabric_acpi_name(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0: + case PCI_DID_AMD_FAM17H_MODEL60H_DF0: + case PCI_DID_AMD_FAM19H_MODEL51H_DF0: return "DFD0"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1: + case PCI_DID_AMD_FAM17H_MODEL60H_DF1: + case PCI_DID_AMD_FAM19H_MODEL51H_DF1: return "DFD1"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2: + case PCI_DID_AMD_FAM17H_MODEL60H_DF2: + case PCI_DID_AMD_FAM19H_MODEL51H_DF2: return "DFD2"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3: + case PCI_DID_AMD_FAM17H_MODEL60H_DF3: + case PCI_DID_AMD_FAM19H_MODEL51H_DF3: return "DFD3"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4: + case PCI_DID_AMD_FAM17H_MODEL60H_DF4: + case PCI_DID_AMD_FAM19H_MODEL51H_DF4: return "DFD4"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5: + case PCI_DID_AMD_FAM17H_MODEL60H_DF5: + case PCI_DID_AMD_FAM19H_MODEL51H_DF5: return "DFD5"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6: + case PCI_DID_AMD_FAM17H_MODEL60H_DF6: + case PCI_DID_AMD_FAM19H_MODEL51H_DF6: return "DFD6"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7: + case PCI_DID_AMD_FAM17H_MODEL60H_DF7: + case PCI_DID_AMD_FAM19H_MODEL51H_DF7: return "DFD7"; default: printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device); @@ -141,28 +141,28 @@ static struct device_operations data_fabric_ops = { static const unsigned short pci_device_ids[] = { /* Renoir DF devices */ - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7, + PCI_DID_AMD_FAM17H_MODEL60H_DF0, + PCI_DID_AMD_FAM17H_MODEL60H_DF1, + PCI_DID_AMD_FAM17H_MODEL60H_DF2, + PCI_DID_AMD_FAM17H_MODEL60H_DF3, + PCI_DID_AMD_FAM17H_MODEL60H_DF4, + PCI_DID_AMD_FAM17H_MODEL60H_DF5, + PCI_DID_AMD_FAM17H_MODEL60H_DF6, + PCI_DID_AMD_FAM17H_MODEL60H_DF7, /* Cezanne DF devices */ - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7, + PCI_DID_AMD_FAM19H_MODEL51H_DF0, + PCI_DID_AMD_FAM19H_MODEL51H_DF1, + PCI_DID_AMD_FAM19H_MODEL51H_DF2, + PCI_DID_AMD_FAM19H_MODEL51H_DF3, + PCI_DID_AMD_FAM19H_MODEL51H_DF4, + PCI_DID_AMD_FAM19H_MODEL51H_DF5, + PCI_DID_AMD_FAM19H_MODEL51H_DF6, + PCI_DID_AMD_FAM19H_MODEL51H_DF7, 0 }; static const struct pci_driver data_fabric_driver __pci_driver = { .ops = &data_fabric_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c index 9cb668e04d..1381df3fd6 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -225,6 +225,6 @@ static struct device_operations root_complex_operations = { static const struct pci_driver family17_root_complex __pci_driver = { .ops = &root_complex_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_17H_MODEL_606F_NB, }; diff --git a/src/soc/amd/common/block/acp/acp.c b/src/soc/amd/common/block/acp/acp.c index b9dfce29ce..cf0e9f8fe2 100644 --- a/src/soc/amd/common/block/acp/acp.c +++ b/src/soc/amd/common/block/acp/acp.c @@ -55,6 +55,6 @@ static struct device_operations acp_ops = { static const struct pci_driver acp_driver __pci_driver = { .ops = &acp_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_FAM17H_ACP, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_FAM17H_ACP, }; diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c index 38a422c6b7..d39f60a85c 100644 --- a/src/soc/amd/common/block/graphics/graphics.c +++ b/src/soc/amd/common/block/graphics/graphics.c @@ -181,17 +181,17 @@ static const struct device_operations graphics_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_ATI_FAM17H_MODEL18H_GPU, - PCI_DEVICE_ID_ATI_FAM17H_MODEL60H_GPU, - PCI_DEVICE_ID_ATI_FAM17H_MODEL68H_GPU, - PCI_DEVICE_ID_ATI_FAM17H_MODELA0H_GPU, - PCI_DEVICE_ID_ATI_FAM19H_MODEL51H_GPU_CEZANNE, - PCI_DEVICE_ID_ATI_FAM19H_MODEL51H_GPU_BARCELO, + PCI_DID_ATI_FAM17H_MODEL18H_GPU, + PCI_DID_ATI_FAM17H_MODEL60H_GPU, + PCI_DID_ATI_FAM17H_MODEL68H_GPU, + PCI_DID_ATI_FAM17H_MODELA0H_GPU, + PCI_DID_ATI_FAM19H_MODEL51H_GPU_CEZANNE, + PCI_DID_ATI_FAM19H_MODEL51H_GPU_BARCELO, 0, }; static const struct pci_driver graphics_driver __pci_driver = { .ops = &graphics_ops, - .vendor = PCI_VENDOR_ID_ATI, + .vendor = PCI_VID_ATI, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/hda/hda.c b/src/soc/amd/common/block/hda/hda.c index 104bb9bbb9..e8436ed9ce 100644 --- a/src/soc/amd/common/block/hda/hda.c +++ b/src/soc/amd/common/block/hda/hda.c @@ -9,9 +9,9 @@ #include <device/azalia_device.h> static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_HDA, - PCI_DEVICE_ID_AMD_CZ_HDA, - PCI_DEVICE_ID_AMD_FAM17H_HDA1, + PCI_DID_AMD_SB900_HDA, + PCI_DID_AMD_CZ_HDA, + PCI_DID_AMD_FAM17H_HDA1, 0 }; @@ -42,6 +42,6 @@ static struct device_operations hda_audio_ops = { static const struct pci_driver hdaaudio_driver __pci_driver = { .ops = CONFIG(AZALIA_PLUGIN_SUPPORT) ? &default_azalia_audio_ops : &hda_audio_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/iommu/iommu.c b/src/soc/amd/common/block/iommu/iommu.c index 9d4f38e8d9..4f20dd4117 100644 --- a/src/soc/amd/common/block/iommu/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -39,16 +39,16 @@ static struct device_operations iommu_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU, - PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_A0AF_NB_IOMMU, + PCI_DID_AMD_15H_MODEL_303F_NB_IOMMU, + PCI_DID_AMD_15H_MODEL_707F_NB_IOMMU, + PCI_DID_AMD_17H_MODEL_1020_NB_IOMMU, + PCI_DID_AMD_17H_MODEL_606F_NB_IOMMU, + PCI_DID_AMD_17H_MODEL_A0AF_NB_IOMMU, 0 }; static const struct pci_driver iommu_driver __pci_driver = { .ops = &iommu_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c index ebded6b87a..ee8f7e4814 100644 --- a/src/soc/amd/common/block/lpc/lpc.c +++ b/src/soc/amd/common/block/lpc/lpc.c @@ -323,13 +323,13 @@ static struct device_operations lpc_ops = { static const unsigned short pci_device_ids[] = { /* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_SB900_LPC, + PCI_DID_AMD_SB900_LPC, /* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_CZ_LPC, + PCI_DID_AMD_CZ_LPC, 0 }; static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/pci/pcie_gpp.c b/src/soc/amd/common/block/pci/pcie_gpp.c index d48d49ce82..2e37935da4 100644 --- a/src/soc/amd/common/block/pci/pcie_gpp.c +++ b/src/soc/amd/common/block/pci/pcie_gpp.c @@ -59,16 +59,16 @@ static struct device_operations internal_pcie_gpp_ops = { }; static const unsigned short internal_pci_gpp_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC, + PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA, + PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB, + PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC, + PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC, 0 }; static const struct pci_driver internal_pcie_gpp_driver __pci_driver = { .ops = &internal_pcie_gpp_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = internal_pci_gpp_ids, }; @@ -83,15 +83,15 @@ static struct device_operations external_pcie_gpp_ops = { }; static const unsigned short external_pci_gpp_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP, + PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP, + PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1, + PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2, + PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP, 0 }; static const struct pci_driver external_pcie_gpp_driver __pci_driver = { .ops = &external_pcie_gpp_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = external_pci_gpp_ids, }; diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c index 9caec89998..19a7d3edd5 100644 --- a/src/soc/amd/common/block/sata/sata.c +++ b/src/soc/amd/common/block/sata/sata.c @@ -22,17 +22,17 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_CZ_SATA, - PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER0, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER1, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1, + PCI_DID_AMD_CZ_SATA, + PCI_DID_AMD_CZ_SATA_AHCI, + PCI_DID_AMD_FAM17H_SATA_AHCI_VER0, + PCI_DID_AMD_FAM17H_SATA_AHCI_VER1, + PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER0, + PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER1, 0 }; static const struct pci_driver sata0_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c index ae2edc1506..e8b7c0fce6 100644 --- a/src/soc/amd/common/block/smbus/sm.c +++ b/src/soc/amd/common/block/smbus/sm.c @@ -88,7 +88,7 @@ static struct device_operations smbus_ops = { static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, /* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */ - .device = PCI_DEVICE_ID_AMD_CZ_SMBUS, + .device = PCI_DID_AMD_CZ_SMBUS, }; diff --git a/src/soc/amd/picasso/data_fabric.c b/src/soc/amd/picasso/data_fabric.c index 75d72e9fe8..50f75bc46a 100644 --- a/src/soc/amd/picasso/data_fabric.c +++ b/src/soc/amd/picasso/data_fabric.c @@ -101,21 +101,21 @@ void data_fabric_set_mmio_np(void) static const char *data_fabric_acpi_name(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0: + case PCI_DID_AMD_FAM17H_MODEL18H_DF0: return "DFD0"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1: + case PCI_DID_AMD_FAM17H_MODEL18H_DF1: return "DFD1"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2: + case PCI_DID_AMD_FAM17H_MODEL18H_DF2: return "DFD2"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3: + case PCI_DID_AMD_FAM17H_MODEL18H_DF3: return "DFD3"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4: + case PCI_DID_AMD_FAM17H_MODEL18H_DF4: return "DFD4"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5: + case PCI_DID_AMD_FAM17H_MODEL18H_DF5: return "DFD5"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6: + case PCI_DID_AMD_FAM17H_MODEL18H_DF6: return "DFD6"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF7: + case PCI_DID_AMD_FAM17H_MODEL18H_DF7: return "DFD7"; default: printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device); @@ -132,19 +132,19 @@ static struct device_operations data_fabric_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF7, + PCI_DID_AMD_FAM17H_MODEL18H_DF0, + PCI_DID_AMD_FAM17H_MODEL18H_DF1, + PCI_DID_AMD_FAM17H_MODEL18H_DF2, + PCI_DID_AMD_FAM17H_MODEL18H_DF3, + PCI_DID_AMD_FAM17H_MODEL18H_DF4, + PCI_DID_AMD_FAM17H_MODEL18H_DF5, + PCI_DID_AMD_FAM17H_MODEL18H_DF6, + PCI_DID_AMD_FAM17H_MODEL18H_DF7, 0 }; static const struct pci_driver data_fabric_driver __pci_driver = { .ops = &data_fabric_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index d5fd10db9d..73a50a915a 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -223,6 +223,6 @@ static struct device_operations root_complex_operations = { static const struct pci_driver family17_root_complex __pci_driver = { .ops = &root_complex_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_17H_MODEL_101F_NB, }; diff --git a/src/soc/amd/sabrina/data_fabric.c b/src/soc/amd/sabrina/data_fabric.c index 8f821c3cc2..0a399599ed 100644 --- a/src/soc/amd/sabrina/data_fabric.c +++ b/src/soc/amd/sabrina/data_fabric.c @@ -104,21 +104,21 @@ void data_fabric_set_mmio_np(void) static const char *data_fabric_acpi_name(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF0: + case PCI_DID_AMD_FAM17H_MODELA0H_DF0: return "DFD0"; - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF1: + case PCI_DID_AMD_FAM17H_MODELA0H_DF1: return "DFD1"; - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF2: + case PCI_DID_AMD_FAM17H_MODELA0H_DF2: return "DFD2"; - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF3: + case PCI_DID_AMD_FAM17H_MODELA0H_DF3: return "DFD3"; - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF4: + case PCI_DID_AMD_FAM17H_MODELA0H_DF4: return "DFD4"; - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF5: + case PCI_DID_AMD_FAM17H_MODELA0H_DF5: return "DFD5"; - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF6: + case PCI_DID_AMD_FAM17H_MODELA0H_DF6: return "DFD6"; - case PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF7: + case PCI_DID_AMD_FAM17H_MODELA0H_DF7: return "DFD7"; default: printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device); @@ -135,19 +135,19 @@ static struct device_operations data_fabric_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF0, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF1, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF2, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF3, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF4, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF5, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF6, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_DF7, + PCI_DID_AMD_FAM17H_MODELA0H_DF0, + PCI_DID_AMD_FAM17H_MODELA0H_DF1, + PCI_DID_AMD_FAM17H_MODELA0H_DF2, + PCI_DID_AMD_FAM17H_MODELA0H_DF3, + PCI_DID_AMD_FAM17H_MODELA0H_DF4, + PCI_DID_AMD_FAM17H_MODELA0H_DF5, + PCI_DID_AMD_FAM17H_MODELA0H_DF6, + PCI_DID_AMD_FAM17H_MODELA0H_DF7, 0 }; static const struct pci_driver data_fabric_driver __pci_driver = { .ops = &data_fabric_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/sabrina/root_complex.c b/src/soc/amd/sabrina/root_complex.c index ae1b3b915a..8f91b2af81 100644 --- a/src/soc/amd/sabrina/root_complex.c +++ b/src/soc/amd/sabrina/root_complex.c @@ -227,6 +227,6 @@ static struct device_operations root_complex_operations = { static const struct pci_driver family17_root_complex __pci_driver = { .ops = &root_complex_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_17H_MODEL_A0AF_NB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_17H_MODEL_A0AF_NB, }; diff --git a/src/soc/amd/sabrina/xhci.c b/src/soc/amd/sabrina/xhci.c index c6c0545cc9..fdd0118d7b 100644 --- a/src/soc/amd/sabrina/xhci.c +++ b/src/soc/amd/sabrina/xhci.c @@ -50,7 +50,7 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe) } } else if (dev->bus->dev->path.pci.devfn == PCIE_GPP_C_DEVFN) { if (dev->path.pci.devfn == XHCI2_DEVFN - && dev->device == PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_XHCI2) { + && dev->device == PCI_DID_AMD_FAM17H_MODELA0H_XHCI2) { *gpe = xhci_sci_sources[2].gpe; return CB_SUCCESS; } @@ -62,7 +62,7 @@ enum cb_err pci_xhci_get_wake_gpe(const struct device *dev, int *gpe) static void configure_xhci_sci(void *unused) { const struct device *xhci_2 = DEV_PTR(xhci_2); - if (xhci_2->device == PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_XHCI2) + if (xhci_2->device == PCI_DID_AMD_FAM17H_MODELA0H_XHCI2) gpe_configure_sci(xhci_sci_sources, ARRAY_SIZE(xhci_sci_sources)); else gpe_configure_sci(xhci_sci_sources, ARRAY_SIZE(xhci_sci_sources) - 1); diff --git a/src/soc/amd/stoneyridge/include/soc/pci_devs.h b/src/soc/amd/stoneyridge/include/soc/pci_devs.h index 4e5c8fc07c..e639fe6e16 100644 --- a/src/soc/amd/stoneyridge/include/soc/pci_devs.h +++ b/src/soc/amd/stoneyridge/include/soc/pci_devs.h @@ -21,8 +21,8 @@ /* * Internal Graphics * Device IDs subject to SKU/OPN variation - * GFX_DEVID for merlinfalcon PCI_DEVICE_ID_AMD_15H_MODEL_606F_GFX - * GFX_DEVID for stoneyridge PCI_DEVICE_ID_AMD_15H_MODEL_707F_GFX + * GFX_DEVID for merlinfalcon PCI_DID_AMD_15H_MODEL_606F_GFX + * GFX_DEVID for stoneyridge PCI_DID_AMD_15H_MODEL_707F_GFX */ #define GFX_DEV 0x1 #define GFX_FUNC 0 @@ -31,8 +31,8 @@ /* HD Audio 0 * Device IDs - * HDA0_DEVID PCI_DEVICE_ID_AMD_15H_MODEL_606F_HDA - * HDA0_DEVID PCI_DEVICE_ID_AMD_15H_MODEL_707F_HDA + * HDA0_DEVID PCI_DID_AMD_15H_MODEL_606F_HDA + * HDA0_DEVID PCI_DID_AMD_15H_MODEL_707F_HDA */ #define HDA0_DEV 0x1 #define HDA0_FUNC 1 @@ -89,8 +89,8 @@ /* HT Configuration * Device IDs - * HT_DEVID for merlinfalcon PCI_DEVICE_ID_AMD_15H_MODEL_606F_NB_HT - * HT_DEVID for stoneyridge PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT + * HT_DEVID for merlinfalcon PCI_DID_AMD_15H_MODEL_606F_NB_HT + * HT_DEVID for stoneyridge PCI_DID_AMD_15H_MODEL_707F_NB_HT */ #define HT_DEV 0x18 #define HT_FUNC 0 diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 85ef19ef4d..2166ef477f 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -320,13 +320,13 @@ static struct device_operations northbridge_operations = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_15H_MODEL_606F_NB_HT, - PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT, + PCI_DID_AMD_15H_MODEL_606F_NB_HT, + PCI_DID_AMD_15H_MODEL_707F_NB_HT, 0 }; static const struct pci_driver family15_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/stoneyridge/usb.c b/src/soc/amd/stoneyridge/usb.c index c83f1e15d0..efb50cd6f7 100644 --- a/src/soc/amd/stoneyridge/usb.c +++ b/src/soc/amd/stoneyridge/usb.c @@ -52,17 +52,17 @@ static struct device_operations usb_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_USB_18_0, - PCI_DEVICE_ID_AMD_SB900_USB_18_2, - PCI_DEVICE_ID_AMD_SB900_USB_20_5, - PCI_DEVICE_ID_AMD_CZ_USB_0, - PCI_DEVICE_ID_AMD_CZ_USB_1, - PCI_DEVICE_ID_AMD_CZ_USB3_0, + PCI_DID_AMD_SB900_USB_18_0, + PCI_DID_AMD_SB900_USB_18_2, + PCI_DID_AMD_SB900_USB_20_5, + PCI_DID_AMD_CZ_USB_0, + PCI_DID_AMD_CZ_USB_1, + PCI_DID_AMD_CZ_USB3_0, 0 }; static const struct pci_driver usb_0_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/cavium/common/pci/uart.c b/src/soc/cavium/common/pci/uart.c index 4d5f654868..4ee1cdfac7 100644 --- a/src/soc/cavium/common/pci/uart.c +++ b/src/soc/cavium/common/pci/uart.c @@ -22,7 +22,7 @@ static struct device_operations device_ops = { static const struct pci_driver soc_cavium_uart __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_CAVIUM, - .device = PCI_DEVICE_ID_CAVIUM_THUNDERX_UART, + .device = PCI_DID_CAVIUM_THUNDERX_UART, }; struct chip_operations soc_cavium_common_pci_ops = { diff --git a/src/soc/intel/alderlake/bootblock/report_platform.c b/src/soc/intel/alderlake/bootblock/report_platform.c index 6b526f12ef..3342e4b732 100644 --- a/src/soc/intel/alderlake/bootblock/report_platform.c +++ b/src/soc/intel/alderlake/bootblock/report_platform.c @@ -34,21 +34,21 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_8, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_9, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, "Alderlake-P" }, - { PCI_DEVICE_ID_INTEL_ADL_M_ID_1, "Alderlake-M" }, - { PCI_DEVICE_ID_INTEL_ADL_M_ID_2, "Alderlake-M" }, - { PCI_DEVICE_ID_INTEL_ADL_N_ID_1, "Alderlake-N" }, - { PCI_DEVICE_ID_INTEL_ADL_N_ID_2, "Alderlake-N" }, - { PCI_DEVICE_ID_INTEL_ADL_N_ID_3, "Alderlake-N" }, - { PCI_DEVICE_ID_INTEL_ADL_N_ID_4, "Alderlake-N" }, + { PCI_DID_INTEL_ADL_P_ID_1, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_3, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_4, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_5, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_6, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_7, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_8, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_9, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_P_ID_10, "Alderlake-P" }, + { PCI_DID_INTEL_ADL_M_ID_1, "Alderlake-M" }, + { PCI_DID_INTEL_ADL_M_ID_2, "Alderlake-M" }, + { PCI_DID_INTEL_ADL_N_ID_1, "Alderlake-N" }, + { PCI_DID_INTEL_ADL_N_ID_2, "Alderlake-N" }, + { PCI_DID_INTEL_ADL_N_ID_3, "Alderlake-N" }, + { PCI_DID_INTEL_ADL_N_ID_4, "Alderlake-N" }, }; @@ -56,76 +56,76 @@ static struct { u16 espiid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_0, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_1, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_2, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_3, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_4, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_5, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_6, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_7, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_8, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_9, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_10, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_11, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_12, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_13, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_14, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_15, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_16, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_17, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_18, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_19, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_20, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_21, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_22, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_23, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_24, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_25, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_26, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_27, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_28, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_29, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_30, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_31, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_32, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_P_ESPI_33, "Alderlake-P SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_M_ESPI_32, "Alderlake-M SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_1, "Alderlake-N SKU" }, - { PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_2, "Alderlake-N SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_0, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_1, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_2, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_3, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_4, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_5, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_6, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_7, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_8, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_9, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_10, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_11, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_12, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_13, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_14, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_15, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_16, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_17, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_18, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_19, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_20, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_21, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_22, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_23, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_24, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_25, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_26, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_27, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_28, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_29, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_30, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_31, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_32, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_P_ESPI_33, "Alderlake-P SKU" }, + { PCI_DID_INTEL_ADP_M_ESPI_32, "Alderlake-M SKU" }, + { PCI_DID_INTEL_ADP_M_N_ESPI_1, "Alderlake-N SKU" }, + { PCI_DID_INTEL_ADP_M_N_ESPI_2, "Alderlake-N SKU" }, }; static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_ADL_GT0, "Alderlake GT0" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_1, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_2, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_3, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_4, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_5, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_6, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_7, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_8, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_GT1_9, "Alderlake GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_1, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_2, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_3, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_4, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_5, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_6, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_7, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_8, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_P_GT2_9, "Alderlake P GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_M_GT1, "Alderlake M GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_M_GT2, "Alderlake M GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_M_GT3, "Alderlake M GT3" }, - { PCI_DEVICE_ID_INTEL_ADL_N_GT1, "Alderlake N GT1" }, - { PCI_DEVICE_ID_INTEL_ADL_N_GT2, "Alderlake N GT2" }, - { PCI_DEVICE_ID_INTEL_ADL_N_GT3, "Alderlake N GT3" }, + { PCI_DID_INTEL_ADL_GT0, "Alderlake GT0" }, + { PCI_DID_INTEL_ADL_GT1, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_1, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_2, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_3, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_4, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_5, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_6, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_7, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_8, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_GT1_9, "Alderlake GT1" }, + { PCI_DID_INTEL_ADL_P_GT2, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_1, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_2, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_3, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_4, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_5, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_6, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_7, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_8, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_P_GT2_9, "Alderlake P GT2" }, + { PCI_DID_INTEL_ADL_M_GT1, "Alderlake M GT1" }, + { PCI_DID_INTEL_ADL_M_GT2, "Alderlake M GT2" }, + { PCI_DID_INTEL_ADL_M_GT3, "Alderlake M GT3" }, + { PCI_DID_INTEL_ADL_N_GT1, "Alderlake N GT1" }, + { PCI_DID_INTEL_ADL_N_GT2, "Alderlake N GT2" }, + { PCI_DID_INTEL_ADL_N_GT3, "Alderlake N GT3" }, }; static inline uint8_t get_dev_revision(pci_devfn_t dev) diff --git a/src/soc/intel/alderlake/chip.h b/src/soc/intel/alderlake/chip.h index aad45df3cf..67664061c8 100644 --- a/src/soc/intel/alderlake/chip.h +++ b/src/soc/intel/alderlake/chip.h @@ -48,19 +48,19 @@ static const struct { enum soc_intel_alderlake_power_limits limits; enum soc_intel_alderlake_cpu_tdps cpu_tdp; } cpuid_to_adl[] = { - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, ADL_P_142_242_282_15W_CORE, TDP_15W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, ADL_P_142_242_282_15W_CORE, TDP_15W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, ADL_P_142_242_282_15W_CORE, TDP_15W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, ADL_P_282_482_28W_CORE, TDP_28W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, ADL_P_282_482_28W_CORE, TDP_28W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, ADL_P_682_28W_CORE, TDP_28W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, ADL_P_442_482_45W_CORE, TDP_45W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, ADL_P_642_682_45W_CORE, TDP_45W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, ADL_P_642_682_45W_CORE, TDP_45W }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, ADL_P_442_482_45W_CORE, TDP_45W }, - { PCI_DEVICE_ID_INTEL_ADL_M_ID_1, ADL_M_282_12W_CORE, TDP_12W }, - { PCI_DEVICE_ID_INTEL_ADL_M_ID_1, ADL_M_282_15W_CORE, TDP_15W }, - { PCI_DEVICE_ID_INTEL_ADL_M_ID_2, ADL_M_242_CORE, TDP_9W }, + { PCI_DID_INTEL_ADL_P_ID_10, ADL_P_142_242_282_15W_CORE, TDP_15W }, + { PCI_DID_INTEL_ADL_P_ID_7, ADL_P_142_242_282_15W_CORE, TDP_15W }, + { PCI_DID_INTEL_ADL_P_ID_6, ADL_P_142_242_282_15W_CORE, TDP_15W }, + { PCI_DID_INTEL_ADL_P_ID_7, ADL_P_282_482_28W_CORE, TDP_28W }, + { PCI_DID_INTEL_ADL_P_ID_5, ADL_P_282_482_28W_CORE, TDP_28W }, + { PCI_DID_INTEL_ADL_P_ID_3, ADL_P_682_28W_CORE, TDP_28W }, + { PCI_DID_INTEL_ADL_P_ID_5, ADL_P_442_482_45W_CORE, TDP_45W }, + { PCI_DID_INTEL_ADL_P_ID_4, ADL_P_642_682_45W_CORE, TDP_45W }, + { PCI_DID_INTEL_ADL_P_ID_3, ADL_P_642_682_45W_CORE, TDP_45W }, + { PCI_DID_INTEL_ADL_P_ID_1, ADL_P_442_482_45W_CORE, TDP_45W }, + { PCI_DID_INTEL_ADL_M_ID_1, ADL_M_282_12W_CORE, TDP_12W }, + { PCI_DID_INTEL_ADL_M_ID_1, ADL_M_282_15W_CORE, TDP_15W }, + { PCI_DID_INTEL_ADL_M_ID_2, ADL_M_242_CORE, TDP_9W }, }; /* Types of display ports */ diff --git a/src/soc/intel/alderlake/cpu.c b/src/soc/intel/alderlake/cpu.c index 426f6216b6..66db16b6ed 100644 --- a/src/soc/intel/alderlake/cpu.c +++ b/src/soc/intel/alderlake/cpu.c @@ -174,43 +174,43 @@ void soc_init_cpus(struct bus *cpu_bus) enum adl_cpu_type get_adl_cpu_type(void) { const uint16_t adl_m_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_M_ID_1, - PCI_DEVICE_ID_INTEL_ADL_M_ID_2, + PCI_DID_INTEL_ADL_M_ID_1, + PCI_DID_INTEL_ADL_M_ID_2, }; const uint16_t adl_p_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_P_ID_1, - PCI_DEVICE_ID_INTEL_ADL_P_ID_3, - PCI_DEVICE_ID_INTEL_ADL_P_ID_4, - PCI_DEVICE_ID_INTEL_ADL_P_ID_5, - PCI_DEVICE_ID_INTEL_ADL_P_ID_6, - PCI_DEVICE_ID_INTEL_ADL_P_ID_7, - PCI_DEVICE_ID_INTEL_ADL_P_ID_8, - PCI_DEVICE_ID_INTEL_ADL_P_ID_9, - PCI_DEVICE_ID_INTEL_ADL_P_ID_10 + PCI_DID_INTEL_ADL_P_ID_1, + PCI_DID_INTEL_ADL_P_ID_3, + PCI_DID_INTEL_ADL_P_ID_4, + PCI_DID_INTEL_ADL_P_ID_5, + PCI_DID_INTEL_ADL_P_ID_6, + PCI_DID_INTEL_ADL_P_ID_7, + PCI_DID_INTEL_ADL_P_ID_8, + PCI_DID_INTEL_ADL_P_ID_9, + PCI_DID_INTEL_ADL_P_ID_10 }; const uint16_t adl_s_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_S_ID_1, - PCI_DEVICE_ID_INTEL_ADL_S_ID_2, - PCI_DEVICE_ID_INTEL_ADL_S_ID_3, - PCI_DEVICE_ID_INTEL_ADL_S_ID_4, - PCI_DEVICE_ID_INTEL_ADL_S_ID_5, - PCI_DEVICE_ID_INTEL_ADL_S_ID_6, - PCI_DEVICE_ID_INTEL_ADL_S_ID_7, - PCI_DEVICE_ID_INTEL_ADL_S_ID_8, - PCI_DEVICE_ID_INTEL_ADL_S_ID_9, - PCI_DEVICE_ID_INTEL_ADL_S_ID_10, - PCI_DEVICE_ID_INTEL_ADL_S_ID_11, - PCI_DEVICE_ID_INTEL_ADL_S_ID_12, - PCI_DEVICE_ID_INTEL_ADL_S_ID_13, - PCI_DEVICE_ID_INTEL_ADL_S_ID_14, - PCI_DEVICE_ID_INTEL_ADL_S_ID_15, + PCI_DID_INTEL_ADL_S_ID_1, + PCI_DID_INTEL_ADL_S_ID_2, + PCI_DID_INTEL_ADL_S_ID_3, + PCI_DID_INTEL_ADL_S_ID_4, + PCI_DID_INTEL_ADL_S_ID_5, + PCI_DID_INTEL_ADL_S_ID_6, + PCI_DID_INTEL_ADL_S_ID_7, + PCI_DID_INTEL_ADL_S_ID_8, + PCI_DID_INTEL_ADL_S_ID_9, + PCI_DID_INTEL_ADL_S_ID_10, + PCI_DID_INTEL_ADL_S_ID_11, + PCI_DID_INTEL_ADL_S_ID_12, + PCI_DID_INTEL_ADL_S_ID_13, + PCI_DID_INTEL_ADL_S_ID_14, + PCI_DID_INTEL_ADL_S_ID_15, }; const uint16_t adl_n_mch_ids[] = { - PCI_DEVICE_ID_INTEL_ADL_N_ID_1, - PCI_DEVICE_ID_INTEL_ADL_N_ID_2, - PCI_DEVICE_ID_INTEL_ADL_N_ID_3, - PCI_DEVICE_ID_INTEL_ADL_N_ID_4, + PCI_DID_INTEL_ADL_N_ID_1, + PCI_DID_INTEL_ADL_N_ID_2, + PCI_DID_INTEL_ADL_N_ID_3, + PCI_DID_INTEL_ADL_N_ID_4, }; const uint16_t mchid = pci_s_read_config16(PCI_DEV(0, PCI_SLOT(SA_DEVFN_ROOT), diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c index dac36934df..b4e833bf55 100644 --- a/src/soc/intel/alderlake/fsp_params.c +++ b/src/soc/intel/alderlake/fsp_params.c @@ -309,17 +309,17 @@ static uint16_t get_vccin_aux_imon_iccmax(void) } switch (mch_id) { - case PCI_DEVICE_ID_INTEL_ADL_P_ID_1: - case PCI_DEVICE_ID_INTEL_ADL_P_ID_3: - case PCI_DEVICE_ID_INTEL_ADL_P_ID_5: - case PCI_DEVICE_ID_INTEL_ADL_P_ID_6: - case PCI_DEVICE_ID_INTEL_ADL_P_ID_7: + case PCI_DID_INTEL_ADL_P_ID_1: + case PCI_DID_INTEL_ADL_P_ID_3: + case PCI_DID_INTEL_ADL_P_ID_5: + case PCI_DID_INTEL_ADL_P_ID_6: + case PCI_DID_INTEL_ADL_P_ID_7: tdp = get_cpu_tdp(); if (tdp == TDP_45W) return ICC_MAX_TDP_45W; return ICC_MAX_TDP_15W_28W; - case PCI_DEVICE_ID_INTEL_ADL_M_ID_1: - case PCI_DEVICE_ID_INTEL_ADL_M_ID_2: + case PCI_DID_INTEL_ADL_M_ID_1: + case PCI_DID_INTEL_ADL_M_ID_2: return ICC_MAX_ID_ADL_M_MA; default: printk(BIOS_ERR, "Unknown MCH ID: 0x%4x, skipping VccInAuxImonIccMax config\n", diff --git a/src/soc/intel/alderlake/vr_config.c b/src/soc/intel/alderlake/vr_config.c index c0058cdba6..58c77f76d1 100644 --- a/src/soc/intel/alderlake/vr_config.c +++ b/src/soc/intel/alderlake/vr_config.c @@ -59,55 +59,55 @@ static uint32_t load_table(const struct vr_lookup *tbl, const int tbl_entries, c /* Per the power map from #613643, update ADL-P 6+8+2 (28W) VR configuration */ static const struct vr_lookup vr_config_ll[] = { - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_LOADLINE(2.8, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_LOADLINE(2.8, 3.2) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_LOADLINE(2.8, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_LOADLINE(2.3, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_LOADLINE(2.8, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_LOADLINE(2.8, 3.2) }, + { PCI_DID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_LOADLINE(2.8, 3.2) }, }; static const struct vr_lookup vr_config_icc[] = { - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_ICC(120, 55) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_ICC(160, 55) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_ICC(160, 55) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_ICC(120, 55) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_ICC(109, 55) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_ICC(85, 55) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_ICC(85, 55) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_ICC(80, 40) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_ICC(80, 40) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_ICC(80, 40) }, + { PCI_DID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_ICC(120, 55) }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_ICC(160, 55) }, + { PCI_DID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_ICC(160, 55) }, + { PCI_DID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_ICC(120, 55) }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_ICC(109, 55) }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_ICC(85, 55) }, + { PCI_DID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_ICC(85, 55) }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_ICC(80, 40) }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_ICC(80, 40) }, + { PCI_DID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_ICC(80, 40) }, }; static const struct vr_lookup vr_config_tdc_timewindow[] = { - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, + { PCI_DID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_TDC(28000, 28000) }, }; static const struct vr_lookup vr_config_tdc_currentlimit[] = { - { PCI_DEVICE_ID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(47, 47) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(57, 57) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(57, 57) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(47, 47) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_TDC_CURRENT(40, 40) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_TDC_CURRENT(32, 32) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_TDC_CURRENT(32, 32) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_TDC_CURRENT(20, 20) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_TDC_CURRENT(20, 20) }, - { PCI_DEVICE_ID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_TDC_CURRENT(20, 20) }, + { PCI_DID_INTEL_ADL_P_ID_1, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(47, 47) }, + { PCI_DID_INTEL_ADL_P_ID_3, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(57, 57) }, + { PCI_DID_INTEL_ADL_P_ID_4, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(57, 57) }, + { PCI_DID_INTEL_ADL_P_ID_5, 45, VR_CFG_ALL_DOMAINS_TDC_CURRENT(47, 47) }, + { PCI_DID_INTEL_ADL_P_ID_3, 28, VR_CFG_ALL_DOMAINS_TDC_CURRENT(40, 40) }, + { PCI_DID_INTEL_ADL_P_ID_5, 28, VR_CFG_ALL_DOMAINS_TDC_CURRENT(32, 32) }, + { PCI_DID_INTEL_ADL_P_ID_7, 28, VR_CFG_ALL_DOMAINS_TDC_CURRENT(32, 32) }, + { PCI_DID_INTEL_ADL_P_ID_6, 15, VR_CFG_ALL_DOMAINS_TDC_CURRENT(20, 20) }, + { PCI_DID_INTEL_ADL_P_ID_7, 15, VR_CFG_ALL_DOMAINS_TDC_CURRENT(20, 20) }, + { PCI_DID_INTEL_ADL_P_ID_10, 15, VR_CFG_ALL_DOMAINS_TDC_CURRENT(20, 20) }, }; void fill_vr_domain_config(FSP_S_CONFIG *s_cfg, diff --git a/src/soc/intel/apollolake/report_platform.c b/src/soc/intel/apollolake/report_platform.c index 25587eb9d8..31a6458d47 100644 --- a/src/soc/intel/apollolake/report_platform.c +++ b/src/soc/intel/apollolake/report_platform.c @@ -28,27 +28,27 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_GLK_NB, "Geminilake" }, - { PCI_DEVICE_ID_INTEL_APL_NB, "Apollolake" }, + { PCI_DID_INTEL_GLK_NB, "Geminilake" }, + { PCI_DID_INTEL_APL_NB, "Apollolake" }, }; static struct { u16 lpcid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_APL_LPC, "Apollolake" }, - { PCI_DEVICE_ID_INTEL_GLK_LPC, "Geminilake" }, - { PCI_DEVICE_ID_INTEL_GLK_ESPI, "Geminilake" }, + { PCI_DID_INTEL_APL_LPC, "Apollolake" }, + { PCI_DID_INTEL_GLK_LPC, "Geminilake" }, + { PCI_DID_INTEL_GLK_ESPI, "Geminilake" }, }; static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_APL_IGD_HD_505, "Apollolake HD 505" }, - { PCI_DEVICE_ID_INTEL_APL_IGD_HD_500, "Apollolake HD 500" }, - { PCI_DEVICE_ID_INTEL_GLK_IGD, "Geminilake" }, - { PCI_DEVICE_ID_INTEL_GLK_IGD_EU12, "Geminilake EU12" }, + { PCI_DID_INTEL_APL_IGD_HD_505, "Apollolake HD 505" }, + { PCI_DID_INTEL_APL_IGD_HD_500, "Apollolake HD 500" }, + { PCI_DID_INTEL_GLK_IGD, "Geminilake" }, + { PCI_DID_INTEL_GLK_IGD_EU12, "Geminilake EU12" }, }; static uint8_t get_dev_revision(pci_devfn_t dev) diff --git a/src/soc/intel/baytrail/ehci.c b/src/soc/intel/baytrail/ehci.c index 5ae834efdd..b084b0a14f 100644 --- a/src/soc/intel/baytrail/ehci.c +++ b/src/soc/intel/baytrail/ehci.c @@ -158,6 +158,6 @@ static struct device_operations ehci_device_ops = { static const struct pci_driver baytrail_ehci __pci_driver = { .ops = &ehci_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = EHCI_DEVID }; diff --git a/src/soc/intel/baytrail/emmc.c b/src/soc/intel/baytrail/emmc.c index e672b58bfe..3bfad01f4b 100644 --- a/src/soc/intel/baytrail/emmc.c +++ b/src/soc/intel/baytrail/emmc.c @@ -51,6 +51,6 @@ static struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = MMC45_DEVID, }; diff --git a/src/soc/intel/baytrail/gfx.c b/src/soc/intel/baytrail/gfx.c index 2ee2375ef6..102716838f 100644 --- a/src/soc/intel/baytrail/gfx.c +++ b/src/soc/intel/baytrail/gfx.c @@ -387,6 +387,6 @@ static struct device_operations gfx_device_ops = { static const struct pci_driver gfx_driver __pci_driver = { .ops = &gfx_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = GFX_DEVID, }; diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c index b582006d1c..6bebf05467 100644 --- a/src/soc/intel/baytrail/hda.c +++ b/src/soc/intel/baytrail/hda.c @@ -93,6 +93,6 @@ static const struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = HDA_DEVID, }; diff --git a/src/soc/intel/baytrail/lpe.c b/src/soc/intel/baytrail/lpe.c index 719286541b..03ac736793 100644 --- a/src/soc/intel/baytrail/lpe.c +++ b/src/soc/intel/baytrail/lpe.c @@ -162,6 +162,6 @@ static const struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = LPE_DEVID, }; diff --git a/src/soc/intel/baytrail/lpss.c b/src/soc/intel/baytrail/lpss.c index b63576b784..fa1b957ba1 100644 --- a/src/soc/intel/baytrail/lpss.c +++ b/src/soc/intel/baytrail/lpss.c @@ -177,6 +177,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c index e8f97681a4..cd8c6d4fd7 100644 --- a/src/soc/intel/baytrail/northcluster.c +++ b/src/soc/intel/baytrail/northcluster.c @@ -137,6 +137,6 @@ static struct device_operations nc_ops = { static const struct pci_driver nc_driver __pci_driver = { .ops = &nc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = SOC_DEVID, }; diff --git a/src/soc/intel/baytrail/pcie.c b/src/soc/intel/baytrail/pcie.c index c257ce0f3e..de3f0c5b9b 100644 --- a/src/soc/intel/baytrail/pcie.c +++ b/src/soc/intel/baytrail/pcie.c @@ -244,6 +244,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pcie_root_ports __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/baytrail/sata.c b/src/soc/intel/baytrail/sata.c index 5e5215b249..5c81544a15 100644 --- a/src/soc/intel/baytrail/sata.c +++ b/src/soc/intel/baytrail/sata.c @@ -209,6 +209,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver baytrail_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/baytrail/sd.c b/src/soc/intel/baytrail/sd.c index 0a015c8667..920a96004e 100644 --- a/src/soc/intel/baytrail/sd.c +++ b/src/soc/intel/baytrail/sd.c @@ -41,6 +41,6 @@ static const struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = SD_DEVID, }; diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c index 033cd47580..8356e5d641 100644 --- a/src/soc/intel/baytrail/southcluster.c +++ b/src/soc/intel/baytrail/southcluster.c @@ -491,7 +491,7 @@ static struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = LPC_DEVID, }; diff --git a/src/soc/intel/baytrail/xhci.c b/src/soc/intel/baytrail/xhci.c index 9ff30e3d59..99b091c0bb 100644 --- a/src/soc/intel/baytrail/xhci.c +++ b/src/soc/intel/baytrail/xhci.c @@ -238,6 +238,6 @@ static struct device_operations xhci_device_ops = { static const struct pci_driver baytrail_xhci __pci_driver = { .ops = &xhci_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = XHCI_DEVID }; diff --git a/src/soc/intel/braswell/emmc.c b/src/soc/intel/braswell/emmc.c index d3c5aa8640..715444f295 100644 --- a/src/soc/intel/braswell/emmc.c +++ b/src/soc/intel/braswell/emmc.c @@ -39,6 +39,6 @@ static struct device_operations emmc_device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &emmc_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = MMC_DEVID, }; diff --git a/src/soc/intel/braswell/gfx.c b/src/soc/intel/braswell/gfx.c index 7599329b61..549fe1c4ac 100644 --- a/src/soc/intel/braswell/gfx.c +++ b/src/soc/intel/braswell/gfx.c @@ -77,6 +77,6 @@ static struct device_operations gfx_device_ops = { static const struct pci_driver gfx_driver __pci_driver = { .ops = &gfx_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = GFX_DEVID, }; diff --git a/src/soc/intel/braswell/lpe.c b/src/soc/intel/braswell/lpe.c index 323c9fc175..109ad84772 100644 --- a/src/soc/intel/braswell/lpe.c +++ b/src/soc/intel/braswell/lpe.c @@ -179,6 +179,6 @@ static const struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = LPE_DEVID, }; diff --git a/src/soc/intel/braswell/lpss.c b/src/soc/intel/braswell/lpss.c index 5f93e17206..b4085a0d3e 100644 --- a/src/soc/intel/braswell/lpss.c +++ b/src/soc/intel/braswell/lpss.c @@ -164,6 +164,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c index 76d532b5cb..d9a516d57d 100644 --- a/src/soc/intel/braswell/northcluster.c +++ b/src/soc/intel/braswell/northcluster.c @@ -163,6 +163,6 @@ static struct device_operations nc_ops = { static const struct pci_driver nc_driver __pci_driver = { .ops = &nc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = SOC_DEVID, }; diff --git a/src/soc/intel/braswell/pcie.c b/src/soc/intel/braswell/pcie.c index 6a719e78a9..762dfd4a33 100644 --- a/src/soc/intel/braswell/pcie.c +++ b/src/soc/intel/braswell/pcie.c @@ -151,6 +151,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pcie_root_ports __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/braswell/sata.c b/src/soc/intel/braswell/sata.c index d88ee57fb5..1c06cae630 100644 --- a/src/soc/intel/braswell/sata.c +++ b/src/soc/intel/braswell/sata.c @@ -36,6 +36,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver soc_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/braswell/sd.c b/src/soc/intel/braswell/sd.c index 39a44db772..12e77c9230 100644 --- a/src/soc/intel/braswell/sd.c +++ b/src/soc/intel/braswell/sd.c @@ -41,6 +41,6 @@ static const struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = SD_DEVID, }; diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c index 4c6cbee343..c058850c5e 100644 --- a/src/soc/intel/braswell/southcluster.c +++ b/src/soc/intel/braswell/southcluster.c @@ -539,7 +539,7 @@ static struct device_operations device_ops = { static const struct pci_driver southcluster __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = LPC_DEVID, }; diff --git a/src/soc/intel/braswell/xhci.c b/src/soc/intel/braswell/xhci.c index f84c204499..24d2955b89 100644 --- a/src/soc/intel/braswell/xhci.c +++ b/src/soc/intel/braswell/xhci.c @@ -39,6 +39,6 @@ static struct device_operations xhci_device_ops = { static const struct pci_driver soc_xhci __pci_driver = { .ops = &xhci_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = XHCI_DEVID }; diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c index e84d075391..e50ff0cd81 100644 --- a/src/soc/intel/broadwell/gma.c +++ b/src/soc/intel/broadwell/gma.c @@ -604,6 +604,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver igd_driver __pci_driver = { .ops = &igd_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/minihd.c b/src/soc/intel/broadwell/minihd.c index 396c283845..ee635019d5 100644 --- a/src/soc/intel/broadwell/minihd.c +++ b/src/soc/intel/broadwell/minihd.c @@ -106,6 +106,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver minihd_driver __pci_driver = { .ops = &minihd_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c index 4511c07502..a29a4f41ca 100644 --- a/src/soc/intel/broadwell/northbridge.c +++ b/src/soc/intel/broadwell/northbridge.c @@ -420,7 +420,7 @@ static const unsigned short systemagent_ids[] = { static const struct pci_driver systemagent_driver __pci_driver = { .ops = &systemagent_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = systemagent_ids }; diff --git a/src/soc/intel/broadwell/pch/adsp.c b/src/soc/intel/broadwell/pch/adsp.c index e154446aaf..7da807a6fd 100644 --- a/src/soc/intel/broadwell/pch/adsp.c +++ b/src/soc/intel/broadwell/pch/adsp.c @@ -132,6 +132,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_adsp __pci_driver = { .ops = &adsp_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/hda.c b/src/soc/intel/broadwell/pch/hda.c index c292b942e0..ad3d8e9200 100644 --- a/src/soc/intel/broadwell/pch/hda.c +++ b/src/soc/intel/broadwell/pch/hda.c @@ -136,6 +136,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_hda __pci_driver = { .ops = &hda_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index b68a8cfb68..45669b3987 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -627,6 +627,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/me.c b/src/soc/intel/broadwell/pch/me.c index 95b6d889d2..4650a224eb 100644 --- a/src/soc/intel/broadwell/pch/me.c +++ b/src/soc/intel/broadwell/pch/me.c @@ -1047,6 +1047,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/pcie.c b/src/soc/intel/broadwell/pch/pcie.c index 5997768730..b37f256069 100644 --- a/src/soc/intel/broadwell/pch/pcie.c +++ b/src/soc/intel/broadwell/pch/pcie.c @@ -641,6 +641,6 @@ static const unsigned short pcie_device_ids[] = { static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pcie_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/sata.c b/src/soc/intel/broadwell/pch/sata.c index 8343775888..9f929a4809 100644 --- a/src/soc/intel/broadwell/pch/sata.c +++ b/src/soc/intel/broadwell/pch/sata.c @@ -279,6 +279,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/serialio.c b/src/soc/intel/broadwell/pch/serialio.c index f87217c070..336b501b32 100644 --- a/src/soc/intel/broadwell/pch/serialio.c +++ b/src/soc/intel/broadwell/pch/serialio.c @@ -285,6 +285,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/usb_ehci.c b/src/soc/intel/broadwell/pch/usb_ehci.c index 5b977dd3c6..3ada5b26b1 100644 --- a/src/soc/intel/broadwell/pch/usb_ehci.c +++ b/src/soc/intel/broadwell/pch/usb_ehci.c @@ -52,6 +52,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/broadwell/pch/usb_xhci.c b/src/soc/intel/broadwell/pch/usb_xhci.c index b766425df4..e3bb40f081 100644 --- a/src/soc/intel/broadwell/pch/usb_xhci.c +++ b/src/soc/intel/broadwell/pch/usb_xhci.c @@ -212,7 +212,7 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; #endif /* !__SIMPLE_DEVICE__ */ diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c index fed8ac2199..578cbbf977 100644 --- a/src/soc/intel/cannonlake/bootblock/report_platform.c +++ b/src/soc/intel/cannonlake/bootblock/report_platform.c @@ -40,119 +40,119 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_CNL_ID_U, "Cannonlake-U" }, - { PCI_DEVICE_ID_INTEL_CNL_ID_Y, "Cannonlake-Y" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_U, "Coffeelake U (4+3e)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_U_2, "Coffeelake U (2)" }, - { PCI_DEVICE_ID_INTEL_WHL_ID_W_4, "Whiskeylake W (4+2)" }, - { PCI_DEVICE_ID_INTEL_WHL_ID_W_2, "Whiskeylake W (2+2)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_H, "Coffeelake-H" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_H_4, "Coffeelake-H (4)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_H_8, "Coffeelake-H (8+2)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S, "Coffeelake-S" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2, "Coffeelake-S DT(2)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4, "Coffeelake-S DT(4)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8, "Coffeelake-S DT(8+2)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4, "Coffeelake-S WS(4+2)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6, "Coffeelake-S WS(6+2)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8, "Coffeelake-S WS(8+2)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4, "Coffeelake-S S(4)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6, "Coffeelake-S S(6)" }, - { PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8, "Coffeelake-S S(8)" }, - { PCI_DEVICE_ID_INTEL_CML_ULT, "CometLake-U (4+2)" }, - { PCI_DEVICE_ID_INTEL_CML_ULT_2_2, "CometLake-U (2+2)" }, - { PCI_DEVICE_ID_INTEL_CML_ULT_6_2, "CometLake-U (6+2)" }, - { PCI_DEVICE_ID_INTEL_CML_ULX, "CometLake-ULX (4+2)" }, - { PCI_DEVICE_ID_INTEL_CML_S, "CometLake-S (6+2)" }, - { PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2, "CometLake-S G0/G1/P0/P1 (6+2)" }, - { PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2, "CometLake-S P0/P1 (8+2)" }, - { PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2, "CometLake-S P0/P1 (10+2)" }, - { PCI_DEVICE_ID_INTEL_CML_S_G0G1_4, "CometLake-S G0/G1 (4+2)" }, - { PCI_DEVICE_ID_INTEL_CML_S_G0G1_2, "CometLake-S G0/G1 (2+2)" }, - { PCI_DEVICE_ID_INTEL_CML_H, "CometLake-H (6+2)" }, - { PCI_DEVICE_ID_INTEL_CML_H_4_2, "CometLake-H (4+2)" }, - { PCI_DEVICE_ID_INTEL_CML_H_8_2, "CometLake-H (8+2)" }, + { PCI_DID_INTEL_CNL_ID_U, "Cannonlake-U" }, + { PCI_DID_INTEL_CNL_ID_Y, "Cannonlake-Y" }, + { PCI_DID_INTEL_CFL_ID_U, "Coffeelake U (4+3e)" }, + { PCI_DID_INTEL_CFL_ID_U_2, "Coffeelake U (2)" }, + { PCI_DID_INTEL_WHL_ID_W_4, "Whiskeylake W (4+2)" }, + { PCI_DID_INTEL_WHL_ID_W_2, "Whiskeylake W (2+2)" }, + { PCI_DID_INTEL_CFL_ID_H, "Coffeelake-H" }, + { PCI_DID_INTEL_CFL_ID_H_4, "Coffeelake-H (4)" }, + { PCI_DID_INTEL_CFL_ID_H_8, "Coffeelake-H (8+2)" }, + { PCI_DID_INTEL_CFL_ID_S, "Coffeelake-S" }, + { PCI_DID_INTEL_CFL_ID_S_DT_2, "Coffeelake-S DT(2)" }, + { PCI_DID_INTEL_CFL_ID_S_DT_4, "Coffeelake-S DT(4)" }, + { PCI_DID_INTEL_CFL_ID_S_DT_8, "Coffeelake-S DT(8+2)" }, + { PCI_DID_INTEL_CFL_ID_S_WS_4, "Coffeelake-S WS(4+2)" }, + { PCI_DID_INTEL_CFL_ID_S_WS_6, "Coffeelake-S WS(6+2)" }, + { PCI_DID_INTEL_CFL_ID_S_WS_8, "Coffeelake-S WS(8+2)" }, + { PCI_DID_INTEL_CFL_ID_S_S_4, "Coffeelake-S S(4)" }, + { PCI_DID_INTEL_CFL_ID_S_S_6, "Coffeelake-S S(6)" }, + { PCI_DID_INTEL_CFL_ID_S_S_8, "Coffeelake-S S(8)" }, + { PCI_DID_INTEL_CML_ULT, "CometLake-U (4+2)" }, + { PCI_DID_INTEL_CML_ULT_2_2, "CometLake-U (2+2)" }, + { PCI_DID_INTEL_CML_ULT_6_2, "CometLake-U (6+2)" }, + { PCI_DID_INTEL_CML_ULX, "CometLake-ULX (4+2)" }, + { PCI_DID_INTEL_CML_S, "CometLake-S (6+2)" }, + { PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2, "CometLake-S G0/G1/P0/P1 (6+2)" }, + { PCI_DID_INTEL_CML_S_P0P1_8_2, "CometLake-S P0/P1 (8+2)" }, + { PCI_DID_INTEL_CML_S_P0P1_10_2, "CometLake-S P0/P1 (10+2)" }, + { PCI_DID_INTEL_CML_S_G0G1_4, "CometLake-S G0/G1 (4+2)" }, + { PCI_DID_INTEL_CML_S_G0G1_2, "CometLake-S G0/G1 (2+2)" }, + { PCI_DID_INTEL_CML_H, "CometLake-H (6+2)" }, + { PCI_DID_INTEL_CML_H_4_2, "CometLake-H (4+2)" }, + { PCI_DID_INTEL_CML_H_8_2, "CometLake-H (8+2)" }, }; static struct { u16 lpcid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_CNL_BASE_U_LPC, "Cannonlake-U Base" }, - { PCI_DEVICE_ID_INTEL_CNL_U_PREMIUM_LPC, "Cannonlake-U Premium" }, - { PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC, "Cannonlake-Y Premium" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_H310, "Cannonlake-H H310" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_H370, "Cannonlake-H H370" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_Z390, "Cannonlake-H Z390" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370, "Cannonlake-H Q370" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_B360, "Cannonlake-H B360" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_C246, "Cannonlake-H C246" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_C242, "Cannonlake-H C242" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370, "Cannonlake-H QM370" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_HM370, "Cannonlake-H HM370" }, - { PCI_DEVICE_ID_INTEL_CNP_H_LPC_CM246, "Cannonlake-H CM246" }, - { PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC, "Cometlake-U Super" }, - { PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC, "Cometlake-Y Premium" }, - { PCI_DEVICE_ID_INTEL_CMP_PREMIUM_U_LPC, "Cometlake-U Premium" }, - { PCI_DEVICE_ID_INTEL_CMP_BASE_U_LPC, "Cometlake-U Base" }, - { PCI_DEVICE_ID_INTEL_CMP_SUPER_Y_LPC, "Cometlake-Y Super" }, - { PCI_DEVICE_ID_INTEL_CMP_H_LPC_HM470, "Cometlake-H HM470" }, - { PCI_DEVICE_ID_INTEL_CMP_H_LPC_WM490, "Cometlake-H WM490" }, - { PCI_DEVICE_ID_INTEL_CMP_H_LPC_QM480, "Cometlake-H QM480" }, - { PCI_DEVICE_ID_INTEL_CMP_H_LPC_W480, "Cometlake-H W480" }, - { PCI_DEVICE_ID_INTEL_CMP_H_LPC_H470, "Cometlake-H H470" }, - { PCI_DEVICE_ID_INTEL_CMP_H_LPC_Z490, "Cometlake-H Z490" }, - { PCI_DEVICE_ID_INTEL_CMP_H_LPC_Q470, "Cometlake-H Q470" }, + { PCI_DID_INTEL_CNL_BASE_U_LPC, "Cannonlake-U Base" }, + { PCI_DID_INTEL_CNL_U_PREMIUM_LPC, "Cannonlake-U Premium" }, + { PCI_DID_INTEL_CNL_Y_PREMIUM_LPC, "Cannonlake-Y Premium" }, + { PCI_DID_INTEL_CNP_H_LPC_H310, "Cannonlake-H H310" }, + { PCI_DID_INTEL_CNP_H_LPC_H370, "Cannonlake-H H370" }, + { PCI_DID_INTEL_CNP_H_LPC_Z390, "Cannonlake-H Z390" }, + { PCI_DID_INTEL_CNP_H_LPC_Q370, "Cannonlake-H Q370" }, + { PCI_DID_INTEL_CNP_H_LPC_B360, "Cannonlake-H B360" }, + { PCI_DID_INTEL_CNP_H_LPC_C246, "Cannonlake-H C246" }, + { PCI_DID_INTEL_CNP_H_LPC_C242, "Cannonlake-H C242" }, + { PCI_DID_INTEL_CNP_H_LPC_QM370, "Cannonlake-H QM370" }, + { PCI_DID_INTEL_CNP_H_LPC_HM370, "Cannonlake-H HM370" }, + { PCI_DID_INTEL_CNP_H_LPC_CM246, "Cannonlake-H CM246" }, + { PCI_DID_INTEL_CMP_SUPER_U_LPC, "Cometlake-U Super" }, + { PCI_DID_INTEL_CMP_PREMIUM_Y_LPC, "Cometlake-Y Premium" }, + { PCI_DID_INTEL_CMP_PREMIUM_U_LPC, "Cometlake-U Premium" }, + { PCI_DID_INTEL_CMP_BASE_U_LPC, "Cometlake-U Base" }, + { PCI_DID_INTEL_CMP_SUPER_Y_LPC, "Cometlake-Y Super" }, + { PCI_DID_INTEL_CMP_H_LPC_HM470, "Cometlake-H HM470" }, + { PCI_DID_INTEL_CMP_H_LPC_WM490, "Cometlake-H WM490" }, + { PCI_DID_INTEL_CMP_H_LPC_QM480, "Cometlake-H QM480" }, + { PCI_DID_INTEL_CMP_H_LPC_W480, "Cometlake-H W480" }, + { PCI_DID_INTEL_CMP_H_LPC_H470, "Cometlake-H H470" }, + { PCI_DID_INTEL_CMP_H_LPC_Z490, "Cometlake-H Z490" }, + { PCI_DID_INTEL_CMP_H_LPC_Q470, "Cometlake-H Q470" }, }; static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_1, "Cannonlake ULX GT2" }, - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_2, "Cannonlake ULX GT1.5" }, - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_3, "Cannonlake ULX GT1" }, - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_4, "Cannonlake ULX GT0.5" }, - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_1, "Cannonlake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_2, "Cannonlake ULT GT1.5" }, - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_3, "Cannonlake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_4, "Cannonlake ULT GT0.5" }, - { PCI_DEVICE_ID_INTEL_CFL_GT2_ULT, "Coffeelake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_WHL_GT1_ULT_1, "Whiskeylake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_WHL_GT2_ULT_1, "Whiskeylake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CFL_H_GT2, "Coffeelake-H GT2" }, - { PCI_DEVICE_ID_INTEL_CFL_H_XEON_GT2, "Coffeelake-H Xeon GT2" }, - { PCI_DEVICE_ID_INTEL_CFL_S_GT1_1, "Coffeelake-S GT1" }, - { PCI_DEVICE_ID_INTEL_CFL_S_GT1_2, "Coffeelake-S GT1" }, - { PCI_DEVICE_ID_INTEL_CFL_S_GT2_1, "Coffeelake-S GT2" }, - { PCI_DEVICE_ID_INTEL_CFL_S_GT2_2, "Coffeelake-S GT2" }, - { PCI_DEVICE_ID_INTEL_CFL_S_GT2_3, "Coffeelake-S GT2" }, - { PCI_DEVICE_ID_INTEL_CFL_S_GT2_4, "Coffeelake-S GT2" }, - { PCI_DEVICE_ID_INTEL_CFL_S_GT2_5, "Coffeelake-S GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_ULT_1, "CometLake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_ULT_2, "CometLake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_ULT_1, "CometLake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_ULT_2, "CometLake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_ULT_3, "CometLake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_ULT_4, "CometLake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_ULT_3, "CometLake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_ULT_4, "CometLake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_ULT_5, "CometLake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_ULT_6, "CometLake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_ULX_1, "CometLake ULX GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_ULX_1, "CometLake ULX GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_S_1, "CometLake S GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_S_2, "CometLake S GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_S_1, "CometLake S GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_S_2, "CometLake S GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_S_G0, "CometLake S GT2 G0" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_S_P0, "CometLake S GT2 P0" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_H_1, "CometLake H GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT1_H_2, "CometLake H GT1" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_H_1, "CometLake H GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_H_2, "CometLake H GT2" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_H_R0, "CometLake H GT2 R0" }, - { PCI_DEVICE_ID_INTEL_CML_GT2_H_R1, "CometLake H GT2 R1" }, + { PCI_DID_INTEL_CNL_GT2_ULX_1, "Cannonlake ULX GT2" }, + { PCI_DID_INTEL_CNL_GT2_ULX_2, "Cannonlake ULX GT1.5" }, + { PCI_DID_INTEL_CNL_GT2_ULX_3, "Cannonlake ULX GT1" }, + { PCI_DID_INTEL_CNL_GT2_ULX_4, "Cannonlake ULX GT0.5" }, + { PCI_DID_INTEL_CNL_GT2_ULT_1, "Cannonlake ULT GT2" }, + { PCI_DID_INTEL_CNL_GT2_ULT_2, "Cannonlake ULT GT1.5" }, + { PCI_DID_INTEL_CNL_GT2_ULT_3, "Cannonlake ULT GT1" }, + { PCI_DID_INTEL_CNL_GT2_ULT_4, "Cannonlake ULT GT0.5" }, + { PCI_DID_INTEL_CFL_GT2_ULT, "Coffeelake ULT GT2" }, + { PCI_DID_INTEL_WHL_GT1_ULT_1, "Whiskeylake ULT GT1" }, + { PCI_DID_INTEL_WHL_GT2_ULT_1, "Whiskeylake ULT GT2" }, + { PCI_DID_INTEL_CFL_H_GT2, "Coffeelake-H GT2" }, + { PCI_DID_INTEL_CFL_H_XEON_GT2, "Coffeelake-H Xeon GT2" }, + { PCI_DID_INTEL_CFL_S_GT1_1, "Coffeelake-S GT1" }, + { PCI_DID_INTEL_CFL_S_GT1_2, "Coffeelake-S GT1" }, + { PCI_DID_INTEL_CFL_S_GT2_1, "Coffeelake-S GT2" }, + { PCI_DID_INTEL_CFL_S_GT2_2, "Coffeelake-S GT2" }, + { PCI_DID_INTEL_CFL_S_GT2_3, "Coffeelake-S GT2" }, + { PCI_DID_INTEL_CFL_S_GT2_4, "Coffeelake-S GT2" }, + { PCI_DID_INTEL_CFL_S_GT2_5, "Coffeelake-S GT2" }, + { PCI_DID_INTEL_CML_GT1_ULT_1, "CometLake ULT GT1" }, + { PCI_DID_INTEL_CML_GT1_ULT_2, "CometLake ULT GT1" }, + { PCI_DID_INTEL_CML_GT2_ULT_1, "CometLake ULT GT2" }, + { PCI_DID_INTEL_CML_GT2_ULT_2, "CometLake ULT GT2" }, + { PCI_DID_INTEL_CML_GT1_ULT_3, "CometLake ULT GT1" }, + { PCI_DID_INTEL_CML_GT1_ULT_4, "CometLake ULT GT1" }, + { PCI_DID_INTEL_CML_GT2_ULT_3, "CometLake ULT GT2" }, + { PCI_DID_INTEL_CML_GT2_ULT_4, "CometLake ULT GT2" }, + { PCI_DID_INTEL_CML_GT2_ULT_5, "CometLake ULT GT2" }, + { PCI_DID_INTEL_CML_GT2_ULT_6, "CometLake ULT GT2" }, + { PCI_DID_INTEL_CML_GT1_ULX_1, "CometLake ULX GT1" }, + { PCI_DID_INTEL_CML_GT2_ULX_1, "CometLake ULX GT2" }, + { PCI_DID_INTEL_CML_GT1_S_1, "CometLake S GT1" }, + { PCI_DID_INTEL_CML_GT1_S_2, "CometLake S GT1" }, + { PCI_DID_INTEL_CML_GT2_S_1, "CometLake S GT2" }, + { PCI_DID_INTEL_CML_GT2_S_2, "CometLake S GT2" }, + { PCI_DID_INTEL_CML_GT2_S_G0, "CometLake S GT2 G0" }, + { PCI_DID_INTEL_CML_GT2_S_P0, "CometLake S GT2 P0" }, + { PCI_DID_INTEL_CML_GT1_H_1, "CometLake H GT1" }, + { PCI_DID_INTEL_CML_GT1_H_2, "CometLake H GT1" }, + { PCI_DID_INTEL_CML_GT2_H_1, "CometLake H GT2" }, + { PCI_DID_INTEL_CML_GT2_H_2, "CometLake H GT2" }, + { PCI_DID_INTEL_CML_GT2_H_R0, "CometLake H GT2 R0" }, + { PCI_DID_INTEL_CML_GT2_H_R1, "CometLake H GT2 R1" }, }; diff --git a/src/soc/intel/cannonlake/vr_config.c b/src/soc/intel/cannonlake/vr_config.c index ade1ef6277..bd5fefbdd3 100644 --- a/src/soc/intel/cannonlake/vr_config.c +++ b/src/soc/intel/cannonlake/vr_config.c @@ -178,108 +178,108 @@ static uint16_t load_table(const struct vr_lookup *tbl, * The above values in () are for baseline. */ -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CNL_ID_U) { +VR_CONFIG_ICC(PCI_DID_INTEL_CNL_ID_U) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(13, 34, 0, 0) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CNL_ID_Y) { +VR_CONFIG_ICC(PCI_DID_INTEL_CNL_ID_Y) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(13, 34, 0, 0) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_WHL_ID_W_4) { +VR_CONFIG_ICC(PCI_DID_INTEL_WHL_ID_W_4) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(6, 70, 31, 31) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_WHL_ID_W_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_WHL_ID_W_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(6, 35, 31, 31) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_U) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_U) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(8.5, 64, 64, 64) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_U_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_U_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(8.5, 64, 64, 64) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_H_8) { /* undocumented */ +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_H_8) { /* undocumented */ { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 128, 0, 0) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_H) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_H) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 128, 0, 0) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_H_4) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_H_4) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 86, 0, 0) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_DT_2) { { 58, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 79, 35, 35) }, { 54, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 58, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 40, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_DT_4) { { 71, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 100, 45, 45) }, { 62, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 79, 45, 45) }, { 35, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 66, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_DT_8) { { 80, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 193, 45, 45) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 186, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_S_8) { { 80, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 193, 45, 45) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 186, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_WS_8) { { 80, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 193, 45, 45) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 186, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S) { { 95, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 138, 45, 45) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 133, 45, 45) }, { 54, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_WS_6) { { 95, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 138, 45, 45) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 133, 45, 45) }, { 54, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_S_6) { { 95, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 138, 45, 45) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 133, 45, 45) }, { 54, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4) { +VR_CONFIG_ICC(PCI_DID_INTEL_CFL_ID_S_S_4) { { 71, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 100, 45, 45) }, { 62, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 79, 45, 45) }, { 54, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 66, 45, 45) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 66, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_ULT) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_ULT) { { 0, performance, VR_CFG_ALL_DOMAINS_ICC(6, 85, 31, 31) }, { 0, baseline, VR_CFG_ALL_DOMAINS_ICC(6, 70, 31, 31) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_ULT_6_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_ULT_6_2) { { 0, performance, VR_CFG_ALL_DOMAINS_ICC(6, 85, 31, 31) }, { 0, baseline, VR_CFG_ALL_DOMAINS_ICC(6, 70, 31, 31) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_ULT_2_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_ULT_2_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(6, 35, 31, 31) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_H_8_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_H_8_2) { { 65, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 165, 32, 32) }, { 65, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 192, 32, 32) }, { 0, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 140, 32, 32) }, { 0, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 165, 32, 32) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_H) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_H) { { 0, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 140, 32, 32) }, { 0, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 140, 32, 32) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_H_4_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_H_4_2) { { 0, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 105, 32, 32) }, { 0, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 86, 32, 32) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_S_P0P1_8_2) { {125, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 245, 35, 35) }, {125, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 210, 35, 35) }, { 80, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 210, 35, 35) }, @@ -288,7 +288,7 @@ VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2) { { 0, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 140, 35, 35) }, { 0, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_S_P0P1_10_2) { {125, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 245, 35, 35) }, {125, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 210, 35, 35) }, { 80, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 210, 35, 35) }, @@ -297,304 +297,304 @@ VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2) { { 0, performance, VR_CFG_ALL_DOMAINS_ICC(11.1, 140, 35, 35) }, { 0, baseline, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2) { { 65, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 140, 35, 35) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 104, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_4) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_S_G0G1_4) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 102, 35, 35) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 65, 35, 35) }, }; -VR_CONFIG_ICC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_2) { +VR_CONFIG_ICC(PCI_DID_INTEL_CML_S_G0G1_2) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 60, 35, 35) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_ICC(11.1, 55, 35, 35) }, }; static const struct vr_lookup vr_config_icc[] = { - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CNL_ID_U), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CNL_ID_Y), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_WHL_ID_W_4), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_WHL_ID_W_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_U), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_U_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_H_8), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_H), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_H_4), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_ULT), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_ULT_6_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_ULT_2_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_H_8_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_H), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_H_4_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_4), - VR_REFITEM_ICC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_2), -}; - -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CNL_ID_U) { + VR_REFITEM_ICC(PCI_DID_INTEL_CNL_ID_U), + VR_REFITEM_ICC(PCI_DID_INTEL_CNL_ID_Y), + VR_REFITEM_ICC(PCI_DID_INTEL_WHL_ID_W_4), + VR_REFITEM_ICC(PCI_DID_INTEL_WHL_ID_W_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_U), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_U_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_H_8), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_H), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_H_4), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_DT_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_DT_4), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_DT_8), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_S_8), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_WS_8), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_WS_6), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_S_6), + VR_REFITEM_ICC(PCI_DID_INTEL_CFL_ID_S_S_4), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_ULT), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_ULT_6_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_ULT_2_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_H_8_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_H), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_H_4_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_S_P0P1_8_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_S_P0P1_10_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_S_G0G1_4), + VR_REFITEM_ICC(PCI_DID_INTEL_CML_S_G0G1_2), +}; + +VR_CONFIG_LL(PCI_DID_INTEL_CNL_ID_U) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.4, 2.0, 2.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CNL_ID_Y) { +VR_CONFIG_LL(PCI_DID_INTEL_CNL_ID_Y) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.4, 2.0, 2.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_WHL_ID_W_4) { /* unspecified */ +VR_CONFIG_LL(PCI_DID_INTEL_WHL_ID_W_4) { /* unspecified */ { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.8, 0, 0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_WHL_ID_W_2) { /* unspecified */ +VR_CONFIG_LL(PCI_DID_INTEL_WHL_ID_W_2) { /* unspecified */ { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.4, 0, 0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_U) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_U) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.4, 2.0, 2.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_U_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_U_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.4, 2.0, 2.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_H_8) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_H_8) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.8, 2.7, 2.7) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_H) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_H) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.8, 2.7, 2.7) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_H_4) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_H_4) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.8, 2.7, 2.7) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_WS_4) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.1, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_DT_4) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.1, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_DT_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.1, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_DT_8) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.6, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_S_8) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.6, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_WS_8) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.6, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.1, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_WS_6) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.1, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_S_6) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.1, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4) { +VR_CONFIG_LL(PCI_DID_INTEL_CFL_ID_S_S_4) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.1, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_ULT) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_ULT) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.8, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_ULT_6_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_ULT_6_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.8, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_ULT_2_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_ULT_2_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.4, 3.1, 3.1) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_H_8_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_H_8_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.1, 2.7, 2.7) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_H) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_H) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.1, 2.7, 2.7) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_H_4_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_H_4_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.1, 2.7, 2.7) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_S_P0P1_8_2) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.1, 4.0, 4.0) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.7, 4.0, 4.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_S_P0P1_10_2) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.1, 4.0, 4.0) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.7, 4.0, 4.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2) { {125, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.1, 4.0, 4.0) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.7, 4.0, 4.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_S_G0G1_4) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_S_G0G1_4) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.7, 4.0, 4.0) }, }; -VR_CONFIG_LL(PCI_DEVICE_ID_INTEL_CML_S_G0G1_2) { +VR_CONFIG_LL(PCI_DID_INTEL_CML_S_G0G1_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 1.7, 4.0, 4.0) }, }; static const struct vr_lookup vr_config_ll[] = { - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CNL_ID_U), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CNL_ID_Y), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_WHL_ID_W_4), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_WHL_ID_W_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_U), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_U_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_H_8), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_H), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_H_4), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_ULT), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_ULT_6_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_ULT_2_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_H_8_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_H), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_H_4_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_S_G0G1_4), - VR_REFITEM_LL(PCI_DEVICE_ID_INTEL_CML_S_G0G1_2), -}; - -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_H) { + VR_REFITEM_LL(PCI_DID_INTEL_CNL_ID_U), + VR_REFITEM_LL(PCI_DID_INTEL_CNL_ID_Y), + VR_REFITEM_LL(PCI_DID_INTEL_WHL_ID_W_4), + VR_REFITEM_LL(PCI_DID_INTEL_WHL_ID_W_2), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_U), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_U_2), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_H_8), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_H), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_H_4), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_WS_4), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_DT_4), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_DT_2), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_DT_8), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_S_8), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_WS_8), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_WS_6), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_S_6), + VR_REFITEM_LL(PCI_DID_INTEL_CFL_ID_S_S_4), + VR_REFITEM_LL(PCI_DID_INTEL_CML_ULT), + VR_REFITEM_LL(PCI_DID_INTEL_CML_ULT_6_2), + VR_REFITEM_LL(PCI_DID_INTEL_CML_ULT_2_2), + VR_REFITEM_LL(PCI_DID_INTEL_CML_H_8_2), + VR_REFITEM_LL(PCI_DID_INTEL_CML_H), + VR_REFITEM_LL(PCI_DID_INTEL_CML_H_4_2), + VR_REFITEM_LL(PCI_DID_INTEL_CML_S_P0P1_8_2), + VR_REFITEM_LL(PCI_DID_INTEL_CML_S_P0P1_10_2), + VR_REFITEM_LL(PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2), + VR_REFITEM_LL(PCI_DID_INTEL_CML_S_G0G1_4), + VR_REFITEM_LL(PCI_DID_INTEL_CML_S_G0G1_2), +}; + +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_H) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 80, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S) { { 58, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 33, 30, 30) }, { 54, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 31, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 29, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_DT_2) { { 58, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 33, 30, 30) }, { 54, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 31, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 29, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_S_4) { { 71, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 70, 30, 30) }, { 62, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 62, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 45, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_WS_4) { { 71, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 70, 30, 30) }, { 62, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 62, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 45, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_DT_4) { { 71, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 70, 30, 30) }, { 62, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 62, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 45, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_WS_6) { { 95, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 100, 30, 30) }, { 80, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 89, 30, 30) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 91, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 74, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_S_6) { { 95, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 100, 30, 30) }, { 80, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 89, 30, 30) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 91, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 74, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_S_8) { { 80, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 150, 30, 30) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 146, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 74, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_WS_8) { { 80, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 150, 30, 30) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 146, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 74, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8) { +VR_CONFIG_TDC(PCI_DID_INTEL_CFL_ID_S_DT_8) { { 80, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 150, 30, 30) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 146, 30, 30) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 74, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_ULT) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_ULT) { { 0, baseline, VR_CFG_ALL_DOMAINS_TDC(4, 48, 22, 22) }, { 0, performance, VR_CFG_ALL_DOMAINS_TDC(4, 58, 22, 22) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_ULT_6_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_ULT_6_2) { { 0, baseline, VR_CFG_ALL_DOMAINS_TDC(4, 48, 22, 22) }, { 0, performance, VR_CFG_ALL_DOMAINS_TDC(4, 58, 22, 22) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_ULT_2_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_ULT_2_2) { { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(4, 24, 22, 22) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_H_8_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_H_8_2) { { 65, performance, VR_CFG_ALL_DOMAINS_TDC(10, 146, 25, 25) }, { 65, baseline, VR_CFG_ALL_DOMAINS_TDC(10, 117, 25, 25) }, { 0, performance, VR_CFG_ALL_DOMAINS_TDC(10, 125, 25, 25) }, { 0, baseline, VR_CFG_ALL_DOMAINS_TDC(10, 86, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_H) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_H) { { 0, performance, VR_CFG_ALL_DOMAINS_TDC(10, 92, 25, 25) }, { 0, baseline, VR_CFG_ALL_DOMAINS_TDC(10, 80, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_H_4_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_H_4_2) { { 0, performance, VR_CFG_ALL_DOMAINS_TDC(10, 80, 25, 25) }, { 0, baseline, VR_CFG_ALL_DOMAINS_TDC(10, 60, 25, 25) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_S_P0P1_8_2) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 175, 28, 28) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 100, 28, 28) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_S_P0P1_10_2) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 175, 28, 28) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 100, 28, 28) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2) { {125, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 132, 28, 28) }, { 65, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 104, 28, 28) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 74, 28, 28) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_4) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_S_G0G1_4) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 68, 28, 28) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 42, 28, 28) }, }; -VR_CONFIG_TDC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_2) { +VR_CONFIG_TDC(PCI_DID_INTEL_CML_S_G0G1_2) { { 36, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 38, 28, 28) }, { 0, value_not_set, VR_CFG_ALL_DOMAINS_TDC(10, 25, 28, 28) }, }; static const struct vr_lookup vr_config_tdc[] = { - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_H), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_ULT), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_ULT_6_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_ULT_2_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_H_8_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_H), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_H_4_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_4), - VR_REFITEM_TDC(PCI_DEVICE_ID_INTEL_CML_S_G0G1_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_H), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_DT_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_S_4), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_WS_4), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_DT_4), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_WS_6), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_S_6), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_S_8), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_WS_8), + VR_REFITEM_TDC(PCI_DID_INTEL_CFL_ID_S_DT_8), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_ULT), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_ULT_6_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_ULT_2_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_H_8_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_H), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_H_4_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_S_P0P1_8_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_S_P0P1_10_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_S_G0G1_4), + VR_REFITEM_TDC(PCI_DID_INTEL_CML_S_G0G1_2), }; static uint16_t get_sku_voltagelimit(int domain) diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c index 8ce313586b..fd0c33de4a 100644 --- a/src/soc/intel/common/block/cnvi/cnvi.c +++ b/src/soc/intel/common/block/cnvi/cnvi.c @@ -21,34 +21,34 @@ static struct device_operations cnvi_wifi_ops = { }; static const unsigned short wifi_pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CML_LP_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_CML_H_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_CNL_LP_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_CNL_H_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_GLK_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_ICL_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_3, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_3, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_3, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_3, + PCI_DID_INTEL_CML_LP_CNVI_WIFI, + PCI_DID_INTEL_CML_H_CNVI_WIFI, + PCI_DID_INTEL_CNL_LP_CNVI_WIFI, + PCI_DID_INTEL_CNL_H_CNVI_WIFI, + PCI_DID_INTEL_GLK_CNVI_WIFI, + PCI_DID_INTEL_ICL_CNVI_WIFI, + PCI_DID_INTEL_JSL_CNVI_WIFI_0, + PCI_DID_INTEL_JSL_CNVI_WIFI_1, + PCI_DID_INTEL_JSL_CNVI_WIFI_2, + PCI_DID_INTEL_JSL_CNVI_WIFI_3, + PCI_DID_INTEL_TGL_CNVI_WIFI_0, + PCI_DID_INTEL_TGL_CNVI_WIFI_1, + PCI_DID_INTEL_TGL_CNVI_WIFI_2, + PCI_DID_INTEL_TGL_CNVI_WIFI_3, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_0, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_1, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_2, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_3, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_0, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_1, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_2, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_3, 0 }; static const struct pci_driver pch_cnvi_wifi __pci_driver = { .ops = &cnvi_wifi_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = wifi_pci_device_ids, }; @@ -68,18 +68,18 @@ static struct device_operations cnvi_bt_ops = { }; static const unsigned short bt_pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_0, - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_1, - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_2, - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_3, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_0, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_1, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_2, + PCI_DID_INTEL_TGL_CNVI_BT_0, + PCI_DID_INTEL_TGL_CNVI_BT_1, + PCI_DID_INTEL_TGL_CNVI_BT_2, + PCI_DID_INTEL_TGL_CNVI_BT_3, + PCI_DID_INTEL_TGL_H_CNVI_BT_0, + PCI_DID_INTEL_TGL_H_CNVI_BT_1, + PCI_DID_INTEL_TGL_H_CNVI_BT_2, 0 }; static const struct pci_driver pch_cnvi_bt __pci_driver = { .ops = &cnvi_bt_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = bt_pci_device_ids, }; diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 19d733602e..b0b2c5adaf 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -1257,44 +1257,44 @@ static struct device_operations cse_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_CSE0, - PCI_DEVICE_ID_INTEL_GLK_CSE0, - PCI_DEVICE_ID_INTEL_CNL_CSE0, - PCI_DEVICE_ID_INTEL_SKL_CSE0, - PCI_DEVICE_ID_INTEL_LWB_CSE0, - PCI_DEVICE_ID_INTEL_LWB_CSE0_SUPER, - PCI_DEVICE_ID_INTEL_CNP_H_CSE0, - PCI_DEVICE_ID_INTEL_ICL_CSE0, - PCI_DEVICE_ID_INTEL_CMP_CSE0, - PCI_DEVICE_ID_INTEL_CMP_H_CSE0, - PCI_DEVICE_ID_INTEL_TGL_CSE0, - PCI_DEVICE_ID_INTEL_TGL_H_CSE0, - PCI_DEVICE_ID_INTEL_MCC_CSE0, - PCI_DEVICE_ID_INTEL_MCC_CSE1, - PCI_DEVICE_ID_INTEL_MCC_CSE2, - PCI_DEVICE_ID_INTEL_MCC_CSE3, - PCI_DEVICE_ID_INTEL_JSP_CSE0, - PCI_DEVICE_ID_INTEL_JSP_CSE1, - PCI_DEVICE_ID_INTEL_JSP_CSE2, - PCI_DEVICE_ID_INTEL_JSP_CSE3, - PCI_DEVICE_ID_INTEL_ADP_P_CSE0, - PCI_DEVICE_ID_INTEL_ADP_P_CSE1, - PCI_DEVICE_ID_INTEL_ADP_P_CSE2, - PCI_DEVICE_ID_INTEL_ADP_P_CSE3, - PCI_DEVICE_ID_INTEL_ADP_S_CSE0, - PCI_DEVICE_ID_INTEL_ADP_S_CSE1, - PCI_DEVICE_ID_INTEL_ADP_S_CSE2, - PCI_DEVICE_ID_INTEL_ADP_S_CSE3, - PCI_DEVICE_ID_INTEL_ADP_M_CSE0, - PCI_DEVICE_ID_INTEL_ADP_M_CSE1, - PCI_DEVICE_ID_INTEL_ADP_M_CSE2, - PCI_DEVICE_ID_INTEL_ADP_M_CSE3, + PCI_DID_INTEL_APL_CSE0, + PCI_DID_INTEL_GLK_CSE0, + PCI_DID_INTEL_CNL_CSE0, + PCI_DID_INTEL_SKL_CSE0, + PCI_DID_INTEL_LWB_CSE0, + PCI_DID_INTEL_LWB_CSE0_SUPER, + PCI_DID_INTEL_CNP_H_CSE0, + PCI_DID_INTEL_ICL_CSE0, + PCI_DID_INTEL_CMP_CSE0, + PCI_DID_INTEL_CMP_H_CSE0, + PCI_DID_INTEL_TGL_CSE0, + PCI_DID_INTEL_TGL_H_CSE0, + PCI_DID_INTEL_MCC_CSE0, + PCI_DID_INTEL_MCC_CSE1, + PCI_DID_INTEL_MCC_CSE2, + PCI_DID_INTEL_MCC_CSE3, + PCI_DID_INTEL_JSP_CSE0, + PCI_DID_INTEL_JSP_CSE1, + PCI_DID_INTEL_JSP_CSE2, + PCI_DID_INTEL_JSP_CSE3, + PCI_DID_INTEL_ADP_P_CSE0, + PCI_DID_INTEL_ADP_P_CSE1, + PCI_DID_INTEL_ADP_P_CSE2, + PCI_DID_INTEL_ADP_P_CSE3, + PCI_DID_INTEL_ADP_S_CSE0, + PCI_DID_INTEL_ADP_S_CSE1, + PCI_DID_INTEL_ADP_S_CSE2, + PCI_DID_INTEL_ADP_S_CSE3, + PCI_DID_INTEL_ADP_M_CSE0, + PCI_DID_INTEL_ADP_M_CSE1, + PCI_DID_INTEL_ADP_M_CSE2, + PCI_DID_INTEL_ADP_M_CSE3, 0, }; static const struct pci_driver cse_driver __pci_driver = { .ops = &cse_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, /* SoC/chipset needs to provide PCI device ID */ .devices = pci_device_ids }; diff --git a/src/soc/intel/common/block/dsp/dsp.c b/src/soc/intel/common/block/dsp/dsp.c index 35e167054a..102ec60594 100644 --- a/src/soc/intel/common/block/dsp/dsp.c +++ b/src/soc/intel/common/block/dsp/dsp.c @@ -13,39 +13,39 @@ static struct device_operations dsp_dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_AUDIO, - PCI_DEVICE_ID_INTEL_CNL_AUDIO, - PCI_DEVICE_ID_INTEL_GLK_AUDIO, - PCI_DEVICE_ID_INTEL_SKL_AUDIO, - PCI_DEVICE_ID_INTEL_CNP_H_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_H_AUDIO, - PCI_DEVICE_ID_INTEL_ICL_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_H_AUDIO, - PCI_DEVICE_ID_INTEL_MCC_AUDIO, - PCI_DEVICE_ID_INTEL_JSP_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_P_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_7, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_8, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_7, + PCI_DID_INTEL_APL_AUDIO, + PCI_DID_INTEL_CNL_AUDIO, + PCI_DID_INTEL_GLK_AUDIO, + PCI_DID_INTEL_SKL_AUDIO, + PCI_DID_INTEL_CNP_H_AUDIO, + PCI_DID_INTEL_CMP_AUDIO, + PCI_DID_INTEL_CMP_H_AUDIO, + PCI_DID_INTEL_ICL_AUDIO, + PCI_DID_INTEL_TGL_AUDIO, + PCI_DID_INTEL_TGL_H_AUDIO, + PCI_DID_INTEL_MCC_AUDIO, + PCI_DID_INTEL_JSP_AUDIO, + PCI_DID_INTEL_ADP_P_AUDIO, + PCI_DID_INTEL_ADP_S_AUDIO_1, + PCI_DID_INTEL_ADP_S_AUDIO_2, + PCI_DID_INTEL_ADP_S_AUDIO_3, + PCI_DID_INTEL_ADP_S_AUDIO_4, + PCI_DID_INTEL_ADP_S_AUDIO_5, + PCI_DID_INTEL_ADP_S_AUDIO_6, + PCI_DID_INTEL_ADP_S_AUDIO_7, + PCI_DID_INTEL_ADP_S_AUDIO_8, + PCI_DID_INTEL_ADP_M_N_AUDIO_1, + PCI_DID_INTEL_ADP_M_N_AUDIO_2, + PCI_DID_INTEL_ADP_M_N_AUDIO_3, + PCI_DID_INTEL_ADP_M_N_AUDIO_4, + PCI_DID_INTEL_ADP_M_N_AUDIO_5, + PCI_DID_INTEL_ADP_M_N_AUDIO_6, + PCI_DID_INTEL_ADP_M_N_AUDIO_7, 0, }; static const struct pci_driver dsp_driver __pci_driver = { .ops = &dsp_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/dtt/dtt.c b/src/soc/intel/common/block/dtt/dtt.c index 58afd744f2..e15e302956 100644 --- a/src/soc/intel/common/block/dtt/dtt.c +++ b/src/soc/intel/common/block/dtt/dtt.c @@ -5,10 +5,10 @@ #include <device/pci_ids.h> static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CML_DTT, - PCI_DEVICE_ID_INTEL_TGL_DTT, - PCI_DEVICE_ID_INTEL_JSL_DTT, - PCI_DEVICE_ID_INTEL_ADL_DTT, + PCI_DID_INTEL_CML_DTT, + PCI_DID_INTEL_TGL_DTT, + PCI_DID_INTEL_JSL_DTT, + PCI_DID_INTEL_ADL_DTT, 0 }; @@ -22,6 +22,6 @@ static struct device_operations dptf_dev_ops = { static const struct pci_driver pch_dptf __pci_driver = { .ops = &dptf_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c index 6118f9960f..84e800db6f 100644 --- a/src/soc/intel/common/block/graphics/graphics.c +++ b/src/soc/intel/common/block/graphics/graphics.c @@ -177,150 +177,150 @@ static const struct device_operations graphics_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_IGD_HD_505, - PCI_DEVICE_ID_INTEL_APL_IGD_HD_500, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_1, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_2, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_3, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_4, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_2, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_3, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_4, - PCI_DEVICE_ID_INTEL_GLK_IGD, - PCI_DEVICE_ID_INTEL_GLK_IGD_EU12, - PCI_DEVICE_ID_INTEL_WHL_GT1_ULT_1, - PCI_DEVICE_ID_INTEL_WHL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_KBL_GT1_SULTM, - PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_1, - PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_2, - PCI_DEVICE_ID_INTEL_KBL_GT1_SSRVM, - PCI_DEVICE_ID_INTEL_KBL_GT1F_DT2, - PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR, - PCI_DEVICE_ID_INTEL_KBL_GT2_SSRVM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SWSTM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM, - PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2, - PCI_DEVICE_ID_INTEL_KBL_GT2F_SULTM, - PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1, - PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2, - PCI_DEVICE_ID_INTEL_KBL_GT4_SHALM, - PCI_DEVICE_ID_INTEL_AML_GT2_ULX, - PCI_DEVICE_ID_INTEL_SKL_GT1F_DT2, - PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM, - PCI_DEVICE_ID_INTEL_SKL_GT2_DT2P1, - PCI_DEVICE_ID_INTEL_SKL_GT2_SULXM, - PCI_DEVICE_ID_INTEL_SKL_GT2_SULTM, - PCI_DEVICE_ID_INTEL_SKL_GT2_SHALM, - PCI_DEVICE_ID_INTEL_SKL_GT2_SWKSM, - PCI_DEVICE_ID_INTEL_SKL_GT3_SULTM, - PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1, - PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_2, - PCI_DEVICE_ID_INTEL_SKL_GT3FE_SSRVM, - PCI_DEVICE_ID_INTEL_SKL_GT4_SHALM, - PCI_DEVICE_ID_INTEL_SKL_GT4E_SWSTM, - PCI_DEVICE_ID_INTEL_CFL_H_GT2, - PCI_DEVICE_ID_INTEL_CFL_H_XEON_GT2, - PCI_DEVICE_ID_INTEL_CFL_S_GT1_1, - PCI_DEVICE_ID_INTEL_CFL_S_GT1_2, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_1, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_2, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_3, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_4, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_5, - PCI_DEVICE_ID_INTEL_ICL_GT0_ULT, - PCI_DEVICE_ID_INTEL_ICL_GT0_5_ULT, - PCI_DEVICE_ID_INTEL_ICL_GT1_ULT, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_0, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_1, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_2, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_2, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_3, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_3, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_4, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_4, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_5, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_5, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_6, - PCI_DEVICE_ID_INTEL_ICL_GT3_ULT, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_1, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_2, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_2, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_3, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_4, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_5, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_6, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_3, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_4, - PCI_DEVICE_ID_INTEL_CML_GT1_ULX_1, - PCI_DEVICE_ID_INTEL_CML_GT2_ULX_1, - PCI_DEVICE_ID_INTEL_CML_GT1_S_1, - PCI_DEVICE_ID_INTEL_CML_GT1_S_2, - PCI_DEVICE_ID_INTEL_CML_GT2_S_1, - PCI_DEVICE_ID_INTEL_CML_GT2_S_2, - PCI_DEVICE_ID_INTEL_CML_GT1_H_1, - PCI_DEVICE_ID_INTEL_CML_GT1_H_2, - PCI_DEVICE_ID_INTEL_CML_GT2_H_1, - PCI_DEVICE_ID_INTEL_CML_GT2_H_2, - PCI_DEVICE_ID_INTEL_CML_GT2_S_G0, - PCI_DEVICE_ID_INTEL_CML_GT2_S_P0, - PCI_DEVICE_ID_INTEL_CML_GT2_H_R0, - PCI_DEVICE_ID_INTEL_CML_GT2_H_R1, - PCI_DEVICE_ID_INTEL_TGL_GT0, - PCI_DEVICE_ID_INTEL_TGL_GT1_H_32, - PCI_DEVICE_ID_INTEL_TGL_GT1_H_16, - PCI_DEVICE_ID_INTEL_TGL_GT2_ULT, - PCI_DEVICE_ID_INTEL_TGL_GT2_ULX, - PCI_DEVICE_ID_INTEL_TGL_GT3_ULT, - PCI_DEVICE_ID_INTEL_TGL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_EHL_GT1_1, - PCI_DEVICE_ID_INTEL_EHL_GT2_1, - PCI_DEVICE_ID_INTEL_EHL_GT1_2, - PCI_DEVICE_ID_INTEL_EHL_GT2_2, - PCI_DEVICE_ID_INTEL_EHL_GT1_2_1, - PCI_DEVICE_ID_INTEL_EHL_GT1_3, - PCI_DEVICE_ID_INTEL_EHL_GT2_3, - PCI_DEVICE_ID_INTEL_JSL_GT1, - PCI_DEVICE_ID_INTEL_JSL_GT2, - PCI_DEVICE_ID_INTEL_JSL_GT3, - PCI_DEVICE_ID_INTEL_JSL_GT4, - PCI_DEVICE_ID_INTEL_ADL_GT0, - PCI_DEVICE_ID_INTEL_ADL_GT1, - PCI_DEVICE_ID_INTEL_ADL_GT1_1, - PCI_DEVICE_ID_INTEL_ADL_GT1_2, - PCI_DEVICE_ID_INTEL_ADL_GT1_3, - PCI_DEVICE_ID_INTEL_ADL_GT1_4, - PCI_DEVICE_ID_INTEL_ADL_GT1_5, - PCI_DEVICE_ID_INTEL_ADL_GT1_6, - PCI_DEVICE_ID_INTEL_ADL_GT1_7, - PCI_DEVICE_ID_INTEL_ADL_GT1_8, - PCI_DEVICE_ID_INTEL_ADL_GT1_9, - PCI_DEVICE_ID_INTEL_ADL_P_GT2, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_1, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_2, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_3, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_4, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_5, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_6, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_7, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_8, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_9, - PCI_DEVICE_ID_INTEL_ADL_S_GT1, - PCI_DEVICE_ID_INTEL_ADL_M_GT1, - PCI_DEVICE_ID_INTEL_ADL_M_GT2, - PCI_DEVICE_ID_INTEL_ADL_M_GT3, - PCI_DEVICE_ID_INTEL_ADL_N_GT1, - PCI_DEVICE_ID_INTEL_ADL_N_GT2, - PCI_DEVICE_ID_INTEL_ADL_N_GT3, + PCI_DID_INTEL_APL_IGD_HD_505, + PCI_DID_INTEL_APL_IGD_HD_500, + PCI_DID_INTEL_CNL_GT2_ULX_1, + PCI_DID_INTEL_CNL_GT2_ULX_2, + PCI_DID_INTEL_CNL_GT2_ULX_3, + PCI_DID_INTEL_CNL_GT2_ULX_4, + PCI_DID_INTEL_CNL_GT2_ULT_1, + PCI_DID_INTEL_CNL_GT2_ULT_2, + PCI_DID_INTEL_CNL_GT2_ULT_3, + PCI_DID_INTEL_CNL_GT2_ULT_4, + PCI_DID_INTEL_GLK_IGD, + PCI_DID_INTEL_GLK_IGD_EU12, + PCI_DID_INTEL_WHL_GT1_ULT_1, + PCI_DID_INTEL_WHL_GT2_ULT_1, + PCI_DID_INTEL_KBL_GT1_SULTM, + PCI_DID_INTEL_KBL_GT1_SHALM_1, + PCI_DID_INTEL_KBL_GT1_SHALM_2, + PCI_DID_INTEL_KBL_GT1_SSRVM, + PCI_DID_INTEL_KBL_GT1F_DT2, + PCI_DID_INTEL_KBL_GT2_SULXM, + PCI_DID_INTEL_KBL_GT2_SULTM, + PCI_DID_INTEL_KBL_GT2_SULTMR, + PCI_DID_INTEL_KBL_GT2_SSRVM, + PCI_DID_INTEL_KBL_GT2_SWSTM, + PCI_DID_INTEL_KBL_GT2_SHALM, + PCI_DID_INTEL_KBL_GT2_DT2P2, + PCI_DID_INTEL_KBL_GT2F_SULTM, + PCI_DID_INTEL_KBL_GT3E_SULTM_1, + PCI_DID_INTEL_KBL_GT3E_SULTM_2, + PCI_DID_INTEL_KBL_GT4_SHALM, + PCI_DID_INTEL_AML_GT2_ULX, + PCI_DID_INTEL_SKL_GT1F_DT2, + PCI_DID_INTEL_SKL_GT1_SULTM, + PCI_DID_INTEL_SKL_GT2_DT2P1, + PCI_DID_INTEL_SKL_GT2_SULXM, + PCI_DID_INTEL_SKL_GT2_SULTM, + PCI_DID_INTEL_SKL_GT2_SHALM, + PCI_DID_INTEL_SKL_GT2_SWKSM, + PCI_DID_INTEL_SKL_GT3_SULTM, + PCI_DID_INTEL_SKL_GT3E_SULTM_1, + PCI_DID_INTEL_SKL_GT3E_SULTM_2, + PCI_DID_INTEL_SKL_GT3FE_SSRVM, + PCI_DID_INTEL_SKL_GT4_SHALM, + PCI_DID_INTEL_SKL_GT4E_SWSTM, + PCI_DID_INTEL_CFL_H_GT2, + PCI_DID_INTEL_CFL_H_XEON_GT2, + PCI_DID_INTEL_CFL_S_GT1_1, + PCI_DID_INTEL_CFL_S_GT1_2, + PCI_DID_INTEL_CFL_S_GT2_1, + PCI_DID_INTEL_CFL_S_GT2_2, + PCI_DID_INTEL_CFL_S_GT2_3, + PCI_DID_INTEL_CFL_S_GT2_4, + PCI_DID_INTEL_CFL_S_GT2_5, + PCI_DID_INTEL_ICL_GT0_ULT, + PCI_DID_INTEL_ICL_GT0_5_ULT, + PCI_DID_INTEL_ICL_GT1_ULT, + PCI_DID_INTEL_ICL_GT2_ULX_0, + PCI_DID_INTEL_ICL_GT2_ULX_1, + PCI_DID_INTEL_ICL_GT2_ULT_1, + PCI_DID_INTEL_ICL_GT2_ULX_2, + PCI_DID_INTEL_ICL_GT2_ULT_2, + PCI_DID_INTEL_ICL_GT2_ULX_3, + PCI_DID_INTEL_ICL_GT2_ULT_3, + PCI_DID_INTEL_ICL_GT2_ULX_4, + PCI_DID_INTEL_ICL_GT2_ULT_4, + PCI_DID_INTEL_ICL_GT2_ULX_5, + PCI_DID_INTEL_ICL_GT2_ULT_5, + PCI_DID_INTEL_ICL_GT2_ULX_6, + PCI_DID_INTEL_ICL_GT3_ULT, + PCI_DID_INTEL_CML_GT1_ULT_1, + PCI_DID_INTEL_CML_GT1_ULT_2, + PCI_DID_INTEL_CML_GT2_ULT_1, + PCI_DID_INTEL_CML_GT2_ULT_2, + PCI_DID_INTEL_CML_GT1_ULT_3, + PCI_DID_INTEL_CML_GT1_ULT_4, + PCI_DID_INTEL_CML_GT2_ULT_5, + PCI_DID_INTEL_CML_GT2_ULT_6, + PCI_DID_INTEL_CML_GT2_ULT_3, + PCI_DID_INTEL_CML_GT2_ULT_4, + PCI_DID_INTEL_CML_GT1_ULX_1, + PCI_DID_INTEL_CML_GT2_ULX_1, + PCI_DID_INTEL_CML_GT1_S_1, + PCI_DID_INTEL_CML_GT1_S_2, + PCI_DID_INTEL_CML_GT2_S_1, + PCI_DID_INTEL_CML_GT2_S_2, + PCI_DID_INTEL_CML_GT1_H_1, + PCI_DID_INTEL_CML_GT1_H_2, + PCI_DID_INTEL_CML_GT2_H_1, + PCI_DID_INTEL_CML_GT2_H_2, + PCI_DID_INTEL_CML_GT2_S_G0, + PCI_DID_INTEL_CML_GT2_S_P0, + PCI_DID_INTEL_CML_GT2_H_R0, + PCI_DID_INTEL_CML_GT2_H_R1, + PCI_DID_INTEL_TGL_GT0, + PCI_DID_INTEL_TGL_GT1_H_32, + PCI_DID_INTEL_TGL_GT1_H_16, + PCI_DID_INTEL_TGL_GT2_ULT, + PCI_DID_INTEL_TGL_GT2_ULX, + PCI_DID_INTEL_TGL_GT3_ULT, + PCI_DID_INTEL_TGL_GT2_ULT_1, + PCI_DID_INTEL_EHL_GT1_1, + PCI_DID_INTEL_EHL_GT2_1, + PCI_DID_INTEL_EHL_GT1_2, + PCI_DID_INTEL_EHL_GT2_2, + PCI_DID_INTEL_EHL_GT1_2_1, + PCI_DID_INTEL_EHL_GT1_3, + PCI_DID_INTEL_EHL_GT2_3, + PCI_DID_INTEL_JSL_GT1, + PCI_DID_INTEL_JSL_GT2, + PCI_DID_INTEL_JSL_GT3, + PCI_DID_INTEL_JSL_GT4, + PCI_DID_INTEL_ADL_GT0, + PCI_DID_INTEL_ADL_GT1, + PCI_DID_INTEL_ADL_GT1_1, + PCI_DID_INTEL_ADL_GT1_2, + PCI_DID_INTEL_ADL_GT1_3, + PCI_DID_INTEL_ADL_GT1_4, + PCI_DID_INTEL_ADL_GT1_5, + PCI_DID_INTEL_ADL_GT1_6, + PCI_DID_INTEL_ADL_GT1_7, + PCI_DID_INTEL_ADL_GT1_8, + PCI_DID_INTEL_ADL_GT1_9, + PCI_DID_INTEL_ADL_P_GT2, + PCI_DID_INTEL_ADL_P_GT2_1, + PCI_DID_INTEL_ADL_P_GT2_2, + PCI_DID_INTEL_ADL_P_GT2_3, + PCI_DID_INTEL_ADL_P_GT2_4, + PCI_DID_INTEL_ADL_P_GT2_5, + PCI_DID_INTEL_ADL_P_GT2_6, + PCI_DID_INTEL_ADL_P_GT2_7, + PCI_DID_INTEL_ADL_P_GT2_8, + PCI_DID_INTEL_ADL_P_GT2_9, + PCI_DID_INTEL_ADL_S_GT1, + PCI_DID_INTEL_ADL_M_GT1, + PCI_DID_INTEL_ADL_M_GT2, + PCI_DID_INTEL_ADL_M_GT3, + PCI_DID_INTEL_ADL_N_GT1, + PCI_DID_INTEL_ADL_N_GT2, + PCI_DID_INTEL_ADL_N_GT3, 0, }; static const struct pci_driver graphics_driver __pci_driver = { .ops = &graphics_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c index 1afc16c787..1311bcd6b2 100644 --- a/src/soc/intel/common/block/hda/hda.c +++ b/src/soc/intel/common/block/hda/hda.c @@ -21,42 +21,42 @@ static struct device_operations hda_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SKL_AUDIO, - PCI_DEVICE_ID_INTEL_SKL_H_AUDIO, - PCI_DEVICE_ID_INTEL_LWB_AUDIO, - PCI_DEVICE_ID_INTEL_LWB_AUDIO_SUPER, - PCI_DEVICE_ID_INTEL_KBL_AUDIO, - PCI_DEVICE_ID_INTEL_CNL_AUDIO, - PCI_DEVICE_ID_INTEL_CNP_H_AUDIO, - PCI_DEVICE_ID_INTEL_ICL_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_H_AUDIO, - PCI_DEVICE_ID_INTEL_BSW_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_H_AUDIO, - PCI_DEVICE_ID_INTEL_MCC_AUDIO, - PCI_DEVICE_ID_INTEL_JSP_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_P_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_7, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_8, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_7, + PCI_DID_INTEL_SKL_AUDIO, + PCI_DID_INTEL_SKL_H_AUDIO, + PCI_DID_INTEL_LWB_AUDIO, + PCI_DID_INTEL_LWB_AUDIO_SUPER, + PCI_DID_INTEL_KBL_AUDIO, + PCI_DID_INTEL_CNL_AUDIO, + PCI_DID_INTEL_CNP_H_AUDIO, + PCI_DID_INTEL_ICL_AUDIO, + PCI_DID_INTEL_CMP_AUDIO, + PCI_DID_INTEL_CMP_H_AUDIO, + PCI_DID_INTEL_BSW_AUDIO, + PCI_DID_INTEL_TGL_AUDIO, + PCI_DID_INTEL_TGL_H_AUDIO, + PCI_DID_INTEL_MCC_AUDIO, + PCI_DID_INTEL_JSP_AUDIO, + PCI_DID_INTEL_ADP_P_AUDIO, + PCI_DID_INTEL_ADP_S_AUDIO_1, + PCI_DID_INTEL_ADP_S_AUDIO_2, + PCI_DID_INTEL_ADP_S_AUDIO_3, + PCI_DID_INTEL_ADP_S_AUDIO_4, + PCI_DID_INTEL_ADP_S_AUDIO_5, + PCI_DID_INTEL_ADP_S_AUDIO_6, + PCI_DID_INTEL_ADP_S_AUDIO_7, + PCI_DID_INTEL_ADP_S_AUDIO_8, + PCI_DID_INTEL_ADP_M_N_AUDIO_1, + PCI_DID_INTEL_ADP_M_N_AUDIO_2, + PCI_DID_INTEL_ADP_M_N_AUDIO_3, + PCI_DID_INTEL_ADP_M_N_AUDIO_4, + PCI_DID_INTEL_ADP_M_N_AUDIO_5, + PCI_DID_INTEL_ADP_M_N_AUDIO_6, + PCI_DID_INTEL_ADP_M_N_AUDIO_7, 0 }; static const struct pci_driver pch_hda __pci_driver = { .ops = &hda_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index c1d75e0fa7..ba10b2c5bb 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -175,113 +175,113 @@ static struct device_operations i2c_dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_I2C0, - PCI_DEVICE_ID_INTEL_SPT_I2C1, - PCI_DEVICE_ID_INTEL_SPT_I2C2, - PCI_DEVICE_ID_INTEL_SPT_I2C3, - PCI_DEVICE_ID_INTEL_SPT_I2C4, - PCI_DEVICE_ID_INTEL_SPT_I2C5, - PCI_DEVICE_ID_INTEL_UPT_H_I2C0, - PCI_DEVICE_ID_INTEL_UPT_H_I2C1, - PCI_DEVICE_ID_INTEL_UPT_H_I2C2, - PCI_DEVICE_ID_INTEL_UPT_H_I2C3, - PCI_DEVICE_ID_INTEL_APL_I2C0, - PCI_DEVICE_ID_INTEL_APL_I2C1, - PCI_DEVICE_ID_INTEL_APL_I2C2, - PCI_DEVICE_ID_INTEL_APL_I2C3, - PCI_DEVICE_ID_INTEL_APL_I2C4, - PCI_DEVICE_ID_INTEL_APL_I2C5, - PCI_DEVICE_ID_INTEL_APL_I2C6, - PCI_DEVICE_ID_INTEL_APL_I2C7, - PCI_DEVICE_ID_INTEL_CNL_I2C0, - PCI_DEVICE_ID_INTEL_CNL_I2C1, - PCI_DEVICE_ID_INTEL_CNL_I2C2, - PCI_DEVICE_ID_INTEL_CNL_I2C3, - PCI_DEVICE_ID_INTEL_CNL_I2C4, - PCI_DEVICE_ID_INTEL_CNL_I2C5, - PCI_DEVICE_ID_INTEL_GLK_I2C0, - PCI_DEVICE_ID_INTEL_GLK_I2C1, - PCI_DEVICE_ID_INTEL_GLK_I2C2, - PCI_DEVICE_ID_INTEL_GLK_I2C3, - PCI_DEVICE_ID_INTEL_GLK_I2C4, - PCI_DEVICE_ID_INTEL_GLK_I2C5, - PCI_DEVICE_ID_INTEL_GLK_I2C6, - PCI_DEVICE_ID_INTEL_GLK_I2C7, - PCI_DEVICE_ID_INTEL_CNP_H_I2C0, - PCI_DEVICE_ID_INTEL_CNP_H_I2C1, - PCI_DEVICE_ID_INTEL_CNP_H_I2C2, - PCI_DEVICE_ID_INTEL_CNP_H_I2C3, - PCI_DEVICE_ID_INTEL_ICP_I2C0, - PCI_DEVICE_ID_INTEL_ICP_I2C1, - PCI_DEVICE_ID_INTEL_ICP_I2C2, - PCI_DEVICE_ID_INTEL_ICP_I2C3, - PCI_DEVICE_ID_INTEL_ICP_I2C4, - PCI_DEVICE_ID_INTEL_ICP_I2C5, - PCI_DEVICE_ID_INTEL_CMP_I2C0, - PCI_DEVICE_ID_INTEL_CMP_I2C1, - PCI_DEVICE_ID_INTEL_CMP_I2C2, - PCI_DEVICE_ID_INTEL_CMP_I2C3, - PCI_DEVICE_ID_INTEL_CMP_I2C4, - PCI_DEVICE_ID_INTEL_CMP_I2C5, - PCI_DEVICE_ID_INTEL_CMP_H_I2C0, - PCI_DEVICE_ID_INTEL_CMP_H_I2C1, - PCI_DEVICE_ID_INTEL_CMP_H_I2C2, - PCI_DEVICE_ID_INTEL_CMP_H_I2C3, - PCI_DEVICE_ID_INTEL_TGP_I2C0, - PCI_DEVICE_ID_INTEL_TGP_I2C1, - PCI_DEVICE_ID_INTEL_TGP_I2C2, - PCI_DEVICE_ID_INTEL_TGP_I2C3, - PCI_DEVICE_ID_INTEL_TGP_I2C4, - PCI_DEVICE_ID_INTEL_TGP_I2C5, - PCI_DEVICE_ID_INTEL_TGP_I2C6, - PCI_DEVICE_ID_INTEL_TGP_I2C7, - PCI_DEVICE_ID_INTEL_TGP_H_I2C0, - PCI_DEVICE_ID_INTEL_TGP_H_I2C1, - PCI_DEVICE_ID_INTEL_TGP_H_I2C2, - PCI_DEVICE_ID_INTEL_TGP_H_I2C3, - PCI_DEVICE_ID_INTEL_TGP_H_I2C4, - PCI_DEVICE_ID_INTEL_TGP_H_I2C5, - PCI_DEVICE_ID_INTEL_TGP_H_I2C6, - PCI_DEVICE_ID_INTEL_MCC_I2C0, - PCI_DEVICE_ID_INTEL_MCC_I2C1, - PCI_DEVICE_ID_INTEL_MCC_I2C2, - PCI_DEVICE_ID_INTEL_MCC_I2C3, - PCI_DEVICE_ID_INTEL_MCC_I2C4, - PCI_DEVICE_ID_INTEL_MCC_I2C5, - PCI_DEVICE_ID_INTEL_MCC_I2C6, - PCI_DEVICE_ID_INTEL_MCC_I2C7, - PCI_DEVICE_ID_INTEL_JSP_I2C0, - PCI_DEVICE_ID_INTEL_JSP_I2C1, - PCI_DEVICE_ID_INTEL_JSP_I2C2, - PCI_DEVICE_ID_INTEL_JSP_I2C3, - PCI_DEVICE_ID_INTEL_JSP_I2C4, - PCI_DEVICE_ID_INTEL_JSP_I2C5, - PCI_DEVICE_ID_INTEL_ADP_P_I2C0, - PCI_DEVICE_ID_INTEL_ADP_P_I2C1, - PCI_DEVICE_ID_INTEL_ADP_P_I2C2, - PCI_DEVICE_ID_INTEL_ADP_P_I2C3, - PCI_DEVICE_ID_INTEL_ADP_P_I2C4, - PCI_DEVICE_ID_INTEL_ADP_P_I2C5, - PCI_DEVICE_ID_INTEL_ADP_P_I2C6, - PCI_DEVICE_ID_INTEL_ADP_P_I2C7, - PCI_DEVICE_ID_INTEL_ADP_S_I2C0, - PCI_DEVICE_ID_INTEL_ADP_S_I2C1, - PCI_DEVICE_ID_INTEL_ADP_S_I2C2, - PCI_DEVICE_ID_INTEL_ADP_S_I2C3, - PCI_DEVICE_ID_INTEL_ADP_S_I2C4, - PCI_DEVICE_ID_INTEL_ADP_S_I2C5, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C0, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C1, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C2, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C3, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C4, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C5, + PCI_DID_INTEL_SPT_I2C0, + PCI_DID_INTEL_SPT_I2C1, + PCI_DID_INTEL_SPT_I2C2, + PCI_DID_INTEL_SPT_I2C3, + PCI_DID_INTEL_SPT_I2C4, + PCI_DID_INTEL_SPT_I2C5, + PCI_DID_INTEL_UPT_H_I2C0, + PCI_DID_INTEL_UPT_H_I2C1, + PCI_DID_INTEL_UPT_H_I2C2, + PCI_DID_INTEL_UPT_H_I2C3, + PCI_DID_INTEL_APL_I2C0, + PCI_DID_INTEL_APL_I2C1, + PCI_DID_INTEL_APL_I2C2, + PCI_DID_INTEL_APL_I2C3, + PCI_DID_INTEL_APL_I2C4, + PCI_DID_INTEL_APL_I2C5, + PCI_DID_INTEL_APL_I2C6, + PCI_DID_INTEL_APL_I2C7, + PCI_DID_INTEL_CNL_I2C0, + PCI_DID_INTEL_CNL_I2C1, + PCI_DID_INTEL_CNL_I2C2, + PCI_DID_INTEL_CNL_I2C3, + PCI_DID_INTEL_CNL_I2C4, + PCI_DID_INTEL_CNL_I2C5, + PCI_DID_INTEL_GLK_I2C0, + PCI_DID_INTEL_GLK_I2C1, + PCI_DID_INTEL_GLK_I2C2, + PCI_DID_INTEL_GLK_I2C3, + PCI_DID_INTEL_GLK_I2C4, + PCI_DID_INTEL_GLK_I2C5, + PCI_DID_INTEL_GLK_I2C6, + PCI_DID_INTEL_GLK_I2C7, + PCI_DID_INTEL_CNP_H_I2C0, + PCI_DID_INTEL_CNP_H_I2C1, + PCI_DID_INTEL_CNP_H_I2C2, + PCI_DID_INTEL_CNP_H_I2C3, + PCI_DID_INTEL_ICP_I2C0, + PCI_DID_INTEL_ICP_I2C1, + PCI_DID_INTEL_ICP_I2C2, + PCI_DID_INTEL_ICP_I2C3, + PCI_DID_INTEL_ICP_I2C4, + PCI_DID_INTEL_ICP_I2C5, + PCI_DID_INTEL_CMP_I2C0, + PCI_DID_INTEL_CMP_I2C1, + PCI_DID_INTEL_CMP_I2C2, + PCI_DID_INTEL_CMP_I2C3, + PCI_DID_INTEL_CMP_I2C4, + PCI_DID_INTEL_CMP_I2C5, + PCI_DID_INTEL_CMP_H_I2C0, + PCI_DID_INTEL_CMP_H_I2C1, + PCI_DID_INTEL_CMP_H_I2C2, + PCI_DID_INTEL_CMP_H_I2C3, + PCI_DID_INTEL_TGP_I2C0, + PCI_DID_INTEL_TGP_I2C1, + PCI_DID_INTEL_TGP_I2C2, + PCI_DID_INTEL_TGP_I2C3, + PCI_DID_INTEL_TGP_I2C4, + PCI_DID_INTEL_TGP_I2C5, + PCI_DID_INTEL_TGP_I2C6, + PCI_DID_INTEL_TGP_I2C7, + PCI_DID_INTEL_TGP_H_I2C0, + PCI_DID_INTEL_TGP_H_I2C1, + PCI_DID_INTEL_TGP_H_I2C2, + PCI_DID_INTEL_TGP_H_I2C3, + PCI_DID_INTEL_TGP_H_I2C4, + PCI_DID_INTEL_TGP_H_I2C5, + PCI_DID_INTEL_TGP_H_I2C6, + PCI_DID_INTEL_MCC_I2C0, + PCI_DID_INTEL_MCC_I2C1, + PCI_DID_INTEL_MCC_I2C2, + PCI_DID_INTEL_MCC_I2C3, + PCI_DID_INTEL_MCC_I2C4, + PCI_DID_INTEL_MCC_I2C5, + PCI_DID_INTEL_MCC_I2C6, + PCI_DID_INTEL_MCC_I2C7, + PCI_DID_INTEL_JSP_I2C0, + PCI_DID_INTEL_JSP_I2C1, + PCI_DID_INTEL_JSP_I2C2, + PCI_DID_INTEL_JSP_I2C3, + PCI_DID_INTEL_JSP_I2C4, + PCI_DID_INTEL_JSP_I2C5, + PCI_DID_INTEL_ADP_P_I2C0, + PCI_DID_INTEL_ADP_P_I2C1, + PCI_DID_INTEL_ADP_P_I2C2, + PCI_DID_INTEL_ADP_P_I2C3, + PCI_DID_INTEL_ADP_P_I2C4, + PCI_DID_INTEL_ADP_P_I2C5, + PCI_DID_INTEL_ADP_P_I2C6, + PCI_DID_INTEL_ADP_P_I2C7, + PCI_DID_INTEL_ADP_S_I2C0, + PCI_DID_INTEL_ADP_S_I2C1, + PCI_DID_INTEL_ADP_S_I2C2, + PCI_DID_INTEL_ADP_S_I2C3, + PCI_DID_INTEL_ADP_S_I2C4, + PCI_DID_INTEL_ADP_S_I2C5, + PCI_DID_INTEL_ADP_M_N_I2C0, + PCI_DID_INTEL_ADP_M_N_I2C1, + PCI_DID_INTEL_ADP_M_N_I2C2, + PCI_DID_INTEL_ADP_M_N_I2C3, + PCI_DID_INTEL_ADP_M_N_I2C4, + PCI_DID_INTEL_ADP_M_N_I2C5, 0, }; static const struct pci_driver pch_i2c __pci_driver = { .ops = &i2c_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; #endif diff --git a/src/soc/intel/common/block/ipu/ipu.c b/src/soc/intel/common/block/ipu/ipu.c index a9d2bc093b..ead4094af3 100644 --- a/src/soc/intel/common/block/ipu/ipu.c +++ b/src/soc/intel/common/block/ipu/ipu.c @@ -12,16 +12,16 @@ struct device_operations ipu_pci_ops = { }; static const uint16_t pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGL_IPU, - PCI_DEVICE_ID_INTEL_TGL_H_IPU, - PCI_DEVICE_ID_INTEL_JSL_IPU, - PCI_DEVICE_ID_INTEL_ADL_IPU, - PCI_DEVICE_ID_INTEL_ADL_N_IPU, + PCI_DID_INTEL_TGL_IPU, + PCI_DID_INTEL_TGL_H_IPU, + PCI_DID_INTEL_JSL_IPU, + PCI_DID_INTEL_ADL_IPU, + PCI_DID_INTEL_ADL_N_IPU, 0 }; static const struct pci_driver intel_ipu __pci_driver = { .ops = &ipu_pci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 9706f92976..cd5cbe6f55 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -106,249 +106,249 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_LP_SAMPLE, - PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE, - PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM, - PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM, - PCI_DEVICE_ID_INTEL_SPT_H_H110, - PCI_DEVICE_ID_INTEL_SPT_H_H170, - PCI_DEVICE_ID_INTEL_SPT_H_Z170, - PCI_DEVICE_ID_INTEL_SPT_H_Q170, - PCI_DEVICE_ID_INTEL_SPT_H_Q150, - PCI_DEVICE_ID_INTEL_SPT_H_B150, - PCI_DEVICE_ID_INTEL_SPT_H_C236, - PCI_DEVICE_ID_INTEL_SPT_H_C232, - PCI_DEVICE_ID_INTEL_SPT_H_QM170, - PCI_DEVICE_ID_INTEL_SPT_H_HM170, - PCI_DEVICE_ID_INTEL_SPT_H_CM236, - PCI_DEVICE_ID_INTEL_SPT_H_HM175, - PCI_DEVICE_ID_INTEL_SPT_H_QM175, - PCI_DEVICE_ID_INTEL_SPT_H_CM238, - PCI_DEVICE_ID_INTEL_LWB_C621, - PCI_DEVICE_ID_INTEL_LWB_C622, - PCI_DEVICE_ID_INTEL_LWB_C624, - PCI_DEVICE_ID_INTEL_LWB_C625, - PCI_DEVICE_ID_INTEL_LWB_C626, - PCI_DEVICE_ID_INTEL_LWB_C627, - PCI_DEVICE_ID_INTEL_LWB_C628, - PCI_DEVICE_ID_INTEL_LWB_C629, - PCI_DEVICE_ID_INTEL_LWB_C621A, - PCI_DEVICE_ID_INTEL_LWB_C627A, - PCI_DEVICE_ID_INTEL_LWB_C629A, - PCI_DEVICE_ID_INTEL_LWB_C624_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C627_SUPER_1, - PCI_DEVICE_ID_INTEL_LWB_C621_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C627_SUPER_2, - PCI_DEVICE_ID_INTEL_LWB_C628_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C621A_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C627A_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C629A_SUPER, - PCI_DEVICE_ID_INTEL_EMB_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_Q270, - PCI_DEVICE_ID_INTEL_UPT_H_H270, - PCI_DEVICE_ID_INTEL_UPT_H_Z270, - PCI_DEVICE_ID_INTEL_UPT_H_Q250, - PCI_DEVICE_ID_INTEL_UPT_H_B250, - PCI_DEVICE_ID_INTEL_UPT_H_Z370, - PCI_DEVICE_ID_INTEL_UPT_H_H310C, - PCI_DEVICE_ID_INTEL_UPT_H_B365, - PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22, - PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22, - PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE_HDCP22, - PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU, - PCI_DEVICE_ID_INTEL_UPT_LP_U_BASE, - PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM, - PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM, - PCI_DEVICE_ID_INTEL_APL_LPC, - PCI_DEVICE_ID_INTEL_GLK_LPC, - PCI_DEVICE_ID_INTEL_GLK_ESPI, - PCI_DEVICE_ID_INTEL_CNL_BASE_U_LPC, - PCI_DEVICE_ID_INTEL_CNL_U_PREMIUM_LPC, - PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_H310, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_H370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_Z390, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_B360, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_C246, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_C242, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_HM370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_CM246, - PCI_DEVICE_ID_INTEL_ICL_BASE_U_ESPI, - PCI_DEVICE_ID_INTEL_ICL_BASE_Y_ESPI, - PCI_DEVICE_ID_INTEL_ICL_U_PREMIUM_ESPI, - PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI, - PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI_REV0, - PCI_DEVICE_ID_INTEL_ICL_SUPER_Y_ESPI, - PCI_DEVICE_ID_INTEL_ICL_Y_PREMIUM_ESPI, - PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC, - PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC, - PCI_DEVICE_ID_INTEL_CMP_PREMIUM_U_LPC, - PCI_DEVICE_ID_INTEL_CMP_BASE_U_LPC, - PCI_DEVICE_ID_INTEL_CMP_SUPER_Y_LPC, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_HM470, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_WM490, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_QM480, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_W480, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_H470, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_Z490, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_Q470, - PCI_DEVICE_ID_INTEL_TGP_ESPI_0, - PCI_DEVICE_ID_INTEL_TGP_SUPER_U_ESPI, - PCI_DEVICE_ID_INTEL_TGP_PREMIUM_U_ESPI, - PCI_DEVICE_ID_INTEL_TGP_BASE_U_ESPI, - PCI_DEVICE_ID_INTEL_TGP_ESPI_1, - PCI_DEVICE_ID_INTEL_TGP_ESPI_2, - PCI_DEVICE_ID_INTEL_TGP_SUPER_Y_ESPI, - PCI_DEVICE_ID_INTEL_TGP_PREMIUM_Y_ESPI, - PCI_DEVICE_ID_INTEL_TGP_ESPI_3, - PCI_DEVICE_ID_INTEL_TGP_ESPI_4, - PCI_DEVICE_ID_INTEL_TGP_ESPI_5, - PCI_DEVICE_ID_INTEL_TGP_ESPI_6, - PCI_DEVICE_ID_INTEL_TGP_ESPI_7, - PCI_DEVICE_ID_INTEL_TGP_ESPI_8, - PCI_DEVICE_ID_INTEL_TGP_ESPI_9, - PCI_DEVICE_ID_INTEL_TGP_ESPI_10, - PCI_DEVICE_ID_INTEL_TGP_ESPI_11, - PCI_DEVICE_ID_INTEL_TGP_ESPI_12, - PCI_DEVICE_ID_INTEL_TGP_ESPI_13, - PCI_DEVICE_ID_INTEL_TGP_ESPI_14, - PCI_DEVICE_ID_INTEL_TGP_ESPI_15, - PCI_DEVICE_ID_INTEL_TGP_ESPI_16, - PCI_DEVICE_ID_INTEL_TGP_ESPI_17, - PCI_DEVICE_ID_INTEL_TGP_ESPI_18, - PCI_DEVICE_ID_INTEL_TGP_ESPI_19, - PCI_DEVICE_ID_INTEL_TGP_ESPI_20, - PCI_DEVICE_ID_INTEL_TGP_ESPI_21, - PCI_DEVICE_ID_INTEL_TGP_ESPI_22, - PCI_DEVICE_ID_INTEL_TGP_ESPI_23, - PCI_DEVICE_ID_INTEL_TGP_ESPI_24, - PCI_DEVICE_ID_INTEL_TGP_ESPI_25, - PCI_DEVICE_ID_INTEL_TGP_ESPI_26, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_B560, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H510, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H570, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Q570, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_W580, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Z590, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_HM570, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_QM580, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_WM590, - PCI_DEVICE_ID_INTEL_MCC_ESPI_0, - PCI_DEVICE_ID_INTEL_MCC_ESPI_1, - PCI_DEVICE_ID_INTEL_MCC_BASE_ESPI, - PCI_DEVICE_ID_INTEL_MCC_PREMIUM_ESPI, - PCI_DEVICE_ID_INTEL_MCC_SUPER_ESPI, - PCI_DEVICE_ID_INTEL_MCC_ESPI_2, - PCI_DEVICE_ID_INTEL_MCC_ESPI_3, - PCI_DEVICE_ID_INTEL_MCC_ESPI_4, - PCI_DEVICE_ID_INTEL_JSP_SUPER_ESPI, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_0, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_1, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_2, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_3, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_4, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_5, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_6, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_7, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_8, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_9, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_10, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_11, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_12, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_13, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_14, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_15, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_16, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_17, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_18, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_19, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_20, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_21, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_22, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_23, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_24, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_25, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_26, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_27, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_28, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_29, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_30, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_31, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_32, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_33, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_0, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_1, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_2, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_3, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_4, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_5, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_6, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_7, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_8, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_9, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_10, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_11, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_12, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_13, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_14, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_15, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_16, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_17, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_18, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_19, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_20, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_21, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_22, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_23, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_24, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_25, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_26, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_27, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_28, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_29, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_30, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_31, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_32, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_0, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_1, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_2, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_3, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_4, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_5, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_7, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_8, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_9, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_10, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_11, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_12, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_13, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_14, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_15, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_16, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_17, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_18, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_19, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_20, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_21, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_22, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_23, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_24, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_25, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_26, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_27, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_28, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_29, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_30, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_31, - PCI_DEVICE_ID_INTEL_ADP_M_ESPI_32, - PCI_DEVICE_ID_INTEL_SPR_ESPI_1, + PCI_DID_INTEL_SPT_LP_SAMPLE, + PCI_DID_INTEL_SPT_LP_U_BASE, + PCI_DID_INTEL_SPT_LP_U_PREMIUM, + PCI_DID_INTEL_SPT_LP_Y_PREMIUM, + PCI_DID_INTEL_SPT_H_H110, + PCI_DID_INTEL_SPT_H_H170, + PCI_DID_INTEL_SPT_H_Z170, + PCI_DID_INTEL_SPT_H_Q170, + PCI_DID_INTEL_SPT_H_Q150, + PCI_DID_INTEL_SPT_H_B150, + PCI_DID_INTEL_SPT_H_C236, + PCI_DID_INTEL_SPT_H_C232, + PCI_DID_INTEL_SPT_H_QM170, + PCI_DID_INTEL_SPT_H_HM170, + PCI_DID_INTEL_SPT_H_CM236, + PCI_DID_INTEL_SPT_H_HM175, + PCI_DID_INTEL_SPT_H_QM175, + PCI_DID_INTEL_SPT_H_CM238, + PCI_DID_INTEL_LWB_C621, + PCI_DID_INTEL_LWB_C622, + PCI_DID_INTEL_LWB_C624, + PCI_DID_INTEL_LWB_C625, + PCI_DID_INTEL_LWB_C626, + PCI_DID_INTEL_LWB_C627, + PCI_DID_INTEL_LWB_C628, + PCI_DID_INTEL_LWB_C629, + PCI_DID_INTEL_LWB_C621A, + PCI_DID_INTEL_LWB_C627A, + PCI_DID_INTEL_LWB_C629A, + PCI_DID_INTEL_LWB_C624_SUPER, + PCI_DID_INTEL_LWB_C627_SUPER_1, + PCI_DID_INTEL_LWB_C621_SUPER, + PCI_DID_INTEL_LWB_C627_SUPER_2, + PCI_DID_INTEL_LWB_C628_SUPER, + PCI_DID_INTEL_LWB_C621A_SUPER, + PCI_DID_INTEL_LWB_C627A_SUPER, + PCI_DID_INTEL_LWB_C629A_SUPER, + PCI_DID_INTEL_EMB_SUPER, + PCI_DID_INTEL_UPT_H_Q270, + PCI_DID_INTEL_UPT_H_H270, + PCI_DID_INTEL_UPT_H_Z270, + PCI_DID_INTEL_UPT_H_Q250, + PCI_DID_INTEL_UPT_H_B250, + PCI_DID_INTEL_UPT_H_Z370, + PCI_DID_INTEL_UPT_H_H310C, + PCI_DID_INTEL_UPT_H_B365, + PCI_DID_INTEL_SPT_LP_Y_PREMIUM_HDCP22, + PCI_DID_INTEL_SPT_LP_U_PREMIUM_HDCP22, + PCI_DID_INTEL_SPT_LP_U_BASE_HDCP22, + PCI_DID_INTEL_UPT_LP_SUPER_SKU, + PCI_DID_INTEL_UPT_LP_U_BASE, + PCI_DID_INTEL_UPT_LP_U_PREMIUM, + PCI_DID_INTEL_UPT_LP_Y_PREMIUM, + PCI_DID_INTEL_APL_LPC, + PCI_DID_INTEL_GLK_LPC, + PCI_DID_INTEL_GLK_ESPI, + PCI_DID_INTEL_CNL_BASE_U_LPC, + PCI_DID_INTEL_CNL_U_PREMIUM_LPC, + PCI_DID_INTEL_CNL_Y_PREMIUM_LPC, + PCI_DID_INTEL_CNP_H_LPC_H310, + PCI_DID_INTEL_CNP_H_LPC_H370, + PCI_DID_INTEL_CNP_H_LPC_Z390, + PCI_DID_INTEL_CNP_H_LPC_Q370, + PCI_DID_INTEL_CNP_H_LPC_B360, + PCI_DID_INTEL_CNP_H_LPC_C246, + PCI_DID_INTEL_CNP_H_LPC_C242, + PCI_DID_INTEL_CNP_H_LPC_QM370, + PCI_DID_INTEL_CNP_H_LPC_HM370, + PCI_DID_INTEL_CNP_H_LPC_CM246, + PCI_DID_INTEL_ICL_BASE_U_ESPI, + PCI_DID_INTEL_ICL_BASE_Y_ESPI, + PCI_DID_INTEL_ICL_U_PREMIUM_ESPI, + PCI_DID_INTEL_ICL_U_SUPER_U_ESPI, + PCI_DID_INTEL_ICL_U_SUPER_U_ESPI_REV0, + PCI_DID_INTEL_ICL_SUPER_Y_ESPI, + PCI_DID_INTEL_ICL_Y_PREMIUM_ESPI, + PCI_DID_INTEL_CMP_SUPER_U_LPC, + PCI_DID_INTEL_CMP_PREMIUM_Y_LPC, + PCI_DID_INTEL_CMP_PREMIUM_U_LPC, + PCI_DID_INTEL_CMP_BASE_U_LPC, + PCI_DID_INTEL_CMP_SUPER_Y_LPC, + PCI_DID_INTEL_CMP_H_LPC_HM470, + PCI_DID_INTEL_CMP_H_LPC_WM490, + PCI_DID_INTEL_CMP_H_LPC_QM480, + PCI_DID_INTEL_CMP_H_LPC_W480, + PCI_DID_INTEL_CMP_H_LPC_H470, + PCI_DID_INTEL_CMP_H_LPC_Z490, + PCI_DID_INTEL_CMP_H_LPC_Q470, + PCI_DID_INTEL_TGP_ESPI_0, + PCI_DID_INTEL_TGP_SUPER_U_ESPI, + PCI_DID_INTEL_TGP_PREMIUM_U_ESPI, + PCI_DID_INTEL_TGP_BASE_U_ESPI, + PCI_DID_INTEL_TGP_ESPI_1, + PCI_DID_INTEL_TGP_ESPI_2, + PCI_DID_INTEL_TGP_SUPER_Y_ESPI, + PCI_DID_INTEL_TGP_PREMIUM_Y_ESPI, + PCI_DID_INTEL_TGP_ESPI_3, + PCI_DID_INTEL_TGP_ESPI_4, + PCI_DID_INTEL_TGP_ESPI_5, + PCI_DID_INTEL_TGP_ESPI_6, + PCI_DID_INTEL_TGP_ESPI_7, + PCI_DID_INTEL_TGP_ESPI_8, + PCI_DID_INTEL_TGP_ESPI_9, + PCI_DID_INTEL_TGP_ESPI_10, + PCI_DID_INTEL_TGP_ESPI_11, + PCI_DID_INTEL_TGP_ESPI_12, + PCI_DID_INTEL_TGP_ESPI_13, + PCI_DID_INTEL_TGP_ESPI_14, + PCI_DID_INTEL_TGP_ESPI_15, + PCI_DID_INTEL_TGP_ESPI_16, + PCI_DID_INTEL_TGP_ESPI_17, + PCI_DID_INTEL_TGP_ESPI_18, + PCI_DID_INTEL_TGP_ESPI_19, + PCI_DID_INTEL_TGP_ESPI_20, + PCI_DID_INTEL_TGP_ESPI_21, + PCI_DID_INTEL_TGP_ESPI_22, + PCI_DID_INTEL_TGP_ESPI_23, + PCI_DID_INTEL_TGP_ESPI_24, + PCI_DID_INTEL_TGP_ESPI_25, + PCI_DID_INTEL_TGP_ESPI_26, + PCI_DID_INTEL_TGP_H_ESPI_B560, + PCI_DID_INTEL_TGP_H_ESPI_H510, + PCI_DID_INTEL_TGP_H_ESPI_H570, + PCI_DID_INTEL_TGP_H_ESPI_Q570, + PCI_DID_INTEL_TGP_H_ESPI_W580, + PCI_DID_INTEL_TGP_H_ESPI_Z590, + PCI_DID_INTEL_TGP_H_ESPI_HM570, + PCI_DID_INTEL_TGP_H_ESPI_QM580, + PCI_DID_INTEL_TGP_H_ESPI_WM590, + PCI_DID_INTEL_MCC_ESPI_0, + PCI_DID_INTEL_MCC_ESPI_1, + PCI_DID_INTEL_MCC_BASE_ESPI, + PCI_DID_INTEL_MCC_PREMIUM_ESPI, + PCI_DID_INTEL_MCC_SUPER_ESPI, + PCI_DID_INTEL_MCC_ESPI_2, + PCI_DID_INTEL_MCC_ESPI_3, + PCI_DID_INTEL_MCC_ESPI_4, + PCI_DID_INTEL_JSP_SUPER_ESPI, + PCI_DID_INTEL_ADP_P_ESPI_0, + PCI_DID_INTEL_ADP_P_ESPI_1, + PCI_DID_INTEL_ADP_P_ESPI_2, + PCI_DID_INTEL_ADP_P_ESPI_3, + PCI_DID_INTEL_ADP_P_ESPI_4, + PCI_DID_INTEL_ADP_P_ESPI_5, + PCI_DID_INTEL_ADP_P_ESPI_6, + PCI_DID_INTEL_ADP_P_ESPI_7, + PCI_DID_INTEL_ADP_P_ESPI_8, + PCI_DID_INTEL_ADP_P_ESPI_9, + PCI_DID_INTEL_ADP_P_ESPI_10, + PCI_DID_INTEL_ADP_P_ESPI_11, + PCI_DID_INTEL_ADP_P_ESPI_12, + PCI_DID_INTEL_ADP_P_ESPI_13, + PCI_DID_INTEL_ADP_P_ESPI_14, + PCI_DID_INTEL_ADP_P_ESPI_15, + PCI_DID_INTEL_ADP_P_ESPI_16, + PCI_DID_INTEL_ADP_P_ESPI_17, + PCI_DID_INTEL_ADP_P_ESPI_18, + PCI_DID_INTEL_ADP_P_ESPI_19, + PCI_DID_INTEL_ADP_P_ESPI_20, + PCI_DID_INTEL_ADP_P_ESPI_21, + PCI_DID_INTEL_ADP_P_ESPI_22, + PCI_DID_INTEL_ADP_P_ESPI_23, + PCI_DID_INTEL_ADP_P_ESPI_24, + PCI_DID_INTEL_ADP_P_ESPI_25, + PCI_DID_INTEL_ADP_P_ESPI_26, + PCI_DID_INTEL_ADP_P_ESPI_27, + PCI_DID_INTEL_ADP_P_ESPI_28, + PCI_DID_INTEL_ADP_P_ESPI_29, + PCI_DID_INTEL_ADP_P_ESPI_30, + PCI_DID_INTEL_ADP_P_ESPI_31, + PCI_DID_INTEL_ADP_P_ESPI_32, + PCI_DID_INTEL_ADP_P_ESPI_33, + PCI_DID_INTEL_ADP_S_ESPI_0, + PCI_DID_INTEL_ADP_S_ESPI_1, + PCI_DID_INTEL_ADP_S_ESPI_2, + PCI_DID_INTEL_ADP_S_ESPI_3, + PCI_DID_INTEL_ADP_S_ESPI_4, + PCI_DID_INTEL_ADP_S_ESPI_5, + PCI_DID_INTEL_ADP_S_ESPI_6, + PCI_DID_INTEL_ADP_S_ESPI_7, + PCI_DID_INTEL_ADP_S_ESPI_8, + PCI_DID_INTEL_ADP_S_ESPI_9, + PCI_DID_INTEL_ADP_S_ESPI_10, + PCI_DID_INTEL_ADP_S_ESPI_11, + PCI_DID_INTEL_ADP_S_ESPI_12, + PCI_DID_INTEL_ADP_S_ESPI_13, + PCI_DID_INTEL_ADP_S_ESPI_14, + PCI_DID_INTEL_ADP_S_ESPI_15, + PCI_DID_INTEL_ADP_S_ESPI_16, + PCI_DID_INTEL_ADP_S_ESPI_17, + PCI_DID_INTEL_ADP_S_ESPI_18, + PCI_DID_INTEL_ADP_S_ESPI_19, + PCI_DID_INTEL_ADP_S_ESPI_20, + PCI_DID_INTEL_ADP_S_ESPI_21, + PCI_DID_INTEL_ADP_S_ESPI_22, + PCI_DID_INTEL_ADP_S_ESPI_23, + PCI_DID_INTEL_ADP_S_ESPI_24, + PCI_DID_INTEL_ADP_S_ESPI_25, + PCI_DID_INTEL_ADP_S_ESPI_26, + PCI_DID_INTEL_ADP_S_ESPI_27, + PCI_DID_INTEL_ADP_S_ESPI_28, + PCI_DID_INTEL_ADP_S_ESPI_29, + PCI_DID_INTEL_ADP_S_ESPI_30, + PCI_DID_INTEL_ADP_S_ESPI_31, + PCI_DID_INTEL_ADP_P_ESPI_32, + PCI_DID_INTEL_ADP_M_N_ESPI_0, + PCI_DID_INTEL_ADP_M_N_ESPI_1, + PCI_DID_INTEL_ADP_M_N_ESPI_2, + PCI_DID_INTEL_ADP_M_N_ESPI_3, + PCI_DID_INTEL_ADP_M_N_ESPI_4, + PCI_DID_INTEL_ADP_M_N_ESPI_5, + PCI_DID_INTEL_ADP_M_N_ESPI_7, + PCI_DID_INTEL_ADP_M_N_ESPI_8, + PCI_DID_INTEL_ADP_M_N_ESPI_9, + PCI_DID_INTEL_ADP_M_N_ESPI_10, + PCI_DID_INTEL_ADP_M_N_ESPI_11, + PCI_DID_INTEL_ADP_M_N_ESPI_12, + PCI_DID_INTEL_ADP_M_N_ESPI_13, + PCI_DID_INTEL_ADP_M_N_ESPI_14, + PCI_DID_INTEL_ADP_M_N_ESPI_15, + PCI_DID_INTEL_ADP_M_N_ESPI_16, + PCI_DID_INTEL_ADP_M_N_ESPI_17, + PCI_DID_INTEL_ADP_M_N_ESPI_18, + PCI_DID_INTEL_ADP_M_N_ESPI_19, + PCI_DID_INTEL_ADP_M_N_ESPI_20, + PCI_DID_INTEL_ADP_M_N_ESPI_21, + PCI_DID_INTEL_ADP_M_N_ESPI_22, + PCI_DID_INTEL_ADP_M_N_ESPI_23, + PCI_DID_INTEL_ADP_M_N_ESPI_24, + PCI_DID_INTEL_ADP_M_N_ESPI_25, + PCI_DID_INTEL_ADP_M_N_ESPI_26, + PCI_DID_INTEL_ADP_M_N_ESPI_27, + PCI_DID_INTEL_ADP_M_N_ESPI_28, + PCI_DID_INTEL_ADP_M_N_ESPI_29, + PCI_DID_INTEL_ADP_M_N_ESPI_30, + PCI_DID_INTEL_ADP_M_N_ESPI_31, + PCI_DID_INTEL_ADP_M_ESPI_32, + PCI_DID_INTEL_SPR_ESPI_1, 0 }; static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c index 16da6911c9..03c341a26d 100644 --- a/src/soc/intel/common/block/p2sb/p2sb.c +++ b/src/soc/intel/common/block/p2sb/p2sb.c @@ -144,30 +144,30 @@ static const struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_P2SB, - PCI_DEVICE_ID_INTEL_GLK_P2SB, - PCI_DEVICE_ID_INTEL_LWB_P2SB, - PCI_DEVICE_ID_INTEL_LWB_P2SB_SUPER, - PCI_DEVICE_ID_INTEL_SKL_LP_P2SB, - PCI_DEVICE_ID_INTEL_SKL_P2SB, - PCI_DEVICE_ID_INTEL_KBL_P2SB, - PCI_DEVICE_ID_INTEL_CNL_P2SB, - PCI_DEVICE_ID_INTEL_CNP_H_P2SB, - PCI_DEVICE_ID_INTEL_ICL_P2SB, - PCI_DEVICE_ID_INTEL_CMP_P2SB, - PCI_DEVICE_ID_INTEL_CMP_H_P2SB, - PCI_DEVICE_ID_INTEL_TGL_P2SB, - PCI_DEVICE_ID_INTEL_TGL_H_P2SB, - PCI_DEVICE_ID_INTEL_EHL_P2SB, - PCI_DEVICE_ID_INTEL_JSP_P2SB, - PCI_DEVICE_ID_INTEL_ADP_P_P2SB, - PCI_DEVICE_ID_INTEL_ADP_S_P2SB, - PCI_DEVICE_ID_INTEL_ADP_M_P2SB, + PCI_DID_INTEL_APL_P2SB, + PCI_DID_INTEL_GLK_P2SB, + PCI_DID_INTEL_LWB_P2SB, + PCI_DID_INTEL_LWB_P2SB_SUPER, + PCI_DID_INTEL_SKL_LP_P2SB, + PCI_DID_INTEL_SKL_P2SB, + PCI_DID_INTEL_KBL_P2SB, + PCI_DID_INTEL_CNL_P2SB, + PCI_DID_INTEL_CNP_H_P2SB, + PCI_DID_INTEL_ICL_P2SB, + PCI_DID_INTEL_CMP_P2SB, + PCI_DID_INTEL_CMP_H_P2SB, + PCI_DID_INTEL_TGL_P2SB, + PCI_DID_INTEL_TGL_H_P2SB, + PCI_DID_INTEL_EHL_P2SB, + PCI_DID_INTEL_JSP_P2SB, + PCI_DID_INTEL_ADP_P_P2SB, + PCI_DID_INTEL_ADP_S_P2SB, + PCI_DID_INTEL_ADP_M_P2SB, 0, }; static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/p2sb/p2sblib.c b/src/soc/intel/common/block/p2sb/p2sblib.c index d00606dd89..faef79adfd 100644 --- a/src/soc/intel/common/block/p2sb/p2sblib.c +++ b/src/soc/intel/common/block/p2sb/p2sblib.c @@ -16,7 +16,7 @@ bool p2sb_dev_is_hidden(pci_devfn_t dev) if (pci_vid == 0xffff) return true; - if (pci_vid == PCI_VENDOR_ID_INTEL) + if (pci_vid == PCI_VID_INTEL) return false; printk(BIOS_ERR, "P2SB PCI_VENDOR_ID is invalid, unknown if hidden\n"); return true; diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c index b17a1f37ce..1ac879c661 100644 --- a/src/soc/intel/common/block/pcie/pcie.c +++ b/src/soc/intel/common/block/pcie/pcie.c @@ -66,313 +66,313 @@ static struct device_operations device_ops = { }; static const unsigned short pcie_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP1, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP2, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP3, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP4, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP5, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP6, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP7, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP8, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP9, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP10, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP11, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP12, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP13, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP14, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP15, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP16, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP17, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP18, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP1_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP2_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP3_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP4_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP5_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP6_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP7_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP8_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP9_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP10_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP11_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP12_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP13_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP14_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP15_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP16_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP17_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP18_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP1, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP2, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP3, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP4, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP5, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP6, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP7, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP12, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP12, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP13, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP14, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP15, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP16, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP17, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP18, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP19, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP20, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP21, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP22, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP23, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP24, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP25, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP26, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP27, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP28, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ADP_N_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ADP_N_PCIE_RP12, + PCI_DID_INTEL_SPT_LP_PCIE_RP1, + PCI_DID_INTEL_SPT_LP_PCIE_RP2, + PCI_DID_INTEL_SPT_LP_PCIE_RP3, + PCI_DID_INTEL_SPT_LP_PCIE_RP4, + PCI_DID_INTEL_SPT_LP_PCIE_RP5, + PCI_DID_INTEL_SPT_LP_PCIE_RP6, + PCI_DID_INTEL_SPT_LP_PCIE_RP7, + PCI_DID_INTEL_SPT_LP_PCIE_RP8, + PCI_DID_INTEL_SPT_LP_PCIE_RP9, + PCI_DID_INTEL_SPT_LP_PCIE_RP10, + PCI_DID_INTEL_SPT_LP_PCIE_RP11, + PCI_DID_INTEL_SPT_LP_PCIE_RP12, + PCI_DID_INTEL_SPT_H_PCIE_RP1, + PCI_DID_INTEL_SPT_H_PCIE_RP2, + PCI_DID_INTEL_SPT_H_PCIE_RP3, + PCI_DID_INTEL_SPT_H_PCIE_RP4, + PCI_DID_INTEL_SPT_H_PCIE_RP5, + PCI_DID_INTEL_SPT_H_PCIE_RP6, + PCI_DID_INTEL_SPT_H_PCIE_RP7, + PCI_DID_INTEL_SPT_H_PCIE_RP8, + PCI_DID_INTEL_SPT_H_PCIE_RP9, + PCI_DID_INTEL_SPT_H_PCIE_RP10, + PCI_DID_INTEL_SPT_H_PCIE_RP11, + PCI_DID_INTEL_SPT_H_PCIE_RP12, + PCI_DID_INTEL_SPT_H_PCIE_RP13, + PCI_DID_INTEL_SPT_H_PCIE_RP14, + PCI_DID_INTEL_SPT_H_PCIE_RP15, + PCI_DID_INTEL_SPT_H_PCIE_RP16, + PCI_DID_INTEL_SPT_H_PCIE_RP17, + PCI_DID_INTEL_SPT_H_PCIE_RP18, + PCI_DID_INTEL_SPT_H_PCIE_RP19, + PCI_DID_INTEL_SPT_H_PCIE_RP20, + PCI_DID_INTEL_LWB_PCIE_RP1, + PCI_DID_INTEL_LWB_PCIE_RP2, + PCI_DID_INTEL_LWB_PCIE_RP3, + PCI_DID_INTEL_LWB_PCIE_RP4, + PCI_DID_INTEL_LWB_PCIE_RP5, + PCI_DID_INTEL_LWB_PCIE_RP6, + PCI_DID_INTEL_LWB_PCIE_RP7, + PCI_DID_INTEL_LWB_PCIE_RP8, + PCI_DID_INTEL_LWB_PCIE_RP9, + PCI_DID_INTEL_LWB_PCIE_RP10, + PCI_DID_INTEL_LWB_PCIE_RP11, + PCI_DID_INTEL_LWB_PCIE_RP12, + PCI_DID_INTEL_LWB_PCIE_RP13, + PCI_DID_INTEL_LWB_PCIE_RP14, + PCI_DID_INTEL_LWB_PCIE_RP15, + PCI_DID_INTEL_LWB_PCIE_RP16, + PCI_DID_INTEL_LWB_PCIE_RP17, + PCI_DID_INTEL_LWB_PCIE_RP18, + PCI_DID_INTEL_LWB_PCIE_RP19, + PCI_DID_INTEL_LWB_PCIE_RP20, + PCI_DID_INTEL_LWB_PCIE_RP1_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP2_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP3_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP4_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP5_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP6_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP7_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP8_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP9_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP10_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP11_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP12_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP13_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP14_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP15_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP16_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP17_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP18_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP19_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP20_SUPER, + PCI_DID_INTEL_UPT_H_PCIE_RP1, + PCI_DID_INTEL_UPT_H_PCIE_RP2, + PCI_DID_INTEL_UPT_H_PCIE_RP3, + PCI_DID_INTEL_UPT_H_PCIE_RP4, + PCI_DID_INTEL_UPT_H_PCIE_RP5, + PCI_DID_INTEL_UPT_H_PCIE_RP6, + PCI_DID_INTEL_UPT_H_PCIE_RP7, + PCI_DID_INTEL_UPT_H_PCIE_RP8, + PCI_DID_INTEL_UPT_H_PCIE_RP9, + PCI_DID_INTEL_UPT_H_PCIE_RP10, + PCI_DID_INTEL_UPT_H_PCIE_RP11, + PCI_DID_INTEL_UPT_H_PCIE_RP12, + PCI_DID_INTEL_UPT_H_PCIE_RP13, + PCI_DID_INTEL_UPT_H_PCIE_RP14, + PCI_DID_INTEL_UPT_H_PCIE_RP15, + PCI_DID_INTEL_UPT_H_PCIE_RP16, + PCI_DID_INTEL_UPT_H_PCIE_RP17, + PCI_DID_INTEL_UPT_H_PCIE_RP18, + PCI_DID_INTEL_UPT_H_PCIE_RP19, + PCI_DID_INTEL_UPT_H_PCIE_RP20, + PCI_DID_INTEL_UPT_H_PCIE_RP21, + PCI_DID_INTEL_UPT_H_PCIE_RP22, + PCI_DID_INTEL_UPT_H_PCIE_RP23, + PCI_DID_INTEL_UPT_H_PCIE_RP24, + PCI_DID_INTEL_CNL_LP_PCIE_RP1, + PCI_DID_INTEL_CNL_LP_PCIE_RP2, + PCI_DID_INTEL_CNL_LP_PCIE_RP3, + PCI_DID_INTEL_CNL_LP_PCIE_RP4, + PCI_DID_INTEL_CNL_LP_PCIE_RP5, + PCI_DID_INTEL_CNL_LP_PCIE_RP6, + PCI_DID_INTEL_CNL_LP_PCIE_RP7, + PCI_DID_INTEL_CNL_LP_PCIE_RP8, + PCI_DID_INTEL_CNL_LP_PCIE_RP9, + PCI_DID_INTEL_CNL_LP_PCIE_RP10, + PCI_DID_INTEL_CNL_LP_PCIE_RP11, + PCI_DID_INTEL_CNL_LP_PCIE_RP12, + PCI_DID_INTEL_CNL_LP_PCIE_RP13, + PCI_DID_INTEL_CNL_LP_PCIE_RP14, + PCI_DID_INTEL_CNL_LP_PCIE_RP15, + PCI_DID_INTEL_CNL_LP_PCIE_RP16, + PCI_DID_INTEL_CNP_H_PCIE_RP1, + PCI_DID_INTEL_CNP_H_PCIE_RP2, + PCI_DID_INTEL_CNP_H_PCIE_RP3, + PCI_DID_INTEL_CNP_H_PCIE_RP4, + PCI_DID_INTEL_CNP_H_PCIE_RP5, + PCI_DID_INTEL_CNP_H_PCIE_RP6, + PCI_DID_INTEL_CNP_H_PCIE_RP7, + PCI_DID_INTEL_CNP_H_PCIE_RP8, + PCI_DID_INTEL_CNP_H_PCIE_RP9, + PCI_DID_INTEL_CNP_H_PCIE_RP10, + PCI_DID_INTEL_CNP_H_PCIE_RP11, + PCI_DID_INTEL_CNP_H_PCIE_RP12, + PCI_DID_INTEL_CNP_H_PCIE_RP13, + PCI_DID_INTEL_CNP_H_PCIE_RP14, + PCI_DID_INTEL_CNP_H_PCIE_RP15, + PCI_DID_INTEL_CNP_H_PCIE_RP16, + PCI_DID_INTEL_CNP_H_PCIE_RP17, + PCI_DID_INTEL_CNP_H_PCIE_RP18, + PCI_DID_INTEL_CNP_H_PCIE_RP19, + PCI_DID_INTEL_CNP_H_PCIE_RP20, + PCI_DID_INTEL_CNP_H_PCIE_RP21, + PCI_DID_INTEL_CNP_H_PCIE_RP22, + PCI_DID_INTEL_CNP_H_PCIE_RP23, + PCI_DID_INTEL_CNP_H_PCIE_RP24, + PCI_DID_INTEL_ICP_LP_PCIE_RP1, + PCI_DID_INTEL_ICP_LP_PCIE_RP2, + PCI_DID_INTEL_ICP_LP_PCIE_RP3, + PCI_DID_INTEL_ICP_LP_PCIE_RP4, + PCI_DID_INTEL_ICP_LP_PCIE_RP5, + PCI_DID_INTEL_ICP_LP_PCIE_RP6, + PCI_DID_INTEL_ICP_LP_PCIE_RP7, + PCI_DID_INTEL_ICP_LP_PCIE_RP8, + PCI_DID_INTEL_ICP_LP_PCIE_RP9, + PCI_DID_INTEL_ICP_LP_PCIE_RP10, + PCI_DID_INTEL_ICP_LP_PCIE_RP11, + PCI_DID_INTEL_ICP_LP_PCIE_RP12, + PCI_DID_INTEL_ICP_LP_PCIE_RP13, + PCI_DID_INTEL_ICP_LP_PCIE_RP14, + PCI_DID_INTEL_ICP_LP_PCIE_RP15, + PCI_DID_INTEL_ICP_LP_PCIE_RP16, + PCI_DID_INTEL_CMP_LP_PCIE_RP1, + PCI_DID_INTEL_CMP_LP_PCIE_RP2, + PCI_DID_INTEL_CMP_LP_PCIE_RP3, + PCI_DID_INTEL_CMP_LP_PCIE_RP4, + PCI_DID_INTEL_CMP_LP_PCIE_RP5, + PCI_DID_INTEL_CMP_LP_PCIE_RP6, + PCI_DID_INTEL_CMP_LP_PCIE_RP7, + PCI_DID_INTEL_CMP_LP_PCIE_RP8, + PCI_DID_INTEL_CMP_LP_PCIE_RP9, + PCI_DID_INTEL_CMP_LP_PCIE_RP10, + PCI_DID_INTEL_CMP_LP_PCIE_RP11, + PCI_DID_INTEL_CMP_LP_PCIE_RP12, + PCI_DID_INTEL_CMP_LP_PCIE_RP13, + PCI_DID_INTEL_CMP_LP_PCIE_RP14, + PCI_DID_INTEL_CMP_LP_PCIE_RP15, + PCI_DID_INTEL_CMP_LP_PCIE_RP16, + PCI_DID_INTEL_CMP_H_PCIE_RP1, + PCI_DID_INTEL_CMP_H_PCIE_RP2, + PCI_DID_INTEL_CMP_H_PCIE_RP3, + PCI_DID_INTEL_CMP_H_PCIE_RP4, + PCI_DID_INTEL_CMP_H_PCIE_RP5, + PCI_DID_INTEL_CMP_H_PCIE_RP6, + PCI_DID_INTEL_CMP_H_PCIE_RP7, + PCI_DID_INTEL_CMP_H_PCIE_RP8, + PCI_DID_INTEL_CMP_H_PCIE_RP9, + PCI_DID_INTEL_CMP_H_PCIE_RP10, + PCI_DID_INTEL_CMP_H_PCIE_RP11, + PCI_DID_INTEL_CMP_H_PCIE_RP12, + PCI_DID_INTEL_CMP_H_PCIE_RP13, + PCI_DID_INTEL_CMP_H_PCIE_RP14, + PCI_DID_INTEL_CMP_H_PCIE_RP15, + PCI_DID_INTEL_CMP_H_PCIE_RP16, + PCI_DID_INTEL_CMP_H_PCIE_RP17, + PCI_DID_INTEL_CMP_H_PCIE_RP18, + PCI_DID_INTEL_CMP_H_PCIE_RP19, + PCI_DID_INTEL_CMP_H_PCIE_RP20, + PCI_DID_INTEL_CMP_H_PCIE_RP21, + PCI_DID_INTEL_CMP_H_PCIE_RP22, + PCI_DID_INTEL_CMP_H_PCIE_RP23, + PCI_DID_INTEL_CMP_H_PCIE_RP24, + PCI_DID_INTEL_TGP_LP_PCIE_RP1, + PCI_DID_INTEL_TGP_LP_PCIE_RP2, + PCI_DID_INTEL_TGP_LP_PCIE_RP3, + PCI_DID_INTEL_TGP_LP_PCIE_RP4, + PCI_DID_INTEL_TGP_LP_PCIE_RP5, + PCI_DID_INTEL_TGP_LP_PCIE_RP6, + PCI_DID_INTEL_TGP_LP_PCIE_RP7, + PCI_DID_INTEL_TGP_LP_PCIE_RP8, + PCI_DID_INTEL_TGP_LP_PCIE_RP9, + PCI_DID_INTEL_TGP_LP_PCIE_RP10, + PCI_DID_INTEL_TGP_LP_PCIE_RP11, + PCI_DID_INTEL_TGP_LP_PCIE_RP12, + PCI_DID_INTEL_TGP_LP_PCIE_RP13, + PCI_DID_INTEL_TGP_LP_PCIE_RP14, + PCI_DID_INTEL_TGP_LP_PCIE_RP15, + PCI_DID_INTEL_TGP_LP_PCIE_RP16, + PCI_DID_INTEL_TGP_H_PCIE_RP1, + PCI_DID_INTEL_TGP_H_PCIE_RP2, + PCI_DID_INTEL_TGP_H_PCIE_RP3, + PCI_DID_INTEL_TGP_H_PCIE_RP4, + PCI_DID_INTEL_TGP_H_PCIE_RP5, + PCI_DID_INTEL_TGP_H_PCIE_RP6, + PCI_DID_INTEL_TGP_H_PCIE_RP7, + PCI_DID_INTEL_TGP_H_PCIE_RP8, + PCI_DID_INTEL_TGP_H_PCIE_RP9, + PCI_DID_INTEL_TGP_H_PCIE_RP10, + PCI_DID_INTEL_TGP_H_PCIE_RP11, + PCI_DID_INTEL_TGP_H_PCIE_RP12, + PCI_DID_INTEL_TGP_H_PCIE_RP13, + PCI_DID_INTEL_TGP_H_PCIE_RP14, + PCI_DID_INTEL_TGP_H_PCIE_RP15, + PCI_DID_INTEL_TGP_H_PCIE_RP16, + PCI_DID_INTEL_TGP_H_PCIE_RP17, + PCI_DID_INTEL_TGP_H_PCIE_RP18, + PCI_DID_INTEL_TGP_H_PCIE_RP19, + PCI_DID_INTEL_TGP_H_PCIE_RP20, + PCI_DID_INTEL_TGP_H_PCIE_RP21, + PCI_DID_INTEL_TGP_H_PCIE_RP22, + PCI_DID_INTEL_TGP_H_PCIE_RP23, + PCI_DID_INTEL_TGP_H_PCIE_RP24, + PCI_DID_INTEL_MCC_PCIE_RP1, + PCI_DID_INTEL_MCC_PCIE_RP2, + PCI_DID_INTEL_MCC_PCIE_RP3, + PCI_DID_INTEL_MCC_PCIE_RP4, + PCI_DID_INTEL_MCC_PCIE_RP5, + PCI_DID_INTEL_MCC_PCIE_RP6, + PCI_DID_INTEL_MCC_PCIE_RP7, + PCI_DID_INTEL_JSP_PCIE_RP1, + PCI_DID_INTEL_JSP_PCIE_RP2, + PCI_DID_INTEL_JSP_PCIE_RP3, + PCI_DID_INTEL_JSP_PCIE_RP4, + PCI_DID_INTEL_JSP_PCIE_RP5, + PCI_DID_INTEL_JSP_PCIE_RP6, + PCI_DID_INTEL_JSP_PCIE_RP7, + PCI_DID_INTEL_JSP_PCIE_RP8, + PCI_DID_INTEL_ADL_P_PCIE_RP1, + PCI_DID_INTEL_ADL_P_PCIE_RP2, + PCI_DID_INTEL_ADL_P_PCIE_RP3, + PCI_DID_INTEL_ADP_P_PCIE_RP1, + PCI_DID_INTEL_ADP_P_PCIE_RP2, + PCI_DID_INTEL_ADP_P_PCIE_RP3, + PCI_DID_INTEL_ADP_P_PCIE_RP4, + PCI_DID_INTEL_ADP_P_PCIE_RP5, + PCI_DID_INTEL_ADP_P_PCIE_RP6, + PCI_DID_INTEL_ADP_P_PCIE_RP7, + PCI_DID_INTEL_ADP_P_PCIE_RP8, + PCI_DID_INTEL_ADP_P_PCIE_RP9, + PCI_DID_INTEL_ADP_P_PCIE_RP10, + PCI_DID_INTEL_ADP_P_PCIE_RP11, + PCI_DID_INTEL_ADP_P_PCIE_RP12, + PCI_DID_INTEL_ADP_S_PCIE_RP1, + PCI_DID_INTEL_ADP_S_PCIE_RP2, + PCI_DID_INTEL_ADP_S_PCIE_RP3, + PCI_DID_INTEL_ADP_S_PCIE_RP4, + PCI_DID_INTEL_ADP_S_PCIE_RP5, + PCI_DID_INTEL_ADP_S_PCIE_RP6, + PCI_DID_INTEL_ADP_S_PCIE_RP7, + PCI_DID_INTEL_ADP_S_PCIE_RP8, + PCI_DID_INTEL_ADP_S_PCIE_RP9, + PCI_DID_INTEL_ADP_S_PCIE_RP10, + PCI_DID_INTEL_ADP_S_PCIE_RP11, + PCI_DID_INTEL_ADP_S_PCIE_RP12, + PCI_DID_INTEL_ADP_S_PCIE_RP13, + PCI_DID_INTEL_ADP_S_PCIE_RP14, + PCI_DID_INTEL_ADP_S_PCIE_RP15, + PCI_DID_INTEL_ADP_S_PCIE_RP16, + PCI_DID_INTEL_ADP_S_PCIE_RP17, + PCI_DID_INTEL_ADP_S_PCIE_RP18, + PCI_DID_INTEL_ADP_S_PCIE_RP19, + PCI_DID_INTEL_ADP_S_PCIE_RP20, + PCI_DID_INTEL_ADP_S_PCIE_RP21, + PCI_DID_INTEL_ADP_S_PCIE_RP22, + PCI_DID_INTEL_ADP_S_PCIE_RP23, + PCI_DID_INTEL_ADP_S_PCIE_RP24, + PCI_DID_INTEL_ADP_S_PCIE_RP25, + PCI_DID_INTEL_ADP_S_PCIE_RP26, + PCI_DID_INTEL_ADP_S_PCIE_RP27, + PCI_DID_INTEL_ADP_S_PCIE_RP28, + PCI_DID_INTEL_ADP_M_N_PCIE_RP1, + PCI_DID_INTEL_ADP_M_N_PCIE_RP2, + PCI_DID_INTEL_ADP_M_N_PCIE_RP3, + PCI_DID_INTEL_ADP_M_N_PCIE_RP4, + PCI_DID_INTEL_ADP_M_PCIE_RP5, + PCI_DID_INTEL_ADP_M_PCIE_RP6, + PCI_DID_INTEL_ADP_M_N_PCIE_RP7, + PCI_DID_INTEL_ADP_M_PCIE_RP8, + PCI_DID_INTEL_ADP_M_N_PCIE_RP9, + PCI_DID_INTEL_ADP_M_N_PCIE_RP10, + PCI_DID_INTEL_ADP_N_PCIE_RP11, + PCI_DID_INTEL_ADP_N_PCIE_RP12, 0 }; static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pcie_device_ids, }; diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index b64841d616..105d92c5f4 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -111,30 +111,30 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_DNV_PMC, - PCI_DEVICE_ID_INTEL_SPT_LP_PMC, - PCI_DEVICE_ID_INTEL_SPT_H_PMC, - PCI_DEVICE_ID_INTEL_LWB_PMC, - PCI_DEVICE_ID_INTEL_LWB_PMC_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_PMC, - PCI_DEVICE_ID_INTEL_APL_PMC, - PCI_DEVICE_ID_INTEL_GLK_PMC, - PCI_DEVICE_ID_INTEL_CNP_H_PMC, - PCI_DEVICE_ID_INTEL_ICP_PMC, - PCI_DEVICE_ID_INTEL_CMP_PMC, - PCI_DEVICE_ID_INTEL_CMP_H_PMC, - PCI_DEVICE_ID_INTEL_TGP_PMC, - PCI_DEVICE_ID_INTEL_TGP_H_PMC, - PCI_DEVICE_ID_INTEL_MCC_PMC, - PCI_DEVICE_ID_INTEL_JSP_PMC, - PCI_DEVICE_ID_INTEL_ADP_P_PMC, - PCI_DEVICE_ID_INTEL_ADP_S_PMC, - PCI_DEVICE_ID_INTEL_ADP_M_N_PMC, + PCI_DID_INTEL_DNV_PMC, + PCI_DID_INTEL_SPT_LP_PMC, + PCI_DID_INTEL_SPT_H_PMC, + PCI_DID_INTEL_LWB_PMC, + PCI_DID_INTEL_LWB_PMC_SUPER, + PCI_DID_INTEL_UPT_H_PMC, + PCI_DID_INTEL_APL_PMC, + PCI_DID_INTEL_GLK_PMC, + PCI_DID_INTEL_CNP_H_PMC, + PCI_DID_INTEL_ICP_PMC, + PCI_DID_INTEL_CMP_PMC, + PCI_DID_INTEL_CMP_H_PMC, + PCI_DID_INTEL_TGP_PMC, + PCI_DID_INTEL_TGP_H_PMC, + PCI_DID_INTEL_MCC_PMC, + PCI_DID_INTEL_JSP_PMC, + PCI_DID_INTEL_ADP_P_PMC, + PCI_DID_INTEL_ADP_S_PMC, + PCI_DID_INTEL_ADP_M_N_PMC, 0 }; static const struct pci_driver pch_pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c index 08c1bbb1fe..fa937f4fd5 100644 --- a/src/soc/intel/common/block/sata/sata.c +++ b/src/soc/intel/common/block/sata/sata.c @@ -13,62 +13,62 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_U_SATA, - PCI_DEVICE_ID_INTEL_SPT_U_Y_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_SPT_KBL_SATA, - PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI, - PCI_DEVICE_ID_INTEL_LWB_SATA_RAID, - PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID, - PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SATA_RAID_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SATA_ALT, - PCI_DEVICE_ID_INTEL_LWB_SATA_ALT_RST, - PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT, - PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT_RST, - PCI_DEVICE_ID_INTEL_CNL_SATA, - PCI_DEVICE_ID_INTEL_CNL_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_CNP_CMP_COMPAT_SATA, - PCI_DEVICE_ID_INTEL_CNP_H_SATA, - PCI_DEVICE_ID_INTEL_CNP_H_HALO_SATA, - PCI_DEVICE_ID_INTEL_CNP_LP_SATA, - PCI_DEVICE_ID_INTEL_ICP_U_SATA, - PCI_DEVICE_ID_INTEL_CMP_SATA, - PCI_DEVICE_ID_INTEL_CMP_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_CMP_LP_SATA, - PCI_DEVICE_ID_INTEL_CMP_H_SATA, - PCI_DEVICE_ID_INTEL_CMP_H_HALO_SATA, - PCI_DEVICE_ID_INTEL_CMP_H_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_TGP_LP_SATA, - PCI_DEVICE_ID_INTEL_TGP_SATA, - PCI_DEVICE_ID_INTEL_TGP_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_TGP_COMPAT_SATA, - PCI_DEVICE_ID_INTEL_TGP_H_SATA, - PCI_DEVICE_ID_INTEL_MCC_AHCI_SATA, - PCI_DEVICE_ID_INTEL_JSP_SATA_1, - PCI_DEVICE_ID_INTEL_JSP_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_1, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_3, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_4, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_5, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_6, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_1, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_3, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_4, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_5, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_6, - PCI_DEVICE_ID_INTEL_ADP_M_SATA_1, - PCI_DEVICE_ID_INTEL_ADP_M_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_M_SATA_3, + PCI_DID_INTEL_SPT_U_SATA, + PCI_DID_INTEL_SPT_U_Y_PREMIUM_SATA, + PCI_DID_INTEL_SPT_KBL_SATA, + PCI_DID_INTEL_LWB_SATA_AHCI, + PCI_DID_INTEL_LWB_SSATA_AHCI, + PCI_DID_INTEL_LWB_SATA_RAID, + PCI_DID_INTEL_LWB_SSATA_RAID, + PCI_DID_INTEL_LWB_SATA_AHCI_SUPER, + PCI_DID_INTEL_LWB_SSATA_AHCI_SUPER, + PCI_DID_INTEL_LWB_SATA_RAID_SUPER, + PCI_DID_INTEL_LWB_SSATA_RAID_SUPER, + PCI_DID_INTEL_LWB_SATA_ALT, + PCI_DID_INTEL_LWB_SATA_ALT_RST, + PCI_DID_INTEL_LWB_SSATA_ALT, + PCI_DID_INTEL_LWB_SSATA_ALT_RST, + PCI_DID_INTEL_CNL_SATA, + PCI_DID_INTEL_CNL_PREMIUM_SATA, + PCI_DID_INTEL_CNP_CMP_COMPAT_SATA, + PCI_DID_INTEL_CNP_H_SATA, + PCI_DID_INTEL_CNP_H_HALO_SATA, + PCI_DID_INTEL_CNP_LP_SATA, + PCI_DID_INTEL_ICP_U_SATA, + PCI_DID_INTEL_CMP_SATA, + PCI_DID_INTEL_CMP_PREMIUM_SATA, + PCI_DID_INTEL_CMP_LP_SATA, + PCI_DID_INTEL_CMP_H_SATA, + PCI_DID_INTEL_CMP_H_HALO_SATA, + PCI_DID_INTEL_CMP_H_PREMIUM_SATA, + PCI_DID_INTEL_TGP_LP_SATA, + PCI_DID_INTEL_TGP_SATA, + PCI_DID_INTEL_TGP_PREMIUM_SATA, + PCI_DID_INTEL_TGP_COMPAT_SATA, + PCI_DID_INTEL_TGP_H_SATA, + PCI_DID_INTEL_MCC_AHCI_SATA, + PCI_DID_INTEL_JSP_SATA_1, + PCI_DID_INTEL_JSP_SATA_2, + PCI_DID_INTEL_ADP_P_SATA_1, + PCI_DID_INTEL_ADP_P_SATA_2, + PCI_DID_INTEL_ADP_P_SATA_3, + PCI_DID_INTEL_ADP_P_SATA_4, + PCI_DID_INTEL_ADP_P_SATA_5, + PCI_DID_INTEL_ADP_P_SATA_6, + PCI_DID_INTEL_ADP_S_SATA_1, + PCI_DID_INTEL_ADP_S_SATA_2, + PCI_DID_INTEL_ADP_S_SATA_3, + PCI_DID_INTEL_ADP_S_SATA_4, + PCI_DID_INTEL_ADP_S_SATA_5, + PCI_DID_INTEL_ADP_S_SATA_6, + PCI_DID_INTEL_ADP_M_SATA_1, + PCI_DID_INTEL_ADP_M_SATA_2, + PCI_DID_INTEL_ADP_M_SATA_3, 0 }; static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/scs/mmc.c b/src/soc/intel/common/block/scs/mmc.c index 7f5519aa1a..538f77f099 100644 --- a/src/soc/intel/common/block/scs/mmc.c +++ b/src/soc/intel/common/block/scs/mmc.c @@ -71,14 +71,14 @@ static struct device_operations dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CMP_EMMC, - PCI_DEVICE_ID_INTEL_JSP_EMMC, - PCI_DEVICE_ID_INTEL_ADP_EMMC, + PCI_DID_INTEL_CMP_EMMC, + PCI_DID_INTEL_JSP_EMMC, + PCI_DID_INTEL_ADP_EMMC, 0 }; static const struct pci_driver pch_sd __pci_driver = { .ops = &dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c index be59a3db72..11a4a94417 100644 --- a/src/soc/intel/common/block/scs/sd.c +++ b/src/soc/intel/common/block/scs/sd.c @@ -49,21 +49,21 @@ static struct device_operations dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_SD, - PCI_DEVICE_ID_INTEL_CNL_SD, - PCI_DEVICE_ID_INTEL_GLK_SD, - PCI_DEVICE_ID_INTEL_SKL_SD, - PCI_DEVICE_ID_INTEL_CNP_H_SD, - PCI_DEVICE_ID_INTEL_ICL_SD, - PCI_DEVICE_ID_INTEL_CMP_SD, - PCI_DEVICE_ID_INTEL_CMP_H_SD, - PCI_DEVICE_ID_INTEL_MCC_SD, - PCI_DEVICE_ID_INTEL_JSP_SD, + PCI_DID_INTEL_APL_SD, + PCI_DID_INTEL_CNL_SD, + PCI_DID_INTEL_GLK_SD, + PCI_DID_INTEL_SKL_SD, + PCI_DID_INTEL_CNP_H_SD, + PCI_DID_INTEL_ICL_SD, + PCI_DID_INTEL_CMP_SD, + PCI_DID_INTEL_CMP_H_SD, + PCI_DID_INTEL_MCC_SD, + PCI_DID_INTEL_JSP_SD, 0 }; static const struct pci_driver pch_sd __pci_driver = { .ops = &dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids }; diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c index 94a54b7b7f..2b135c75e8 100644 --- a/src/soc/intel/common/block/smbus/smbus.c +++ b/src/soc/intel/common/block/smbus/smbus.c @@ -74,29 +74,29 @@ static struct device_operations smbus_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_SMBUS, - PCI_DEVICE_ID_INTEL_CNL_SMBUS, - PCI_DEVICE_ID_INTEL_CNP_H_SMBUS, - PCI_DEVICE_ID_INTEL_SPT_LP_SMBUS, - PCI_DEVICE_ID_INTEL_SPT_H_SMBUS, - PCI_DEVICE_ID_INTEL_LWB_SMBUS_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SMBUS, - PCI_DEVICE_ID_INTEL_ICP_LP_SMBUS, - PCI_DEVICE_ID_INTEL_CMP_SMBUS, - PCI_DEVICE_ID_INTEL_CMP_H_SMBUS, - PCI_DEVICE_ID_INTEL_TGP_LP_SMBUS, - PCI_DEVICE_ID_INTEL_TGP_H_SMBUS, - PCI_DEVICE_ID_INTEL_MCC_SMBUS, - PCI_DEVICE_ID_INTEL_JSP_SMBUS, - PCI_DEVICE_ID_INTEL_ADP_P_SMBUS, - PCI_DEVICE_ID_INTEL_ADP_S_SMBUS, - PCI_DEVICE_ID_INTEL_ADP_M_N_SMBUS, - PCI_DEVICE_ID_INTEL_DNV_SMBUS_LEGACY, + PCI_DID_INTEL_APL_SMBUS, + PCI_DID_INTEL_CNL_SMBUS, + PCI_DID_INTEL_CNP_H_SMBUS, + PCI_DID_INTEL_SPT_LP_SMBUS, + PCI_DID_INTEL_SPT_H_SMBUS, + PCI_DID_INTEL_LWB_SMBUS_SUPER, + PCI_DID_INTEL_LWB_SMBUS, + PCI_DID_INTEL_ICP_LP_SMBUS, + PCI_DID_INTEL_CMP_SMBUS, + PCI_DID_INTEL_CMP_H_SMBUS, + PCI_DID_INTEL_TGP_LP_SMBUS, + PCI_DID_INTEL_TGP_H_SMBUS, + PCI_DID_INTEL_MCC_SMBUS, + PCI_DID_INTEL_JSP_SMBUS, + PCI_DID_INTEL_ADP_P_SMBUS, + PCI_DID_INTEL_ADP_S_SMBUS, + PCI_DID_INTEL_ADP_M_N_SMBUS, + PCI_DID_INTEL_DNV_SMBUS_LEGACY, 0 }; static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c index 33d62c1975..914809951c 100644 --- a/src/soc/intel/common/block/spi/spi.c +++ b/src/soc/intel/common/block/spi/spi.c @@ -39,85 +39,85 @@ static struct device_operations spi_dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_SPI1, - PCI_DEVICE_ID_INTEL_SPT_SPI2, - PCI_DEVICE_ID_INTEL_SPT_SPI3, - PCI_DEVICE_ID_INTEL_APL_SPI0, - PCI_DEVICE_ID_INTEL_APL_SPI1, - PCI_DEVICE_ID_INTEL_APL_SPI2, - PCI_DEVICE_ID_INTEL_APL_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_GLK_SPI0, - PCI_DEVICE_ID_INTEL_GLK_SPI1, - PCI_DEVICE_ID_INTEL_GLK_SPI2, - PCI_DEVICE_ID_INTEL_CNL_SPI0, - PCI_DEVICE_ID_INTEL_CNL_SPI1, - PCI_DEVICE_ID_INTEL_CNL_SPI2, - PCI_DEVICE_ID_INTEL_CNL_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_CNP_H_SPI0, - PCI_DEVICE_ID_INTEL_CNP_H_SPI1, - PCI_DEVICE_ID_INTEL_CNP_H_SPI2, - PCI_DEVICE_ID_INTEL_CNP_H_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_LWB_SPI, - PCI_DEVICE_ID_INTEL_LWB_SPI_SUPER, - PCI_DEVICE_ID_INTEL_ICP_SPI0, - PCI_DEVICE_ID_INTEL_ICP_SPI1, - PCI_DEVICE_ID_INTEL_ICP_SPI2, - PCI_DEVICE_ID_INTEL_ICP_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_CMP_SPI0, - PCI_DEVICE_ID_INTEL_CMP_SPI1, - PCI_DEVICE_ID_INTEL_CMP_SPI2, - PCI_DEVICE_ID_INTEL_CMP_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_CMP_H_SPI0, - PCI_DEVICE_ID_INTEL_CMP_H_SPI1, - PCI_DEVICE_ID_INTEL_CMP_H_SPI2, - PCI_DEVICE_ID_INTEL_CMP_H_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_TGP_SPI0, - PCI_DEVICE_ID_INTEL_TGP_GSPI0, - PCI_DEVICE_ID_INTEL_TGP_GSPI1, - PCI_DEVICE_ID_INTEL_TGP_GSPI2, - PCI_DEVICE_ID_INTEL_TGP_GSPI3, - PCI_DEVICE_ID_INTEL_TGP_GSPI4, - PCI_DEVICE_ID_INTEL_TGP_GSPI5, - PCI_DEVICE_ID_INTEL_TGP_GSPI6, - PCI_DEVICE_ID_INTEL_TGP_H_SPI0, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI0, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI1, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI2, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI3, - PCI_DEVICE_ID_INTEL_MCC_SPI0, - PCI_DEVICE_ID_INTEL_MCC_GSPI0, - PCI_DEVICE_ID_INTEL_MCC_GSPI1, - PCI_DEVICE_ID_INTEL_MCC_GSPI2, - PCI_DEVICE_ID_INTEL_JSP_SPI0, - PCI_DEVICE_ID_INTEL_JSP_SPI1, - PCI_DEVICE_ID_INTEL_JSP_SPI2, - PCI_DEVICE_ID_INTEL_JSP_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_P_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_S_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_M_N_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_P_SPI0, - PCI_DEVICE_ID_INTEL_ADP_P_SPI1, - PCI_DEVICE_ID_INTEL_ADP_P_SPI2, - PCI_DEVICE_ID_INTEL_ADP_P_SPI3, - PCI_DEVICE_ID_INTEL_ADP_P_SPI4, - PCI_DEVICE_ID_INTEL_ADP_P_SPI5, - PCI_DEVICE_ID_INTEL_ADP_P_SPI6, - PCI_DEVICE_ID_INTEL_ADP_S_SPI0, - PCI_DEVICE_ID_INTEL_ADP_S_SPI1, - PCI_DEVICE_ID_INTEL_ADP_S_SPI2, - PCI_DEVICE_ID_INTEL_ADP_S_SPI3, - PCI_DEVICE_ID_INTEL_ADP_S_SPI4, - PCI_DEVICE_ID_INTEL_ADP_S_SPI5, - PCI_DEVICE_ID_INTEL_ADP_S_SPI6, - PCI_DEVICE_ID_INTEL_ADP_M_N_SPI0, - PCI_DEVICE_ID_INTEL_ADP_M_N_SPI1, - PCI_DEVICE_ID_INTEL_ADP_M_SPI2, - PCI_DEVICE_ID_INTEL_SPR_HWSEQ_SPI, + PCI_DID_INTEL_SPT_SPI1, + PCI_DID_INTEL_SPT_SPI2, + PCI_DID_INTEL_SPT_SPI3, + PCI_DID_INTEL_APL_SPI0, + PCI_DID_INTEL_APL_SPI1, + PCI_DID_INTEL_APL_SPI2, + PCI_DID_INTEL_APL_HWSEQ_SPI, + PCI_DID_INTEL_GLK_SPI0, + PCI_DID_INTEL_GLK_SPI1, + PCI_DID_INTEL_GLK_SPI2, + PCI_DID_INTEL_CNL_SPI0, + PCI_DID_INTEL_CNL_SPI1, + PCI_DID_INTEL_CNL_SPI2, + PCI_DID_INTEL_CNL_HWSEQ_SPI, + PCI_DID_INTEL_CNP_H_SPI0, + PCI_DID_INTEL_CNP_H_SPI1, + PCI_DID_INTEL_CNP_H_SPI2, + PCI_DID_INTEL_CNP_H_HWSEQ_SPI, + PCI_DID_INTEL_LWB_SPI, + PCI_DID_INTEL_LWB_SPI_SUPER, + PCI_DID_INTEL_ICP_SPI0, + PCI_DID_INTEL_ICP_SPI1, + PCI_DID_INTEL_ICP_SPI2, + PCI_DID_INTEL_ICP_HWSEQ_SPI, + PCI_DID_INTEL_CMP_SPI0, + PCI_DID_INTEL_CMP_SPI1, + PCI_DID_INTEL_CMP_SPI2, + PCI_DID_INTEL_CMP_HWSEQ_SPI, + PCI_DID_INTEL_CMP_H_SPI0, + PCI_DID_INTEL_CMP_H_SPI1, + PCI_DID_INTEL_CMP_H_SPI2, + PCI_DID_INTEL_CMP_H_HWSEQ_SPI, + PCI_DID_INTEL_TGP_SPI0, + PCI_DID_INTEL_TGP_GSPI0, + PCI_DID_INTEL_TGP_GSPI1, + PCI_DID_INTEL_TGP_GSPI2, + PCI_DID_INTEL_TGP_GSPI3, + PCI_DID_INTEL_TGP_GSPI4, + PCI_DID_INTEL_TGP_GSPI5, + PCI_DID_INTEL_TGP_GSPI6, + PCI_DID_INTEL_TGP_H_SPI0, + PCI_DID_INTEL_TGP_H_GSPI0, + PCI_DID_INTEL_TGP_H_GSPI1, + PCI_DID_INTEL_TGP_H_GSPI2, + PCI_DID_INTEL_TGP_H_GSPI3, + PCI_DID_INTEL_MCC_SPI0, + PCI_DID_INTEL_MCC_GSPI0, + PCI_DID_INTEL_MCC_GSPI1, + PCI_DID_INTEL_MCC_GSPI2, + PCI_DID_INTEL_JSP_SPI0, + PCI_DID_INTEL_JSP_SPI1, + PCI_DID_INTEL_JSP_SPI2, + PCI_DID_INTEL_JSP_HWSEQ_SPI, + PCI_DID_INTEL_ADP_P_HWSEQ_SPI, + PCI_DID_INTEL_ADP_S_HWSEQ_SPI, + PCI_DID_INTEL_ADP_M_N_HWSEQ_SPI, + PCI_DID_INTEL_ADP_P_SPI0, + PCI_DID_INTEL_ADP_P_SPI1, + PCI_DID_INTEL_ADP_P_SPI2, + PCI_DID_INTEL_ADP_P_SPI3, + PCI_DID_INTEL_ADP_P_SPI4, + PCI_DID_INTEL_ADP_P_SPI5, + PCI_DID_INTEL_ADP_P_SPI6, + PCI_DID_INTEL_ADP_S_SPI0, + PCI_DID_INTEL_ADP_S_SPI1, + PCI_DID_INTEL_ADP_S_SPI2, + PCI_DID_INTEL_ADP_S_SPI3, + PCI_DID_INTEL_ADP_S_SPI4, + PCI_DID_INTEL_ADP_S_SPI5, + PCI_DID_INTEL_ADP_S_SPI6, + PCI_DID_INTEL_ADP_M_N_SPI0, + PCI_DID_INTEL_ADP_M_N_SPI1, + PCI_DID_INTEL_ADP_M_SPI2, + PCI_DID_INTEL_SPR_HWSEQ_SPI, 0 }; static const struct pci_driver pch_spi __pci_driver = { .ops = &spi_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/sram/sram.c b/src/soc/intel/common/block/sram/sram.c index 1badb83daf..60e06dc368 100644 --- a/src/soc/intel/common/block/sram/sram.c +++ b/src/soc/intel/common/block/sram/sram.c @@ -33,23 +33,23 @@ static const struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_SRAM, - PCI_DEVICE_ID_INTEL_GLK_SRAM, - PCI_DEVICE_ID_INTEL_ICL_SRAM, - PCI_DEVICE_ID_INTEL_CMP_SRAM, - PCI_DEVICE_ID_INTEL_CMP_H_SRAM, - PCI_DEVICE_ID_INTEL_TGP_PMC_CRASHLOG_SRAM, - PCI_DEVICE_ID_INTEL_TGL_H_SRAM, - PCI_DEVICE_ID_INTEL_MCC_SRAM, - PCI_DEVICE_ID_INTEL_JSP_SRAM, - PCI_DEVICE_ID_INTEL_ADP_S_PMC_CRASHLOG_SRAM, - PCI_DEVICE_ID_INTEL_ADP_P_PMC_CRASHLOG_SRAM, - PCI_DEVICE_ID_INTEL_ADP_N_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_APL_SRAM, + PCI_DID_INTEL_GLK_SRAM, + PCI_DID_INTEL_ICL_SRAM, + PCI_DID_INTEL_CMP_SRAM, + PCI_DID_INTEL_CMP_H_SRAM, + PCI_DID_INTEL_TGP_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_TGL_H_SRAM, + PCI_DID_INTEL_MCC_SRAM, + PCI_DID_INTEL_JSP_SRAM, + PCI_DID_INTEL_ADP_S_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_ADP_P_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_ADP_N_PMC_CRASHLOG_SRAM, 0, }; static const struct pci_driver sram __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c index f50690ea79..3c068577d0 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -327,124 +327,124 @@ static struct device_operations systemagent_ops = { }; static const unsigned short systemagent_ids[] = { - PCI_DEVICE_ID_INTEL_GLK_NB, - PCI_DEVICE_ID_INTEL_APL_NB, - PCI_DEVICE_ID_INTEL_CNL_ID_U, - PCI_DEVICE_ID_INTEL_CNL_ID_Y, - PCI_DEVICE_ID_INTEL_SKL_ID_U, - PCI_DEVICE_ID_INTEL_SKL_ID_Y, - PCI_DEVICE_ID_INTEL_SKL_ID_ULX, - PCI_DEVICE_ID_INTEL_SKL_ID_H_4, - PCI_DEVICE_ID_INTEL_SKL_ID_H_2, - PCI_DEVICE_ID_INTEL_SKL_ID_S_2, - PCI_DEVICE_ID_INTEL_SKL_ID_S_4, - PCI_DEVICE_ID_INTEL_WHL_ID_W_2, - PCI_DEVICE_ID_INTEL_WHL_ID_W_4, - PCI_DEVICE_ID_INTEL_KBL_ID_S, - PCI_DEVICE_ID_INTEL_SKL_ID_H_EM, - PCI_DEVICE_ID_INTEL_KBL_ID_U, - PCI_DEVICE_ID_INTEL_KBL_ID_Y, - PCI_DEVICE_ID_INTEL_KBL_ID_H, - PCI_DEVICE_ID_INTEL_KBL_U_R, - PCI_DEVICE_ID_INTEL_KBL_ID_DT, - PCI_DEVICE_ID_INTEL_KBL_ID_DT_2, - PCI_DEVICE_ID_INTEL_CFL_ID_U, - PCI_DEVICE_ID_INTEL_CFL_ID_U_2, - PCI_DEVICE_ID_INTEL_CFL_ID_H, - PCI_DEVICE_ID_INTEL_CFL_ID_H_4, - PCI_DEVICE_ID_INTEL_CFL_ID_H_8, - PCI_DEVICE_ID_INTEL_CFL_ID_S, - PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2, - PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4, - PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8, - PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4, - PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6, - PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8, - PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4, - PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6, - PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8, - PCI_DEVICE_ID_INTEL_ICL_ID_U, - PCI_DEVICE_ID_INTEL_ICL_ID_U_2_2, - PCI_DEVICE_ID_INTEL_ICL_ID_Y, - PCI_DEVICE_ID_INTEL_ICL_ID_Y_2, - PCI_DEVICE_ID_INTEL_CML_ULT, - PCI_DEVICE_ID_INTEL_CML_ULT_2_2, - PCI_DEVICE_ID_INTEL_CML_ULT_6_2, - PCI_DEVICE_ID_INTEL_CML_ULX, - PCI_DEVICE_ID_INTEL_CML_S, - PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2, - PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2, - PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2, - PCI_DEVICE_ID_INTEL_CML_S_G0G1_4, - PCI_DEVICE_ID_INTEL_CML_S_G0G1_2, - PCI_DEVICE_ID_INTEL_CML_H, - PCI_DEVICE_ID_INTEL_CML_H_4_2, - PCI_DEVICE_ID_INTEL_CML_H_8_2, - PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2, - PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2, - PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2, - PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2, - PCI_DEVICE_ID_INTEL_TGL_ID_H_6_1, - PCI_DEVICE_ID_INTEL_TGL_ID_H_8_1, - PCI_DEVICE_ID_INTEL_EHL_ID_0, - PCI_DEVICE_ID_INTEL_EHL_ID_1, - PCI_DEVICE_ID_INTEL_EHL_ID_1A, - PCI_DEVICE_ID_INTEL_EHL_ID_2, - PCI_DEVICE_ID_INTEL_EHL_ID_2_1, - PCI_DEVICE_ID_INTEL_EHL_ID_3, - PCI_DEVICE_ID_INTEL_EHL_ID_3A, - PCI_DEVICE_ID_INTEL_EHL_ID_4, - PCI_DEVICE_ID_INTEL_EHL_ID_5, - PCI_DEVICE_ID_INTEL_EHL_ID_6, - PCI_DEVICE_ID_INTEL_EHL_ID_7, - PCI_DEVICE_ID_INTEL_EHL_ID_8, - PCI_DEVICE_ID_INTEL_EHL_ID_9, - PCI_DEVICE_ID_INTEL_EHL_ID_10, - PCI_DEVICE_ID_INTEL_EHL_ID_11, - PCI_DEVICE_ID_INTEL_EHL_ID_12, - PCI_DEVICE_ID_INTEL_EHL_ID_13, - PCI_DEVICE_ID_INTEL_EHL_ID_14, - PCI_DEVICE_ID_INTEL_EHL_ID_15, - PCI_DEVICE_ID_INTEL_JSL_ID_1, - PCI_DEVICE_ID_INTEL_JSL_ID_2, - PCI_DEVICE_ID_INTEL_JSL_ID_3, - PCI_DEVICE_ID_INTEL_JSL_ID_4, - PCI_DEVICE_ID_INTEL_JSL_ID_5, - PCI_DEVICE_ID_INTEL_ADL_S_ID_1, - PCI_DEVICE_ID_INTEL_ADL_S_ID_2, - PCI_DEVICE_ID_INTEL_ADL_S_ID_3, - PCI_DEVICE_ID_INTEL_ADL_S_ID_4, - PCI_DEVICE_ID_INTEL_ADL_S_ID_5, - PCI_DEVICE_ID_INTEL_ADL_S_ID_6, - PCI_DEVICE_ID_INTEL_ADL_S_ID_7, - PCI_DEVICE_ID_INTEL_ADL_S_ID_8, - PCI_DEVICE_ID_INTEL_ADL_S_ID_9, - PCI_DEVICE_ID_INTEL_ADL_S_ID_10, - PCI_DEVICE_ID_INTEL_ADL_S_ID_11, - PCI_DEVICE_ID_INTEL_ADL_S_ID_12, - PCI_DEVICE_ID_INTEL_ADL_S_ID_13, - PCI_DEVICE_ID_INTEL_ADL_S_ID_14, - PCI_DEVICE_ID_INTEL_ADL_S_ID_15, - PCI_DEVICE_ID_INTEL_ADL_P_ID_1, - PCI_DEVICE_ID_INTEL_ADL_P_ID_3, - PCI_DEVICE_ID_INTEL_ADL_P_ID_4, - PCI_DEVICE_ID_INTEL_ADL_P_ID_5, - PCI_DEVICE_ID_INTEL_ADL_P_ID_6, - PCI_DEVICE_ID_INTEL_ADL_P_ID_7, - PCI_DEVICE_ID_INTEL_ADL_P_ID_8, - PCI_DEVICE_ID_INTEL_ADL_P_ID_9, - PCI_DEVICE_ID_INTEL_ADL_P_ID_10, - PCI_DEVICE_ID_INTEL_ADL_M_ID_1, - PCI_DEVICE_ID_INTEL_ADL_M_ID_2, - PCI_DEVICE_ID_INTEL_ADL_N_ID_1, - PCI_DEVICE_ID_INTEL_ADL_N_ID_2, - PCI_DEVICE_ID_INTEL_ADL_N_ID_3, - PCI_DEVICE_ID_INTEL_ADL_N_ID_4, + PCI_DID_INTEL_GLK_NB, + PCI_DID_INTEL_APL_NB, + PCI_DID_INTEL_CNL_ID_U, + PCI_DID_INTEL_CNL_ID_Y, + PCI_DID_INTEL_SKL_ID_U, + PCI_DID_INTEL_SKL_ID_Y, + PCI_DID_INTEL_SKL_ID_ULX, + PCI_DID_INTEL_SKL_ID_H_4, + PCI_DID_INTEL_SKL_ID_H_2, + PCI_DID_INTEL_SKL_ID_S_2, + PCI_DID_INTEL_SKL_ID_S_4, + PCI_DID_INTEL_WHL_ID_W_2, + PCI_DID_INTEL_WHL_ID_W_4, + PCI_DID_INTEL_KBL_ID_S, + PCI_DID_INTEL_SKL_ID_H_EM, + PCI_DID_INTEL_KBL_ID_U, + PCI_DID_INTEL_KBL_ID_Y, + PCI_DID_INTEL_KBL_ID_H, + PCI_DID_INTEL_KBL_U_R, + PCI_DID_INTEL_KBL_ID_DT, + PCI_DID_INTEL_KBL_ID_DT_2, + PCI_DID_INTEL_CFL_ID_U, + PCI_DID_INTEL_CFL_ID_U_2, + PCI_DID_INTEL_CFL_ID_H, + PCI_DID_INTEL_CFL_ID_H_4, + PCI_DID_INTEL_CFL_ID_H_8, + PCI_DID_INTEL_CFL_ID_S, + PCI_DID_INTEL_CFL_ID_S_DT_2, + PCI_DID_INTEL_CFL_ID_S_DT_4, + PCI_DID_INTEL_CFL_ID_S_DT_8, + PCI_DID_INTEL_CFL_ID_S_WS_4, + PCI_DID_INTEL_CFL_ID_S_WS_6, + PCI_DID_INTEL_CFL_ID_S_WS_8, + PCI_DID_INTEL_CFL_ID_S_S_4, + PCI_DID_INTEL_CFL_ID_S_S_6, + PCI_DID_INTEL_CFL_ID_S_S_8, + PCI_DID_INTEL_ICL_ID_U, + PCI_DID_INTEL_ICL_ID_U_2_2, + PCI_DID_INTEL_ICL_ID_Y, + PCI_DID_INTEL_ICL_ID_Y_2, + PCI_DID_INTEL_CML_ULT, + PCI_DID_INTEL_CML_ULT_2_2, + PCI_DID_INTEL_CML_ULT_6_2, + PCI_DID_INTEL_CML_ULX, + PCI_DID_INTEL_CML_S, + PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2, + PCI_DID_INTEL_CML_S_P0P1_8_2, + PCI_DID_INTEL_CML_S_P0P1_10_2, + PCI_DID_INTEL_CML_S_G0G1_4, + PCI_DID_INTEL_CML_S_G0G1_2, + PCI_DID_INTEL_CML_H, + PCI_DID_INTEL_CML_H_4_2, + PCI_DID_INTEL_CML_H_8_2, + PCI_DID_INTEL_TGL_ID_U_2_2, + PCI_DID_INTEL_TGL_ID_U_4_2, + PCI_DID_INTEL_TGL_ID_Y_2_2, + PCI_DID_INTEL_TGL_ID_Y_4_2, + PCI_DID_INTEL_TGL_ID_H_6_1, + PCI_DID_INTEL_TGL_ID_H_8_1, + PCI_DID_INTEL_EHL_ID_0, + PCI_DID_INTEL_EHL_ID_1, + PCI_DID_INTEL_EHL_ID_1A, + PCI_DID_INTEL_EHL_ID_2, + PCI_DID_INTEL_EHL_ID_2_1, + PCI_DID_INTEL_EHL_ID_3, + PCI_DID_INTEL_EHL_ID_3A, + PCI_DID_INTEL_EHL_ID_4, + PCI_DID_INTEL_EHL_ID_5, + PCI_DID_INTEL_EHL_ID_6, + PCI_DID_INTEL_EHL_ID_7, + PCI_DID_INTEL_EHL_ID_8, + PCI_DID_INTEL_EHL_ID_9, + PCI_DID_INTEL_EHL_ID_10, + PCI_DID_INTEL_EHL_ID_11, + PCI_DID_INTEL_EHL_ID_12, + PCI_DID_INTEL_EHL_ID_13, + PCI_DID_INTEL_EHL_ID_14, + PCI_DID_INTEL_EHL_ID_15, + PCI_DID_INTEL_JSL_ID_1, + PCI_DID_INTEL_JSL_ID_2, + PCI_DID_INTEL_JSL_ID_3, + PCI_DID_INTEL_JSL_ID_4, + PCI_DID_INTEL_JSL_ID_5, + PCI_DID_INTEL_ADL_S_ID_1, + PCI_DID_INTEL_ADL_S_ID_2, + PCI_DID_INTEL_ADL_S_ID_3, + PCI_DID_INTEL_ADL_S_ID_4, + PCI_DID_INTEL_ADL_S_ID_5, + PCI_DID_INTEL_ADL_S_ID_6, + PCI_DID_INTEL_ADL_S_ID_7, + PCI_DID_INTEL_ADL_S_ID_8, + PCI_DID_INTEL_ADL_S_ID_9, + PCI_DID_INTEL_ADL_S_ID_10, + PCI_DID_INTEL_ADL_S_ID_11, + PCI_DID_INTEL_ADL_S_ID_12, + PCI_DID_INTEL_ADL_S_ID_13, + PCI_DID_INTEL_ADL_S_ID_14, + PCI_DID_INTEL_ADL_S_ID_15, + PCI_DID_INTEL_ADL_P_ID_1, + PCI_DID_INTEL_ADL_P_ID_3, + PCI_DID_INTEL_ADL_P_ID_4, + PCI_DID_INTEL_ADL_P_ID_5, + PCI_DID_INTEL_ADL_P_ID_6, + PCI_DID_INTEL_ADL_P_ID_7, + PCI_DID_INTEL_ADL_P_ID_8, + PCI_DID_INTEL_ADL_P_ID_9, + PCI_DID_INTEL_ADL_P_ID_10, + PCI_DID_INTEL_ADL_M_ID_1, + PCI_DID_INTEL_ADL_M_ID_2, + PCI_DID_INTEL_ADL_N_ID_1, + PCI_DID_INTEL_ADL_N_ID_2, + PCI_DID_INTEL_ADL_N_ID_3, + PCI_DID_INTEL_ADL_N_ID_4, 0 }; static const struct pci_driver systemagent_driver __pci_driver = { .ops = &systemagent_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = systemagent_ids }; diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c index 2e70d05ba3..cd960f2ea9 100644 --- a/src/soc/intel/common/block/uart/uart.c +++ b/src/soc/intel/common/block/uart/uart.c @@ -271,34 +271,34 @@ static void uart_fill_ssdt(const struct device *dev) static const char *uart_acpi_hid(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_INTEL_APL_UART0: + case PCI_DID_INTEL_APL_UART0: return "80865abc"; - case PCI_DEVICE_ID_INTEL_APL_UART1: + case PCI_DID_INTEL_APL_UART1: return "80865abe"; - case PCI_DEVICE_ID_INTEL_APL_UART2: + case PCI_DID_INTEL_APL_UART2: return "80865ac0"; - case PCI_DEVICE_ID_INTEL_GLK_UART0: + case PCI_DID_INTEL_GLK_UART0: return "808631bc"; - case PCI_DEVICE_ID_INTEL_GLK_UART1: + case PCI_DID_INTEL_GLK_UART1: return "808631be"; - case PCI_DEVICE_ID_INTEL_GLK_UART2: + case PCI_DID_INTEL_GLK_UART2: return "808631c0"; - case PCI_DEVICE_ID_INTEL_GLK_UART3: + case PCI_DID_INTEL_GLK_UART3: return "808631ee"; - case PCI_DEVICE_ID_INTEL_SPT_UART0: - case PCI_DEVICE_ID_INTEL_SPT_H_UART0: + case PCI_DID_INTEL_SPT_UART0: + case PCI_DID_INTEL_SPT_H_UART0: return "INT3448"; - case PCI_DEVICE_ID_INTEL_SPT_UART1: - case PCI_DEVICE_ID_INTEL_SPT_H_UART1: + case PCI_DID_INTEL_SPT_UART1: + case PCI_DID_INTEL_SPT_H_UART1: return "INT3449"; - case PCI_DEVICE_ID_INTEL_SPT_UART2: - case PCI_DEVICE_ID_INTEL_SPT_H_UART2: + case PCI_DID_INTEL_SPT_UART2: + case PCI_DID_INTEL_SPT_H_UART2: return "INT344A"; - case PCI_DEVICE_ID_INTEL_CNP_H_UART0: + case PCI_DID_INTEL_CNP_H_UART0: return "INT34B8"; - case PCI_DEVICE_ID_INTEL_CNP_H_UART1: + case PCI_DID_INTEL_CNP_H_UART1: return "INT34B9"; - case PCI_DEVICE_ID_INTEL_CNP_H_UART2: + case PCI_DID_INTEL_CNP_H_UART2: return "INT34BA"; default: return NULL; @@ -308,25 +308,25 @@ static const char *uart_acpi_hid(const struct device *dev) static const char *uart_acpi_name(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_INTEL_APL_UART0: - case PCI_DEVICE_ID_INTEL_GLK_UART0: - case PCI_DEVICE_ID_INTEL_SPT_UART0: - case PCI_DEVICE_ID_INTEL_SPT_H_UART0: - case PCI_DEVICE_ID_INTEL_CNP_H_UART0: + case PCI_DID_INTEL_APL_UART0: + case PCI_DID_INTEL_GLK_UART0: + case PCI_DID_INTEL_SPT_UART0: + case PCI_DID_INTEL_SPT_H_UART0: + case PCI_DID_INTEL_CNP_H_UART0: return "UAR0"; - case PCI_DEVICE_ID_INTEL_APL_UART1: - case PCI_DEVICE_ID_INTEL_GLK_UART1: - case PCI_DEVICE_ID_INTEL_SPT_UART1: - case PCI_DEVICE_ID_INTEL_SPT_H_UART1: - case PCI_DEVICE_ID_INTEL_CNP_H_UART1: + case PCI_DID_INTEL_APL_UART1: + case PCI_DID_INTEL_GLK_UART1: + case PCI_DID_INTEL_SPT_UART1: + case PCI_DID_INTEL_SPT_H_UART1: + case PCI_DID_INTEL_CNP_H_UART1: return "UAR1"; - case PCI_DEVICE_ID_INTEL_APL_UART2: - case PCI_DEVICE_ID_INTEL_GLK_UART2: - case PCI_DEVICE_ID_INTEL_SPT_UART2: - case PCI_DEVICE_ID_INTEL_SPT_H_UART2: - case PCI_DEVICE_ID_INTEL_CNP_H_UART2: + case PCI_DID_INTEL_APL_UART2: + case PCI_DID_INTEL_GLK_UART2: + case PCI_DID_INTEL_SPT_UART2: + case PCI_DID_INTEL_SPT_H_UART2: + case PCI_DID_INTEL_CNP_H_UART2: return "UAR2"; - case PCI_DEVICE_ID_INTEL_GLK_UART3: + case PCI_DID_INTEL_GLK_UART3: return "UAR3"; default: return NULL; @@ -344,75 +344,75 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_UART0, - PCI_DEVICE_ID_INTEL_SPT_UART1, - PCI_DEVICE_ID_INTEL_SPT_UART2, - PCI_DEVICE_ID_INTEL_SPT_H_UART0, - PCI_DEVICE_ID_INTEL_SPT_H_UART1, - PCI_DEVICE_ID_INTEL_SPT_H_UART2, - PCI_DEVICE_ID_INTEL_UPT_H_UART0, - PCI_DEVICE_ID_INTEL_UPT_H_UART1, - PCI_DEVICE_ID_INTEL_UPT_H_UART2, - PCI_DEVICE_ID_INTEL_APL_UART0, - PCI_DEVICE_ID_INTEL_APL_UART1, - PCI_DEVICE_ID_INTEL_APL_UART2, - PCI_DEVICE_ID_INTEL_APL_UART3, - PCI_DEVICE_ID_INTEL_CNL_UART0, - PCI_DEVICE_ID_INTEL_CNL_UART1, - PCI_DEVICE_ID_INTEL_CNL_UART2, - PCI_DEVICE_ID_INTEL_GLK_UART0, - PCI_DEVICE_ID_INTEL_GLK_UART1, - PCI_DEVICE_ID_INTEL_GLK_UART2, - PCI_DEVICE_ID_INTEL_GLK_UART3, - PCI_DEVICE_ID_INTEL_CNP_H_UART0, - PCI_DEVICE_ID_INTEL_CNP_H_UART1, - PCI_DEVICE_ID_INTEL_CNP_H_UART2, - PCI_DEVICE_ID_INTEL_ICP_UART0, - PCI_DEVICE_ID_INTEL_ICP_UART1, - PCI_DEVICE_ID_INTEL_ICP_UART2, - PCI_DEVICE_ID_INTEL_CMP_UART0, - PCI_DEVICE_ID_INTEL_CMP_UART1, - PCI_DEVICE_ID_INTEL_CMP_UART2, - PCI_DEVICE_ID_INTEL_CMP_H_UART0, - PCI_DEVICE_ID_INTEL_CMP_H_UART1, - PCI_DEVICE_ID_INTEL_CMP_H_UART2, - PCI_DEVICE_ID_INTEL_TGP_UART0, - PCI_DEVICE_ID_INTEL_TGP_UART1, - PCI_DEVICE_ID_INTEL_TGP_UART2, - PCI_DEVICE_ID_INTEL_TGP_H_UART0, - PCI_DEVICE_ID_INTEL_TGP_H_UART1, - PCI_DEVICE_ID_INTEL_TGP_H_UART2, - PCI_DEVICE_ID_INTEL_TGP_H_UART3, - PCI_DEVICE_ID_INTEL_MCC_UART0, - PCI_DEVICE_ID_INTEL_MCC_UART1, - PCI_DEVICE_ID_INTEL_MCC_UART2, - PCI_DEVICE_ID_INTEL_JSP_UART0, - PCI_DEVICE_ID_INTEL_JSP_UART1, - PCI_DEVICE_ID_INTEL_JSP_UART2, - PCI_DEVICE_ID_INTEL_ADP_S_UART0, - PCI_DEVICE_ID_INTEL_ADP_S_UART1, - PCI_DEVICE_ID_INTEL_ADP_S_UART2, - PCI_DEVICE_ID_INTEL_ADP_S_UART3, - PCI_DEVICE_ID_INTEL_ADP_S_UART4, - PCI_DEVICE_ID_INTEL_ADP_S_UART5, - PCI_DEVICE_ID_INTEL_ADP_S_UART6, - PCI_DEVICE_ID_INTEL_ADP_P_UART0, - PCI_DEVICE_ID_INTEL_ADP_P_UART1, - PCI_DEVICE_ID_INTEL_ADP_P_UART2, - PCI_DEVICE_ID_INTEL_ADP_P_UART3, - PCI_DEVICE_ID_INTEL_ADP_P_UART4, - PCI_DEVICE_ID_INTEL_ADP_P_UART5, - PCI_DEVICE_ID_INTEL_ADP_P_UART6, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART0, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART1, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART2, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART3, + PCI_DID_INTEL_SPT_UART0, + PCI_DID_INTEL_SPT_UART1, + PCI_DID_INTEL_SPT_UART2, + PCI_DID_INTEL_SPT_H_UART0, + PCI_DID_INTEL_SPT_H_UART1, + PCI_DID_INTEL_SPT_H_UART2, + PCI_DID_INTEL_UPT_H_UART0, + PCI_DID_INTEL_UPT_H_UART1, + PCI_DID_INTEL_UPT_H_UART2, + PCI_DID_INTEL_APL_UART0, + PCI_DID_INTEL_APL_UART1, + PCI_DID_INTEL_APL_UART2, + PCI_DID_INTEL_APL_UART3, + PCI_DID_INTEL_CNL_UART0, + PCI_DID_INTEL_CNL_UART1, + PCI_DID_INTEL_CNL_UART2, + PCI_DID_INTEL_GLK_UART0, + PCI_DID_INTEL_GLK_UART1, + PCI_DID_INTEL_GLK_UART2, + PCI_DID_INTEL_GLK_UART3, + PCI_DID_INTEL_CNP_H_UART0, + PCI_DID_INTEL_CNP_H_UART1, + PCI_DID_INTEL_CNP_H_UART2, + PCI_DID_INTEL_ICP_UART0, + PCI_DID_INTEL_ICP_UART1, + PCI_DID_INTEL_ICP_UART2, + PCI_DID_INTEL_CMP_UART0, + PCI_DID_INTEL_CMP_UART1, + PCI_DID_INTEL_CMP_UART2, + PCI_DID_INTEL_CMP_H_UART0, + PCI_DID_INTEL_CMP_H_UART1, + PCI_DID_INTEL_CMP_H_UART2, + PCI_DID_INTEL_TGP_UART0, + PCI_DID_INTEL_TGP_UART1, + PCI_DID_INTEL_TGP_UART2, + PCI_DID_INTEL_TGP_H_UART0, + PCI_DID_INTEL_TGP_H_UART1, + PCI_DID_INTEL_TGP_H_UART2, + PCI_DID_INTEL_TGP_H_UART3, + PCI_DID_INTEL_MCC_UART0, + PCI_DID_INTEL_MCC_UART1, + PCI_DID_INTEL_MCC_UART2, + PCI_DID_INTEL_JSP_UART0, + PCI_DID_INTEL_JSP_UART1, + PCI_DID_INTEL_JSP_UART2, + PCI_DID_INTEL_ADP_S_UART0, + PCI_DID_INTEL_ADP_S_UART1, + PCI_DID_INTEL_ADP_S_UART2, + PCI_DID_INTEL_ADP_S_UART3, + PCI_DID_INTEL_ADP_S_UART4, + PCI_DID_INTEL_ADP_S_UART5, + PCI_DID_INTEL_ADP_S_UART6, + PCI_DID_INTEL_ADP_P_UART0, + PCI_DID_INTEL_ADP_P_UART1, + PCI_DID_INTEL_ADP_P_UART2, + PCI_DID_INTEL_ADP_P_UART3, + PCI_DID_INTEL_ADP_P_UART4, + PCI_DID_INTEL_ADP_P_UART5, + PCI_DID_INTEL_ADP_P_UART6, + PCI_DID_INTEL_ADP_M_N_UART0, + PCI_DID_INTEL_ADP_M_N_UART1, + PCI_DID_INTEL_ADP_M_N_UART2, + PCI_DID_INTEL_ADP_M_N_UART3, 0, }; static const struct pci_driver pch_uart __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/usb4/usb4.c b/src/soc/intel/common/block/usb4/usb4.c index 0ec4d5fdf3..996e7f52ee 100644 --- a/src/soc/intel/common/block/usb4/usb4.c +++ b/src/soc/intel/common/block/usb4/usb4.c @@ -53,12 +53,12 @@ static void tbt_dma_fill_ssdt(const struct device *dev) #endif static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGL_TBT_DMA0, - PCI_DEVICE_ID_INTEL_TGL_TBT_DMA1, - PCI_DEVICE_ID_INTEL_TGL_H_TBT_DMA0, - PCI_DEVICE_ID_INTEL_TGL_H_TBT_DMA1, - PCI_DEVICE_ID_INTEL_ADL_TBT_DMA0, - PCI_DEVICE_ID_INTEL_ADL_TBT_DMA1, + PCI_DID_INTEL_TGL_TBT_DMA0, + PCI_DID_INTEL_TGL_TBT_DMA1, + PCI_DID_INTEL_TGL_H_TBT_DMA0, + PCI_DID_INTEL_TGL_H_TBT_DMA1, + PCI_DID_INTEL_ADL_TBT_DMA0, + PCI_DID_INTEL_ADL_TBT_DMA1, 0 }; @@ -76,6 +76,6 @@ static struct device_operations usb4_dev_ops = { static const struct pci_driver usb4_driver __pci_driver = { .ops = &usb4_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/usb4/xhci.c b/src/soc/intel/common/block/usb4/xhci.c index d0be8e5f9f..ba6b83f1ac 100644 --- a/src/soc/intel/common/block/usb4/xhci.c +++ b/src/soc/intel/common/block/usb4/xhci.c @@ -26,14 +26,14 @@ static struct device_operations usb4_xhci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGP_TCSS_XHCI, - PCI_DEVICE_ID_INTEL_TGP_H_TCSS_XHCI, - PCI_DEVICE_ID_INTEL_ADP_TCSS_XHCI, + PCI_DID_INTEL_TGP_TCSS_XHCI, + PCI_DID_INTEL_TGP_H_TCSS_XHCI, + PCI_DID_INTEL_ADP_TCSS_XHCI, 0 }; static const struct pci_driver usb4_xhci __pci_driver = { .ops = &usb4_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c index 5322075d16..4b751aea24 100644 --- a/src/soc/intel/common/block/xdci/xdci.c +++ b/src/soc/intel/common/block/xdci/xdci.c @@ -27,26 +27,26 @@ static struct device_operations usb_xdci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_XDCI, - PCI_DEVICE_ID_INTEL_CNL_LP_XDCI, - PCI_DEVICE_ID_INTEL_GLK_XDCI, - PCI_DEVICE_ID_INTEL_SPT_LP_XDCI, - PCI_DEVICE_ID_INTEL_CNP_H_XDCI, - PCI_DEVICE_ID_INTEL_ICP_LP_XDCI, - PCI_DEVICE_ID_INTEL_CMP_LP_XDCI, - PCI_DEVICE_ID_INTEL_CMP_H_XDCI, - PCI_DEVICE_ID_INTEL_TGP_LP_XDCI, - PCI_DEVICE_ID_INTEL_TGP_H_XDCI, - PCI_DEVICE_ID_INTEL_MCC_XDCI, - PCI_DEVICE_ID_INTEL_JSP_XDCI, - PCI_DEVICE_ID_INTEL_ADP_P_XDCI, - PCI_DEVICE_ID_INTEL_ADP_S_XDCI, - PCI_DEVICE_ID_INTEL_ADP_M_XDCI, + PCI_DID_INTEL_APL_XDCI, + PCI_DID_INTEL_CNL_LP_XDCI, + PCI_DID_INTEL_GLK_XDCI, + PCI_DID_INTEL_SPT_LP_XDCI, + PCI_DID_INTEL_CNP_H_XDCI, + PCI_DID_INTEL_ICP_LP_XDCI, + PCI_DID_INTEL_CMP_LP_XDCI, + PCI_DID_INTEL_CMP_H_XDCI, + PCI_DID_INTEL_TGP_LP_XDCI, + PCI_DID_INTEL_TGP_H_XDCI, + PCI_DID_INTEL_MCC_XDCI, + PCI_DID_INTEL_JSP_XDCI, + PCI_DID_INTEL_ADP_P_XDCI, + PCI_DID_INTEL_ADP_S_XDCI, + PCI_DID_INTEL_ADP_M_XDCI, 0 }; static const struct pci_driver pch_usb_xdci __pci_driver = { .ops = &usb_xdci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index 5b19fc9e36..353840a2ca 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -106,30 +106,30 @@ static struct device_operations usb_xhci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_XHCI, - PCI_DEVICE_ID_INTEL_CNL_LP_XHCI, - PCI_DEVICE_ID_INTEL_GLK_XHCI, - PCI_DEVICE_ID_INTEL_SPT_LP_XHCI, - PCI_DEVICE_ID_INTEL_SPT_H_XHCI, - PCI_DEVICE_ID_INTEL_LWB_XHCI, - PCI_DEVICE_ID_INTEL_LWB_XHCI_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_XHCI, - PCI_DEVICE_ID_INTEL_CNP_H_XHCI, - PCI_DEVICE_ID_INTEL_ICP_LP_XHCI, - PCI_DEVICE_ID_INTEL_CMP_LP_XHCI, - PCI_DEVICE_ID_INTEL_CMP_H_XHCI, - PCI_DEVICE_ID_INTEL_TGP_LP_XHCI, - PCI_DEVICE_ID_INTEL_TGP_H_XHCI, - PCI_DEVICE_ID_INTEL_MCC_XHCI, - PCI_DEVICE_ID_INTEL_JSP_XHCI, - PCI_DEVICE_ID_INTEL_ADP_P_XHCI, - PCI_DEVICE_ID_INTEL_ADP_S_XHCI, - PCI_DEVICE_ID_INTEL_ADP_M_XHCI, + PCI_DID_INTEL_APL_XHCI, + PCI_DID_INTEL_CNL_LP_XHCI, + PCI_DID_INTEL_GLK_XHCI, + PCI_DID_INTEL_SPT_LP_XHCI, + PCI_DID_INTEL_SPT_H_XHCI, + PCI_DID_INTEL_LWB_XHCI, + PCI_DID_INTEL_LWB_XHCI_SUPER, + PCI_DID_INTEL_UPT_H_XHCI, + PCI_DID_INTEL_CNP_H_XHCI, + PCI_DID_INTEL_ICP_LP_XHCI, + PCI_DID_INTEL_CMP_LP_XHCI, + PCI_DID_INTEL_CMP_H_XHCI, + PCI_DID_INTEL_TGP_LP_XHCI, + PCI_DID_INTEL_TGP_H_XHCI, + PCI_DID_INTEL_MCC_XHCI, + PCI_DID_INTEL_JSP_XHCI, + PCI_DID_INTEL_ADP_P_XHCI, + PCI_DID_INTEL_ADP_S_XHCI, + PCI_DID_INTEL_ADP_M_XHCI, 0 }; static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/denverton_ns/csme_ie_kt.c b/src/soc/intel/denverton_ns/csme_ie_kt.c index ce00627ba2..0510ef2bb4 100644 --- a/src/soc/intel/denverton_ns/csme_ie_kt.c +++ b/src/soc/intel/denverton_ns/csme_ie_kt.c @@ -59,13 +59,13 @@ static struct device_operations csme_ie_kt_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_DNV_ME_KT, - PCI_DEVICE_ID_INTEL_DNV_IE_KT, + PCI_DID_INTEL_DNV_ME_KT, + PCI_DID_INTEL_DNV_IE_KT, 0 }; static const struct pci_driver csme_ie_kt __pci_driver = { .ops = &csme_ie_kt_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c index 50bf49de77..38df89261e 100644 --- a/src/soc/intel/denverton_ns/lpc.c +++ b/src/soc/intel/denverton_ns/lpc.c @@ -534,8 +534,8 @@ static struct device_operations device_ops = { static const struct pci_driver lpc_driver __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_DNV_LPC, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_DNV_LPC, }; static void finalize_chipset(void *unused) diff --git a/src/soc/intel/denverton_ns/npk.c b/src/soc/intel/denverton_ns/npk.c index ea4816ef05..151992376e 100644 --- a/src/soc/intel/denverton_ns/npk.c +++ b/src/soc/intel/denverton_ns/npk.c @@ -30,6 +30,6 @@ static struct device_operations pmc_ops = { static const struct pci_driver pch_pmc __pci_driver = { .ops = &pmc_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_DNV_TRACEHUB, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_DNV_TRACEHUB, }; diff --git a/src/soc/intel/denverton_ns/sata.c b/src/soc/intel/denverton_ns/sata.c index 1f551f8330..3fb5d75c32 100644 --- a/src/soc/intel/denverton_ns/sata.c +++ b/src/soc/intel/denverton_ns/sata.c @@ -56,13 +56,13 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_DNV_SATA_AHCI_1, - PCI_DEVICE_ID_INTEL_DNV_SATA_AHCI_2, + PCI_DID_INTEL_DNV_SATA_AHCI_1, + PCI_DID_INTEL_DNV_SATA_AHCI_2, 0 }; static const struct pci_driver soc_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/denverton_ns/systemagent.c b/src/soc/intel/denverton_ns/systemagent.c index 48b48610a3..16b73281b4 100644 --- a/src/soc/intel/denverton_ns/systemagent.c +++ b/src/soc/intel/denverton_ns/systemagent.c @@ -333,13 +333,13 @@ static struct device_operations systemagent_ops = { /* IDs for System Agent device of Intel Denverton SoC */ static const unsigned short systemagent_ids[] = { - PCI_DEVICE_ID_INTEL_DNV_SA, - PCI_DEVICE_ID_INTEL_DNVAD_SA, + PCI_DID_INTEL_DNV_SA, + PCI_DID_INTEL_DNVAD_SA, 0 }; static const struct pci_driver systemagent_driver __pci_driver = { .ops = &systemagent_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = systemagent_ids }; diff --git a/src/soc/intel/denverton_ns/uart.c b/src/soc/intel/denverton_ns/uart.c index f9aa64a0cf..b8598cc4ef 100644 --- a/src/soc/intel/denverton_ns/uart.c +++ b/src/soc/intel/denverton_ns/uart.c @@ -44,8 +44,8 @@ static struct device_operations uart_ops = { static const struct pci_driver uart_driver __pci_driver = { .ops = &uart_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_DNV_HSUART + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_DNV_HSUART }; static void hide_hsuarts(void) diff --git a/src/soc/intel/denverton_ns/xhci.c b/src/soc/intel/denverton_ns/xhci.c index 5e1e4263a4..2760120c2b 100644 --- a/src/soc/intel/denverton_ns/xhci.c +++ b/src/soc/intel/denverton_ns/xhci.c @@ -31,6 +31,6 @@ static struct device_operations usb_xhci_ops = { static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_DNV_XHCI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_DNV_XHCI, }; diff --git a/src/soc/intel/elkhartlake/bootblock/report_platform.c b/src/soc/intel/elkhartlake/bootblock/report_platform.c index 9cb32ccd72..cc3462d4e2 100644 --- a/src/soc/intel/elkhartlake/bootblock/report_platform.c +++ b/src/soc/intel/elkhartlake/bootblock/report_platform.c @@ -25,49 +25,49 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_EHL_ID_0, "Elkhartlake SKU-0" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_1, "Elkhartlake SKU-1" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_1A, "Elkhartlake SKU-1A" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_2, "Elkhartlake SKU-2" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_2_1, "Elkhartlake SKU-2" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_3, "Elkhartlake SKU-3" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_3A, "Elkhartlake SKU-3A" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_4, "Elkhartlake SKU-4" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_5, "Elkhartlake SKU-5" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_6, "Elkhartlake SKU-6" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_7, "Elkhartlake SKU-7" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_8, "Elkhartlake SKU-8" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_9, "Elkhartlake SKU-9" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_10, "Elkhartlake SKU-10" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_11, "Elkhartlake SKU-11" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_12, "Elkhartlake SKU-12" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_13, "Elkhartlake SKU-13" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_14, "Elkhartlake SKU-14" }, - { PCI_DEVICE_ID_INTEL_EHL_ID_15, "Elkhartlake SKU-15" }, + { PCI_DID_INTEL_EHL_ID_0, "Elkhartlake SKU-0" }, + { PCI_DID_INTEL_EHL_ID_1, "Elkhartlake SKU-1" }, + { PCI_DID_INTEL_EHL_ID_1A, "Elkhartlake SKU-1A" }, + { PCI_DID_INTEL_EHL_ID_2, "Elkhartlake SKU-2" }, + { PCI_DID_INTEL_EHL_ID_2_1, "Elkhartlake SKU-2" }, + { PCI_DID_INTEL_EHL_ID_3, "Elkhartlake SKU-3" }, + { PCI_DID_INTEL_EHL_ID_3A, "Elkhartlake SKU-3A" }, + { PCI_DID_INTEL_EHL_ID_4, "Elkhartlake SKU-4" }, + { PCI_DID_INTEL_EHL_ID_5, "Elkhartlake SKU-5" }, + { PCI_DID_INTEL_EHL_ID_6, "Elkhartlake SKU-6" }, + { PCI_DID_INTEL_EHL_ID_7, "Elkhartlake SKU-7" }, + { PCI_DID_INTEL_EHL_ID_8, "Elkhartlake SKU-8" }, + { PCI_DID_INTEL_EHL_ID_9, "Elkhartlake SKU-9" }, + { PCI_DID_INTEL_EHL_ID_10, "Elkhartlake SKU-10" }, + { PCI_DID_INTEL_EHL_ID_11, "Elkhartlake SKU-11" }, + { PCI_DID_INTEL_EHL_ID_12, "Elkhartlake SKU-12" }, + { PCI_DID_INTEL_EHL_ID_13, "Elkhartlake SKU-13" }, + { PCI_DID_INTEL_EHL_ID_14, "Elkhartlake SKU-14" }, + { PCI_DID_INTEL_EHL_ID_15, "Elkhartlake SKU-15" }, }; static struct { u16 espiid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_MCC_ESPI_0, "Elkhartlake-0" }, - { PCI_DEVICE_ID_INTEL_MCC_ESPI_1, "Elkhartlake-1" }, - { PCI_DEVICE_ID_INTEL_MCC_BASE_ESPI, "Elkhartlake Base" }, - { PCI_DEVICE_ID_INTEL_MCC_PREMIUM_ESPI, "Elkhartlake Premium" }, - { PCI_DEVICE_ID_INTEL_MCC_SUPER_ESPI, "Elkhartlake Super" }, + { PCI_DID_INTEL_MCC_ESPI_0, "Elkhartlake-0" }, + { PCI_DID_INTEL_MCC_ESPI_1, "Elkhartlake-1" }, + { PCI_DID_INTEL_MCC_BASE_ESPI, "Elkhartlake Base" }, + { PCI_DID_INTEL_MCC_PREMIUM_ESPI, "Elkhartlake Premium" }, + { PCI_DID_INTEL_MCC_SUPER_ESPI, "Elkhartlake Super" }, }; static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_EHL_GT1_1, "Elkhartlake GT1-1" }, - { PCI_DEVICE_ID_INTEL_EHL_GT2_1, "Elkhartlake GT2-1" }, - { PCI_DEVICE_ID_INTEL_EHL_GT1_2, "Elkhartlake GT1-2" }, - { PCI_DEVICE_ID_INTEL_EHL_GT1_2_1, "Elkhartlake GT1-2-1" }, - { PCI_DEVICE_ID_INTEL_EHL_GT2_2, "Elkhartlake GT2-2" }, - { PCI_DEVICE_ID_INTEL_EHL_GT1_3, "Elkhartlake GT1-3" }, - { PCI_DEVICE_ID_INTEL_EHL_GT2_3, "Elkhartlake GT2-3" }, + { PCI_DID_INTEL_EHL_GT1_1, "Elkhartlake GT1-1" }, + { PCI_DID_INTEL_EHL_GT2_1, "Elkhartlake GT2-1" }, + { PCI_DID_INTEL_EHL_GT1_2, "Elkhartlake GT1-2" }, + { PCI_DID_INTEL_EHL_GT1_2_1, "Elkhartlake GT1-2-1" }, + { PCI_DID_INTEL_EHL_GT2_2, "Elkhartlake GT2-2" }, + { PCI_DID_INTEL_EHL_GT1_3, "Elkhartlake GT1-3" }, + { PCI_DID_INTEL_EHL_GT2_3, "Elkhartlake GT2-3" }, }; static inline uint8_t get_dev_revision(pci_devfn_t dev) diff --git a/src/soc/intel/icelake/bootblock/report_platform.c b/src/soc/intel/icelake/bootblock/report_platform.c index 8c6a6ef8db..2188009bd2 100644 --- a/src/soc/intel/icelake/bootblock/report_platform.c +++ b/src/soc/intel/icelake/bootblock/report_platform.c @@ -25,44 +25,44 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_ICL_ID_U, "Icelake-U" }, - { PCI_DEVICE_ID_INTEL_ICL_ID_U_2_2, "Icelake-U-2-2" }, - { PCI_DEVICE_ID_INTEL_ICL_ID_Y, "Icelake-Y" }, - { PCI_DEVICE_ID_INTEL_ICL_ID_Y_2, "Icelake-Y-2" }, + { PCI_DID_INTEL_ICL_ID_U, "Icelake-U" }, + { PCI_DID_INTEL_ICL_ID_U_2_2, "Icelake-U-2-2" }, + { PCI_DID_INTEL_ICL_ID_Y, "Icelake-Y" }, + { PCI_DID_INTEL_ICL_ID_Y_2, "Icelake-Y-2" }, }; static struct { u16 espiid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_ICL_BASE_U_ESPI, "Icelake-U Base" }, - { PCI_DEVICE_ID_INTEL_ICL_BASE_Y_ESPI, "Icelake-Y Base" }, - { PCI_DEVICE_ID_INTEL_ICL_U_PREMIUM_ESPI, "Icelake-U Premium" }, - { PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI, "Icelake-U Super" }, - { PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI_REV0, "Icelake-U Super REV0" }, - { PCI_DEVICE_ID_INTEL_ICL_SUPER_Y_ESPI, "Icelake-Y Super" }, - { PCI_DEVICE_ID_INTEL_ICL_Y_PREMIUM_ESPI, "Icelake-Y Premium" }, + { PCI_DID_INTEL_ICL_BASE_U_ESPI, "Icelake-U Base" }, + { PCI_DID_INTEL_ICL_BASE_Y_ESPI, "Icelake-Y Base" }, + { PCI_DID_INTEL_ICL_U_PREMIUM_ESPI, "Icelake-U Premium" }, + { PCI_DID_INTEL_ICL_U_SUPER_U_ESPI, "Icelake-U Super" }, + { PCI_DID_INTEL_ICL_U_SUPER_U_ESPI_REV0, "Icelake-U Super REV0" }, + { PCI_DID_INTEL_ICL_SUPER_Y_ESPI, "Icelake-Y Super" }, + { PCI_DID_INTEL_ICL_Y_PREMIUM_ESPI, "Icelake-Y Premium" }, }; static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_ICL_GT0_ULT, "Icelake ULT GT0" }, - { PCI_DEVICE_ID_INTEL_ICL_GT0_5_ULT, "Icelake ULT GT0.5" }, - { PCI_DEVICE_ID_INTEL_ICL_GT1_ULT, "Icelake U GT1" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_0, "Icelake Y GT2" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_1, "Icelake Y GT2_1" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_1, "Icelake U GT2_1" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_2, "Icelake Y GT2_2" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_2, "Icelake U GT2_2" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_3, "Icelake Y GT2_3" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_3, "Icelake U GT2_3" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_4, "Icelake Y GT2_4" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_4, "Icelake U GT2_4" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_5, "Icelake Y GT2_5" }, - { PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_5, "Icelake U GT2_5" }, - { PCI_DEVICE_ID_INTEL_ICL_GT3_ULT, "Icelake U GT3" }, + { PCI_DID_INTEL_ICL_GT0_ULT, "Icelake ULT GT0" }, + { PCI_DID_INTEL_ICL_GT0_5_ULT, "Icelake ULT GT0.5" }, + { PCI_DID_INTEL_ICL_GT1_ULT, "Icelake U GT1" }, + { PCI_DID_INTEL_ICL_GT2_ULX_0, "Icelake Y GT2" }, + { PCI_DID_INTEL_ICL_GT2_ULX_1, "Icelake Y GT2_1" }, + { PCI_DID_INTEL_ICL_GT2_ULT_1, "Icelake U GT2_1" }, + { PCI_DID_INTEL_ICL_GT2_ULX_2, "Icelake Y GT2_2" }, + { PCI_DID_INTEL_ICL_GT2_ULT_2, "Icelake U GT2_2" }, + { PCI_DID_INTEL_ICL_GT2_ULX_3, "Icelake Y GT2_3" }, + { PCI_DID_INTEL_ICL_GT2_ULT_3, "Icelake U GT2_3" }, + { PCI_DID_INTEL_ICL_GT2_ULX_4, "Icelake Y GT2_4" }, + { PCI_DID_INTEL_ICL_GT2_ULT_4, "Icelake U GT2_4" }, + { PCI_DID_INTEL_ICL_GT2_ULX_5, "Icelake Y GT2_5" }, + { PCI_DID_INTEL_ICL_GT2_ULT_5, "Icelake U GT2_5" }, + { PCI_DID_INTEL_ICL_GT3_ULT, "Icelake U GT3" }, }; static uint8_t get_dev_revision(pci_devfn_t dev) diff --git a/src/soc/intel/jasperlake/bootblock/report_platform.c b/src/soc/intel/jasperlake/bootblock/report_platform.c index 241e17285d..0d2fe432fb 100644 --- a/src/soc/intel/jasperlake/bootblock/report_platform.c +++ b/src/soc/intel/jasperlake/bootblock/report_platform.c @@ -24,28 +24,28 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_JSL_ID_1, "Jasperlake SKU4-1" }, - { PCI_DEVICE_ID_INTEL_JSL_ID_2, "Jasperlake SKU4-2" }, - { PCI_DEVICE_ID_INTEL_JSL_ID_3, "Jasperlake SKU2-1" }, - { PCI_DEVICE_ID_INTEL_JSL_ID_4, "Jasperlake SKU2-2" }, - { PCI_DEVICE_ID_INTEL_JSL_ID_5, "Jasperlake SKU4-3" }, + { PCI_DID_INTEL_JSL_ID_1, "Jasperlake SKU4-1" }, + { PCI_DID_INTEL_JSL_ID_2, "Jasperlake SKU4-2" }, + { PCI_DID_INTEL_JSL_ID_3, "Jasperlake SKU2-1" }, + { PCI_DID_INTEL_JSL_ID_4, "Jasperlake SKU2-2" }, + { PCI_DID_INTEL_JSL_ID_5, "Jasperlake SKU4-3" }, }; static struct { u16 espiid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_JSP_SUPER_ESPI, "Jasperlake Super" }, + { PCI_DID_INTEL_JSP_SUPER_ESPI, "Jasperlake Super" }, }; static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_JSL_GT1, "Jasperlake GT1" }, - { PCI_DEVICE_ID_INTEL_JSL_GT2, "Jasperlake GT2" }, - { PCI_DEVICE_ID_INTEL_JSL_GT3, "Jasperlake GT3" }, - { PCI_DEVICE_ID_INTEL_JSL_GT4, "Jasperlake GT4" }, + { PCI_DID_INTEL_JSL_GT1, "Jasperlake GT1" }, + { PCI_DID_INTEL_JSL_GT2, "Jasperlake GT2" }, + { PCI_DID_INTEL_JSL_GT3, "Jasperlake GT3" }, + { PCI_DID_INTEL_JSL_GT4, "Jasperlake GT4" }, }; static inline uint8_t get_dev_revision(pci_devfn_t dev) diff --git a/src/soc/intel/quark/ehci.c b/src/soc/intel/quark/ehci.c index e9fb91b0e4..3005610439 100644 --- a/src/soc/intel/quark/ehci.c +++ b/src/soc/intel/quark/ehci.c @@ -114,6 +114,6 @@ static struct device_operations device_ops = { static const struct pci_driver driver __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = EHCI_DEVID, }; diff --git a/src/soc/intel/quark/gpio_i2c.c b/src/soc/intel/quark/gpio_i2c.c index e128a09fe6..4910f1b8c6 100644 --- a/src/soc/intel/quark/gpio_i2c.c +++ b/src/soc/intel/quark/gpio_i2c.c @@ -24,6 +24,6 @@ static struct device_operations device_ops = { static const struct pci_driver gfx_driver __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = I2CGPIO_DEVID, }; diff --git a/src/soc/intel/quark/lpc.c b/src/soc/intel/quark/lpc.c index ad97456579..92b7249293 100644 --- a/src/soc/intel/quark/lpc.c +++ b/src/soc/intel/quark/lpc.c @@ -43,6 +43,6 @@ static struct device_operations device_ops = { static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = QUARK_V_LPC_DEVICE_ID_0, }; diff --git a/src/soc/intel/quark/northcluster.c b/src/soc/intel/quark/northcluster.c index fb9597710f..5cb0c812d7 100644 --- a/src/soc/intel/quark/northcluster.c +++ b/src/soc/intel/quark/northcluster.c @@ -63,6 +63,6 @@ static struct device_operations nc_ops = { static const struct pci_driver systemagent_driver __pci_driver = { .ops = &nc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = QUARK_MC_DEVICE_ID }; diff --git a/src/soc/intel/quark/sd.c b/src/soc/intel/quark/sd.c index b1f6583ce7..2a52ff3da0 100644 --- a/src/soc/intel/quark/sd.c +++ b/src/soc/intel/quark/sd.c @@ -30,6 +30,6 @@ static const struct device_operations device_ops = { static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x08A7, }; diff --git a/src/soc/intel/quark/spi.c b/src/soc/intel/quark/spi.c index d7e35cdb34..cc284f33a7 100644 --- a/src/soc/intel/quark/spi.c +++ b/src/soc/intel/quark/spi.c @@ -224,7 +224,7 @@ void spi_init(void) /* Determine the base address of the SPI flash controller */ context = &spi_driver_context; - dev = dev_find_device(PCI_VENDOR_ID_INTEL, LPC_DEVID, NULL); + dev = dev_find_device(PCI_VID_INTEL, LPC_DEVID, NULL); rcba = pci_read_config32(dev, R_QNC_LPC_RCBA); if (!(rcba & B_QNC_LPC_RCBA_EN)) { printk(BIOS_ERR, "RBCA not enabled\n"); diff --git a/src/soc/intel/quark/uart.c b/src/soc/intel/quark/uart.c index cf363b1ac7..c045c34a71 100644 --- a/src/soc/intel/quark/uart.c +++ b/src/soc/intel/quark/uart.c @@ -28,6 +28,6 @@ static struct device_operations device_ops = { static const struct pci_driver uart_driver __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = HSUART_DEVID, }; diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c index 4af51d60ff..3cfac5eb4a 100644 --- a/src/soc/intel/skylake/bootblock/report_platform.c +++ b/src/soc/intel/skylake/bootblock/report_platform.c @@ -34,62 +34,62 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_SKL_ID_U, "Skylake-U" }, - { PCI_DEVICE_ID_INTEL_SKL_ID_Y, "Skylake-Y" }, - { PCI_DEVICE_ID_INTEL_SKL_ID_ULX, "Skylake-ULX" }, - { PCI_DEVICE_ID_INTEL_SKL_ID_H_4, "Skylake-H (4 Core)" }, - { PCI_DEVICE_ID_INTEL_SKL_ID_H_EM, "Skylake-H Embedded" }, - { PCI_DEVICE_ID_INTEL_SKL_ID_H_2, "Skylake-H (2 Core)" }, - { PCI_DEVICE_ID_INTEL_SKL_ID_S_2, "Skylake-S (2 Core)" }, - { PCI_DEVICE_ID_INTEL_SKL_ID_S_4, "Skylake-S (4 Core) / Skylake-DT" }, - { PCI_DEVICE_ID_INTEL_KBL_ID_U, "Kabylake-U" }, - { PCI_DEVICE_ID_INTEL_KBL_U_R, "Kabylake-R ULT"}, - { PCI_DEVICE_ID_INTEL_KBL_ID_Y, "Kabylake-Y" }, - { PCI_DEVICE_ID_INTEL_KBL_ID_H, "Kabylake-H" }, - { PCI_DEVICE_ID_INTEL_KBL_ID_S, "Kabylake-S" }, - { PCI_DEVICE_ID_INTEL_KBL_ID_DT, "Kabylake DT" }, - { PCI_DEVICE_ID_INTEL_KBL_ID_DT_2, "Kabylake DT 2" }, + { PCI_DID_INTEL_SKL_ID_U, "Skylake-U" }, + { PCI_DID_INTEL_SKL_ID_Y, "Skylake-Y" }, + { PCI_DID_INTEL_SKL_ID_ULX, "Skylake-ULX" }, + { PCI_DID_INTEL_SKL_ID_H_4, "Skylake-H (4 Core)" }, + { PCI_DID_INTEL_SKL_ID_H_EM, "Skylake-H Embedded" }, + { PCI_DID_INTEL_SKL_ID_H_2, "Skylake-H (2 Core)" }, + { PCI_DID_INTEL_SKL_ID_S_2, "Skylake-S (2 Core)" }, + { PCI_DID_INTEL_SKL_ID_S_4, "Skylake-S (4 Core) / Skylake-DT" }, + { PCI_DID_INTEL_KBL_ID_U, "Kabylake-U" }, + { PCI_DID_INTEL_KBL_U_R, "Kabylake-R ULT"}, + { PCI_DID_INTEL_KBL_ID_Y, "Kabylake-Y" }, + { PCI_DID_INTEL_KBL_ID_H, "Kabylake-H" }, + { PCI_DID_INTEL_KBL_ID_S, "Kabylake-S" }, + { PCI_DID_INTEL_KBL_ID_DT, "Kabylake DT" }, + { PCI_DID_INTEL_KBL_ID_DT_2, "Kabylake DT 2" }, }; static struct { u16 lpcid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_SPT_LP_SAMPLE, "Skylake LP Sample" }, - { PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE, "Skylake-U Base" }, - { PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM, "Skylake-U Premium" }, - { PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM, "Skylake-Y Premium" }, - { PCI_DEVICE_ID_INTEL_SPT_H_H110, "H110" }, - { PCI_DEVICE_ID_INTEL_SPT_H_H170, "H170" }, - { PCI_DEVICE_ID_INTEL_SPT_H_Z170, "Z170" }, - { PCI_DEVICE_ID_INTEL_SPT_H_Q170, "Q170" }, - { PCI_DEVICE_ID_INTEL_SPT_H_Q150, "Q150" }, - { PCI_DEVICE_ID_INTEL_SPT_H_B150, "B150" }, - { PCI_DEVICE_ID_INTEL_SPT_H_C236, "C236" }, - { PCI_DEVICE_ID_INTEL_SPT_H_C232, "C232" }, - { PCI_DEVICE_ID_INTEL_SPT_H_QM170, "QM170" }, - { PCI_DEVICE_ID_INTEL_SPT_H_HM170, "HM170" }, - { PCI_DEVICE_ID_INTEL_SPT_H_CM236, "CM236" }, - { PCI_DEVICE_ID_INTEL_SPT_H_HM175, "HM175" }, - { PCI_DEVICE_ID_INTEL_SPT_H_QM175, "QM175" }, - { PCI_DEVICE_ID_INTEL_SPT_H_CM238, "CM238" }, - { PCI_DEVICE_ID_INTEL_UPT_H_Q270, "Q270" }, - { PCI_DEVICE_ID_INTEL_UPT_H_H270, "H270" }, - { PCI_DEVICE_ID_INTEL_UPT_H_Z270, "Z270" }, - { PCI_DEVICE_ID_INTEL_UPT_H_B250, "B250" }, - { PCI_DEVICE_ID_INTEL_UPT_H_Q250, "Q250" }, - { PCI_DEVICE_ID_INTEL_UPT_H_Z370, "Z370" }, - { PCI_DEVICE_ID_INTEL_UPT_H_H310C, "H310C" }, - { PCI_DEVICE_ID_INTEL_UPT_H_B365, "B365" }, - { PCI_DEVICE_ID_INTEL_UPT_LP_U_BASE, "Kabylake-U Base" }, - { PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM, "Kabylake-U Premium" }, - { PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM, "Kabylake-Y Premium" }, - { PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU, "Kabylake Super Sku" }, - { PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22, + { PCI_DID_INTEL_SPT_LP_SAMPLE, "Skylake LP Sample" }, + { PCI_DID_INTEL_SPT_LP_U_BASE, "Skylake-U Base" }, + { PCI_DID_INTEL_SPT_LP_U_PREMIUM, "Skylake-U Premium" }, + { PCI_DID_INTEL_SPT_LP_Y_PREMIUM, "Skylake-Y Premium" }, + { PCI_DID_INTEL_SPT_H_H110, "H110" }, + { PCI_DID_INTEL_SPT_H_H170, "H170" }, + { PCI_DID_INTEL_SPT_H_Z170, "Z170" }, + { PCI_DID_INTEL_SPT_H_Q170, "Q170" }, + { PCI_DID_INTEL_SPT_H_Q150, "Q150" }, + { PCI_DID_INTEL_SPT_H_B150, "B150" }, + { PCI_DID_INTEL_SPT_H_C236, "C236" }, + { PCI_DID_INTEL_SPT_H_C232, "C232" }, + { PCI_DID_INTEL_SPT_H_QM170, "QM170" }, + { PCI_DID_INTEL_SPT_H_HM170, "HM170" }, + { PCI_DID_INTEL_SPT_H_CM236, "CM236" }, + { PCI_DID_INTEL_SPT_H_HM175, "HM175" }, + { PCI_DID_INTEL_SPT_H_QM175, "QM175" }, + { PCI_DID_INTEL_SPT_H_CM238, "CM238" }, + { PCI_DID_INTEL_UPT_H_Q270, "Q270" }, + { PCI_DID_INTEL_UPT_H_H270, "H270" }, + { PCI_DID_INTEL_UPT_H_Z270, "Z270" }, + { PCI_DID_INTEL_UPT_H_B250, "B250" }, + { PCI_DID_INTEL_UPT_H_Q250, "Q250" }, + { PCI_DID_INTEL_UPT_H_Z370, "Z370" }, + { PCI_DID_INTEL_UPT_H_H310C, "H310C" }, + { PCI_DID_INTEL_UPT_H_B365, "B365" }, + { PCI_DID_INTEL_UPT_LP_U_BASE, "Kabylake-U Base" }, + { PCI_DID_INTEL_UPT_LP_U_PREMIUM, "Kabylake-U Premium" }, + { PCI_DID_INTEL_UPT_LP_Y_PREMIUM, "Kabylake-Y Premium" }, + { PCI_DID_INTEL_UPT_LP_SUPER_SKU, "Kabylake Super Sku" }, + { PCI_DID_INTEL_SPT_LP_Y_PREMIUM_HDCP22, "Kabylake-Y iHDCP 2.2 Premium" }, - { PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22, + { PCI_DID_INTEL_SPT_LP_U_PREMIUM_HDCP22, "Kabylake-U iHDCP 2.2 Premium" }, - { PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE_HDCP22, + { PCI_DID_INTEL_SPT_LP_U_BASE_HDCP22, "Kabylake-U iHDCP 2.2 Base" }, }; @@ -97,37 +97,37 @@ static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_SKL_GT1F_DT2, "Skylake DT GT1F" }, - { PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM, "Skylake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_SKL_GT1F_SHALM, "Skylake HALO GT1F" }, - { PCI_DEVICE_ID_INTEL_SKL_GT2_DT2P1, "Skylake DT GT2" }, - { PCI_DEVICE_ID_INTEL_SKL_GT2_SULTM, "Skylake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_SKL_GT2_SHALM, "Skylake HALO GT2" }, - { PCI_DEVICE_ID_INTEL_SKL_GT2_SWKSM, "Skylake Mobile Xeon GT2"}, - { PCI_DEVICE_ID_INTEL_SKL_GT2_SULXM, "Skylake ULX GT2" }, - { PCI_DEVICE_ID_INTEL_SKL_GT3_SULTM, "Skylake ULT GT3" }, - { PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1, "Skylake ULT (15W) GT3E" }, - { PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_2, "Skylake ULT (28W) GT3E" }, - { PCI_DEVICE_ID_INTEL_SKL_GT3FE_SSRVM, "Skylake Media Server GT3FE" }, - { PCI_DEVICE_ID_INTEL_SKL_GT4_SHALM, "Skylake HALO GT4" }, - { PCI_DEVICE_ID_INTEL_SKL_GT4E_SWSTM, "Skylake Workstation GT4E" }, - { PCI_DEVICE_ID_INTEL_KBL_GT1F_DT2, "Kaby Lake DT GT1F" }, - { PCI_DEVICE_ID_INTEL_KBL_GT1_SULTM, "Kaby Lake ULT GT1" }, - { PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_1, "Kaby Lake HALO GT1" }, - { PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_2, "Kaby Lake HALO GT1" }, - { PCI_DEVICE_ID_INTEL_KBL_GT1_SSRVM, "Kaby Lake SRV GT1" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2_SSRVM, "Kaby Lake Media Server GT2" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2_SWSTM, "Kaby Lake Workstation GT2" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM, "Kaby Lake ULX GT2" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM, "Kaby Lake ULT GT2" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR, "Kaby Lake-R ULT GT2" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM, "Kaby Lake HALO GT2" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2, "Kaby Lake DT GT2" }, - { PCI_DEVICE_ID_INTEL_KBL_GT2F_SULTM, "Kaby Lake ULT GT2F" }, - { PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1, "Kaby Lake ULT (15W) GT3E" }, - { PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2, "Kaby Lake ULT (28W) GT3E" }, - { PCI_DEVICE_ID_INTEL_KBL_GT4_SHALM, "Kaby Lake HALO GT4" }, - { PCI_DEVICE_ID_INTEL_AML_GT2_ULX, "Amberlake ULX GT2" }, + { PCI_DID_INTEL_SKL_GT1F_DT2, "Skylake DT GT1F" }, + { PCI_DID_INTEL_SKL_GT1_SULTM, "Skylake ULT GT1" }, + { PCI_DID_INTEL_SKL_GT1F_SHALM, "Skylake HALO GT1F" }, + { PCI_DID_INTEL_SKL_GT2_DT2P1, "Skylake DT GT2" }, + { PCI_DID_INTEL_SKL_GT2_SULTM, "Skylake ULT GT2" }, + { PCI_DID_INTEL_SKL_GT2_SHALM, "Skylake HALO GT2" }, + { PCI_DID_INTEL_SKL_GT2_SWKSM, "Skylake Mobile Xeon GT2"}, + { PCI_DID_INTEL_SKL_GT2_SULXM, "Skylake ULX GT2" }, + { PCI_DID_INTEL_SKL_GT3_SULTM, "Skylake ULT GT3" }, + { PCI_DID_INTEL_SKL_GT3E_SULTM_1, "Skylake ULT (15W) GT3E" }, + { PCI_DID_INTEL_SKL_GT3E_SULTM_2, "Skylake ULT (28W) GT3E" }, + { PCI_DID_INTEL_SKL_GT3FE_SSRVM, "Skylake Media Server GT3FE" }, + { PCI_DID_INTEL_SKL_GT4_SHALM, "Skylake HALO GT4" }, + { PCI_DID_INTEL_SKL_GT4E_SWSTM, "Skylake Workstation GT4E" }, + { PCI_DID_INTEL_KBL_GT1F_DT2, "Kaby Lake DT GT1F" }, + { PCI_DID_INTEL_KBL_GT1_SULTM, "Kaby Lake ULT GT1" }, + { PCI_DID_INTEL_KBL_GT1_SHALM_1, "Kaby Lake HALO GT1" }, + { PCI_DID_INTEL_KBL_GT1_SHALM_2, "Kaby Lake HALO GT1" }, + { PCI_DID_INTEL_KBL_GT1_SSRVM, "Kaby Lake SRV GT1" }, + { PCI_DID_INTEL_KBL_GT2_SSRVM, "Kaby Lake Media Server GT2" }, + { PCI_DID_INTEL_KBL_GT2_SWSTM, "Kaby Lake Workstation GT2" }, + { PCI_DID_INTEL_KBL_GT2_SULXM, "Kaby Lake ULX GT2" }, + { PCI_DID_INTEL_KBL_GT2_SULTM, "Kaby Lake ULT GT2" }, + { PCI_DID_INTEL_KBL_GT2_SULTMR, "Kaby Lake-R ULT GT2" }, + { PCI_DID_INTEL_KBL_GT2_SHALM, "Kaby Lake HALO GT2" }, + { PCI_DID_INTEL_KBL_GT2_DT2P2, "Kaby Lake DT GT2" }, + { PCI_DID_INTEL_KBL_GT2F_SULTM, "Kaby Lake ULT GT2F" }, + { PCI_DID_INTEL_KBL_GT3E_SULTM_1, "Kaby Lake ULT (15W) GT3E" }, + { PCI_DID_INTEL_KBL_GT3E_SULTM_2, "Kaby Lake ULT (28W) GT3E" }, + { PCI_DID_INTEL_KBL_GT4_SHALM, "Kaby Lake HALO GT4" }, + { PCI_DID_INTEL_AML_GT2_ULX, "Amberlake ULX GT2" }, }; static uint8_t get_dev_revision(pci_devfn_t dev) diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c index 98b469c1c9..cb669b1b74 100644 --- a/src/soc/intel/skylake/graphics.c +++ b/src/soc/intel/skylake/graphics.c @@ -87,8 +87,8 @@ u32 map_oprom_vendev(u32 vendev) u32 new_vendev = vendev; switch (vendev) { - case 0x80865916: /* PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM */ - case 0x80865917: /* PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR */ + case 0x80865916: /* PCI_DID_INTEL_KBL_GT2_SULTM */ + case 0x80865917: /* PCI_DID_INTEL_KBL_GT2_SULTMR */ new_vendev = SA_IGD_OPROM_VENDEV; break; } diff --git a/src/soc/intel/skylake/vr_config.c b/src/soc/intel/skylake/vr_config.c index 89d85cffd7..a036a1b016 100644 --- a/src/soc/intel/skylake/vr_config.c +++ b/src/soc/intel/skylake/vr_config.c @@ -121,8 +121,8 @@ static uint16_t get_sku_icc_max(int domain) */ switch (mch_id) { - case PCI_DEVICE_ID_INTEL_SKL_ID_S_2: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_S: { + case PCI_DID_INTEL_SKL_ID_S_2: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_S: { uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(11.1, 40, 48, 48); if (tdp >= 54) icc_max[VR_IA_CORE] = VR_CFG_AMP(58); @@ -131,9 +131,9 @@ static uint16_t get_sku_icc_max(int domain) return icc_max[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_S_4: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_DT_2: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_DT: { + case PCI_DID_INTEL_SKL_ID_S_4: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_DT_2: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_DT: { uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(11.1, 55, 45, 45); if (tdp >= 91) icc_max[VR_IA_CORE] = VR_CFG_AMP(100); @@ -155,7 +155,7 @@ static uint16_t get_sku_icc_max(int domain) return icc_max[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_H_4: { + case PCI_DID_INTEL_SKL_ID_H_4: { uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(11.1, 60, 94, 20); if (tdp >= 45) { icc_max[VR_IA_CORE] = VR_CFG_AMP(74); @@ -166,9 +166,9 @@ static uint16_t get_sku_icc_max(int domain) } return icc_max[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_H_2: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_SKL_ID_H_EM: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_H: { + case PCI_DID_INTEL_SKL_ID_H_2: /* fallthrough */ + case PCI_DID_INTEL_SKL_ID_H_EM: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_H: { uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(6.6, 60, 55, 55); if (tdp >= 35) { if (tdp >= 45) @@ -179,11 +179,11 @@ static uint16_t get_sku_icc_max(int domain) return icc_max[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_U: { + case PCI_DID_INTEL_SKL_ID_U: { uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(5.1, 29, 57, 19); if (tdp >= 28) icc_max[VR_IA_CORE] = VR_CFG_AMP(32); - else if (igd_id != PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1) { + else if (igd_id != PCI_DID_INTEL_SKL_GT3E_SULTM_1) { const uint16_t icc_max_gt2[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(4.5, 29, 31, 31); @@ -191,28 +191,28 @@ static uint16_t get_sku_icc_max(int domain) } return icc_max[domain]; } - case PCI_DEVICE_ID_INTEL_KBL_U_R: { + case PCI_DID_INTEL_KBL_U_R: { const uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(6, 64, 31, 31); return icc_max[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_Y: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_Y: { + case PCI_DID_INTEL_SKL_ID_Y: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_Y: { uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(4.1, 24, 24, 24); - if (igd_id == PCI_DEVICE_ID_INTEL_AML_GT2_ULX) + if (igd_id == PCI_DID_INTEL_AML_GT2_ULX) icc_max[VR_IA_CORE] = VR_CFG_AMP(28); return icc_max[domain]; } - case PCI_DEVICE_ID_INTEL_KBL_ID_U: { + case PCI_DID_INTEL_KBL_ID_U: { uint16_t icc_max[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(4.5, 32, 31, 31); - if (igd_id == PCI_DEVICE_ID_INTEL_KBL_GT1_SULTM) + if (igd_id == PCI_DID_INTEL_KBL_GT1_SULTM) icc_max[VR_IA_CORE] = VR_CFG_AMP(29); - else if ((igd_id == PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1) || - (igd_id == PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2)) { + else if ((igd_id == PCI_DID_INTEL_KBL_GT3E_SULTM_1) || + (igd_id == PCI_DID_INTEL_KBL_GT3E_SULTM_2)) { const uint16_t icc_max_gt3[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_ICC(5.1, 32, 57, 19); @@ -240,24 +240,24 @@ static uint16_t get_sku_ac_dc_loadline(const int domain) } switch (mch_id) { - case PCI_DEVICE_ID_INTEL_SKL_ID_S_2: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_SKL_ID_S_4: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_S: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_DT: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_DT_2: { + case PCI_DID_INTEL_SKL_ID_S_2: /* fallthrough */ + case PCI_DID_INTEL_SKL_ID_S_4: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_S: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_DT: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_DT_2: { /* SA Loadline is not specified */ const uint16_t loadline[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_LOADLINE(0, 2.1, 3.1, 3.1); return loadline[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_H_2: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_SKL_ID_H_EM: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_SKL_ID_H_4: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_H: { + case PCI_DID_INTEL_SKL_ID_H_2: /* fallthrough */ + case PCI_DID_INTEL_SKL_ID_H_EM: /* fallthrough */ + case PCI_DID_INTEL_SKL_ID_H_4: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_H: { const uint16_t loadline[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_LOADLINE(10, 1.8, 2.65, 2.65); - if (igd_id == PCI_DEVICE_ID_INTEL_SKL_GT4_SHALM) { + if (igd_id == PCI_DID_INTEL_SKL_GT4_SHALM) { const uint16_t loadline_gt4[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_LOADLINE(6, 1.6, 1.4, 6); return loadline_gt4[domain]; @@ -265,26 +265,26 @@ static uint16_t get_sku_ac_dc_loadline(const int domain) return loadline[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_Y: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_Y: { + case PCI_DID_INTEL_SKL_ID_Y: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_Y: { uint16_t loadline[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_LOADLINE(18, 5.9, 5.7, 5.7); - if (igd_id == PCI_DEVICE_ID_INTEL_AML_GT2_ULX) + if (igd_id == PCI_DID_INTEL_AML_GT2_ULX) loadline[VR_IA_CORE] = VR_CFG_MOHMS(4); return loadline[domain]; } - case PCI_DEVICE_ID_INTEL_SKL_ID_U: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_U_R: /* fallthrough */ - case PCI_DEVICE_ID_INTEL_KBL_ID_U: { + case PCI_DID_INTEL_SKL_ID_U: /* fallthrough */ + case PCI_DID_INTEL_KBL_U_R: /* fallthrough */ + case PCI_DID_INTEL_KBL_ID_U: { uint16_t loadline[NUM_VR_DOMAINS] = VR_CFG_ALL_DOMAINS_LOADLINE(10.3, 2.4, 3.1, 3.1); - if ((igd_id == PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1) || - (igd_id == PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_2) || - (igd_id == PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1) || - (igd_id == PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2)) { + if ((igd_id == PCI_DID_INTEL_SKL_GT3E_SULTM_1) || + (igd_id == PCI_DID_INTEL_SKL_GT3E_SULTM_2) || + (igd_id == PCI_DID_INTEL_KBL_GT3E_SULTM_1) || + (igd_id == PCI_DID_INTEL_KBL_GT3E_SULTM_2)) { loadline[VR_GT_UNSLICED] = VR_CFG_MOHMS(2); loadline[VR_GT_SLICED] = VR_CFG_MOHMS(6); } diff --git a/src/soc/intel/tigerlake/bootblock/report_platform.c b/src/soc/intel/tigerlake/bootblock/report_platform.c index 109ab60d02..af7a96ae4a 100644 --- a/src/soc/intel/tigerlake/bootblock/report_platform.c +++ b/src/soc/intel/tigerlake/bootblock/report_platform.c @@ -32,72 +32,72 @@ static struct { u16 mchid; const char *name; } mch_table[] = { - { PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2, "Tigerlake-U-2-2" }, - { PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2, "Tigerlake-U-4-2" }, - { PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2, "Tigerlake-Y-2-2" }, - { PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2, "Tigerlake-Y-4-2" }, - { PCI_DEVICE_ID_INTEL_TGL_ID_H_6_1, "Tigerlake-H-6-1" }, - { PCI_DEVICE_ID_INTEL_TGL_ID_H_8_1, "Tigerlake-H-8-1" }, + { PCI_DID_INTEL_TGL_ID_U_2_2, "Tigerlake-U-2-2" }, + { PCI_DID_INTEL_TGL_ID_U_4_2, "Tigerlake-U-4-2" }, + { PCI_DID_INTEL_TGL_ID_Y_2_2, "Tigerlake-Y-2-2" }, + { PCI_DID_INTEL_TGL_ID_Y_4_2, "Tigerlake-Y-4-2" }, + { PCI_DID_INTEL_TGL_ID_H_6_1, "Tigerlake-H-6-1" }, + { PCI_DID_INTEL_TGL_ID_H_8_1, "Tigerlake-H-8-1" }, }; static struct { u16 espiid; const char *name; } pch_table[] = { - { PCI_DEVICE_ID_INTEL_TGP_ESPI_0, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_SUPER_U_ESPI, "Tigerlake-U Super SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_PREMIUM_U_ESPI, "Tigerlake-U Premium SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_BASE_U_ESPI, "Tigerlake-U Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_1, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_2, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_SUPER_Y_ESPI, "Tigerlake-Y Super SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_PREMIUM_Y_ESPI, "Tigerlake-Y Premium SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_3, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_4, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_5, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_6, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_7, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_8, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_9, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_10, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_11, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_12, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_13, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_14, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_15, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_16, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_17, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_18, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_19, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_20, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_21, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_22, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_23, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_24, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_25, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_ESPI_26, "Tigerlake-Base SKU" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_B560, "Tigerlake-H B560" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H510, "Tigerlake-H H510" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H570, "Tigerlake-H H570" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Q570, "Tigerlake-H Q570" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_W580, "Tigerlake-H W580" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Z590, "Tigerlake-H Z590" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_HM570, "Tigerlake-H HM570" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_QM580, "Tigerlake-H QM580" }, - { PCI_DEVICE_ID_INTEL_TGP_H_ESPI_WM590, "Tigerlake-H WM590" }, + { PCI_DID_INTEL_TGP_ESPI_0, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_SUPER_U_ESPI, "Tigerlake-U Super SKU" }, + { PCI_DID_INTEL_TGP_PREMIUM_U_ESPI, "Tigerlake-U Premium SKU" }, + { PCI_DID_INTEL_TGP_BASE_U_ESPI, "Tigerlake-U Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_1, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_2, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_SUPER_Y_ESPI, "Tigerlake-Y Super SKU" }, + { PCI_DID_INTEL_TGP_PREMIUM_Y_ESPI, "Tigerlake-Y Premium SKU" }, + { PCI_DID_INTEL_TGP_ESPI_3, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_4, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_5, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_6, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_7, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_8, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_9, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_10, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_11, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_12, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_13, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_14, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_15, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_16, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_17, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_18, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_19, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_20, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_21, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_22, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_23, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_24, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_25, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_ESPI_26, "Tigerlake-Base SKU" }, + { PCI_DID_INTEL_TGP_H_ESPI_B560, "Tigerlake-H B560" }, + { PCI_DID_INTEL_TGP_H_ESPI_H510, "Tigerlake-H H510" }, + { PCI_DID_INTEL_TGP_H_ESPI_H570, "Tigerlake-H H570" }, + { PCI_DID_INTEL_TGP_H_ESPI_Q570, "Tigerlake-H Q570" }, + { PCI_DID_INTEL_TGP_H_ESPI_W580, "Tigerlake-H W580" }, + { PCI_DID_INTEL_TGP_H_ESPI_Z590, "Tigerlake-H Z590" }, + { PCI_DID_INTEL_TGP_H_ESPI_HM570, "Tigerlake-H HM570" }, + { PCI_DID_INTEL_TGP_H_ESPI_QM580, "Tigerlake-H QM580" }, + { PCI_DID_INTEL_TGP_H_ESPI_WM590, "Tigerlake-H WM590" }, }; static struct { u16 igdid; const char *name; } igd_table[] = { - { PCI_DEVICE_ID_INTEL_TGL_GT0, "Tigerlake U GT0" }, - { PCI_DEVICE_ID_INTEL_TGL_GT1_H_32, "Tigerlake H GT1 32EU" }, - { PCI_DEVICE_ID_INTEL_TGL_GT1_H_16, "Tigerlake H GT1 16EU" }, - { PCI_DEVICE_ID_INTEL_TGL_GT2_ULT, "Tigerlake U GT2" }, - { PCI_DEVICE_ID_INTEL_TGL_GT2_ULX, "Tigerlake Y GT2" }, - { PCI_DEVICE_ID_INTEL_TGL_GT3_ULT, "Tigerlake U GT3" }, - { PCI_DEVICE_ID_INTEL_TGL_GT2_ULT_1, "Tigerlake U GT2 1" }, + { PCI_DID_INTEL_TGL_GT0, "Tigerlake U GT0" }, + { PCI_DID_INTEL_TGL_GT1_H_32, "Tigerlake H GT1 32EU" }, + { PCI_DID_INTEL_TGL_GT1_H_16, "Tigerlake H GT1 16EU" }, + { PCI_DID_INTEL_TGL_GT2_ULT, "Tigerlake U GT2" }, + { PCI_DID_INTEL_TGL_GT2_ULX, "Tigerlake Y GT2" }, + { PCI_DID_INTEL_TGL_GT3_ULT, "Tigerlake U GT3" }, + { PCI_DID_INTEL_TGL_GT2_ULT_1, "Tigerlake U GT2 1" }, }; static inline uint8_t get_dev_revision(pci_devfn_t dev) diff --git a/src/soc/intel/tigerlake/lpm.c b/src/soc/intel/tigerlake/lpm.c index 92279d682b..0dd725abb9 100644 --- a/src/soc/intel/tigerlake/lpm.c +++ b/src/soc/intel/tigerlake/lpm.c @@ -20,8 +20,8 @@ static bool platform_is_up3(void) if ((cpu_id != CPUID_TIGERLAKE_A0) && (cpu_id != CPUID_TIGERLAKE_B0)) return false; - return ((mchid == PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2) || - (mchid == PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2)); + return ((mchid == PCI_DID_INTEL_TGL_ID_U_2_2) || + (mchid == PCI_DID_INTEL_TGL_ID_U_4_2)); } int get_supported_lpm_mask(struct soc_intel_tigerlake_config *config) diff --git a/src/soc/intel/tigerlake/systemagent.c b/src/soc/intel/tigerlake/systemagent.c index 0e9488c1b2..06282eaaba 100644 --- a/src/soc/intel/tigerlake/systemagent.c +++ b/src/soc/intel/tigerlake/systemagent.c @@ -78,22 +78,22 @@ void soc_systemagent_init(struct device *dev) * differentiated here based on SA PCI ID. */ switch (sa_pci_id) { - case PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2: + case PCI_DID_INTEL_TGL_ID_U_2_2: soc_config = &config->power_limits_config[POWER_LIMITS_U_2_CORE]; break; - case PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2: + case PCI_DID_INTEL_TGL_ID_U_4_2: soc_config = &config->power_limits_config[POWER_LIMITS_U_4_CORE]; break; - case PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2: + case PCI_DID_INTEL_TGL_ID_Y_2_2: soc_config = &config->power_limits_config[POWER_LIMITS_Y_2_CORE]; break; - case PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2: + case PCI_DID_INTEL_TGL_ID_Y_4_2: soc_config = &config->power_limits_config[POWER_LIMITS_Y_4_CORE]; break; - case PCI_DEVICE_ID_INTEL_TGL_ID_H_6_1: + case PCI_DID_INTEL_TGL_ID_H_6_1: soc_config = &config->power_limits_config[POWER_LIMITS_H_6_CORE]; break; - case PCI_DEVICE_ID_INTEL_TGL_ID_H_8_1: + case PCI_DID_INTEL_TGL_ID_H_8_1: soc_config = &config->power_limits_config[POWER_LIMITS_H_8_CORE]; break; default: diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c index 41dde0d84b..4b15435619 100644 --- a/src/soc/intel/xeon_sp/cpx/chip.c +++ b/src/soc/intel/xeon_sp/cpx/chip.c @@ -145,14 +145,14 @@ static void set_pcu_locks(void) static void set_imc_locks(void) { struct device *dev = 0; - while ((dev = dev_find_device(PCI_VENDOR_ID_INTEL, IMC_M2MEM_DEVID, dev))) + while ((dev = dev_find_device(PCI_VID_INTEL, IMC_M2MEM_DEVID, dev))) pci_or_config32(dev, IMC_M2MEM_TIMEOUT, TIMEOUT_LOCK); } static void set_upi_locks(void) { struct device *dev = 0; - while ((dev = dev_find_device(PCI_VENDOR_ID_INTEL, UPI_LL_CR_DEVID, dev))) + while ((dev = dev_find_device(PCI_VID_INTEL, UPI_LL_CR_DEVID, dev))) pci_or_config32(dev, UPI_LL_CR_KTIMISCMODLCK, KTIMISCMODLCK_LOCK); } diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c index 29c45cdf74..e1931b1d3a 100644 --- a/src/soc/intel/xeon_sp/uncore.c +++ b/src/soc/intel/xeon_sp/uncore.c @@ -296,7 +296,7 @@ static const unsigned short mmapvtd_ids[] = { static const struct pci_driver mmapvtd_driver __pci_driver = { .ops = &mmapvtd_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = mmapvtd_ids }; @@ -317,7 +317,7 @@ static struct device_operations vtd_ops = { /* VTD devices on other stacks */ static const struct pci_driver vtd_driver __pci_driver = { .ops = &vtd_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = MMAP_VTD_STACK_CFG_REG_DEVID, }; @@ -345,7 +345,7 @@ static struct device_operations dmi3_ops = { static const struct pci_driver dmi3_driver __pci_driver = { .ops = &dmi3_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = DMI3_DEVID, }; @@ -379,6 +379,6 @@ static struct device_operations iio_dfx_global_ops = { static const struct pci_driver iio_dfx_global_driver __pci_driver = { .ops = &iio_dfx_global_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = iio_dfx_global_ids, }; diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c index a15b045ab8..a63d52a8d2 100644 --- a/src/southbridge/amd/agesa/hudson/hda.c +++ b/src/southbridge/amd/agesa/hudson/hda.c @@ -20,6 +20,6 @@ static struct device_operations hda_audio_ops = { static const struct pci_driver hdaaudio_driver __pci_driver = { .ops = &hda_audio_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_HDA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_HDA, }; diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c index 3c34e98d4d..f95b2fb488 100644 --- a/src/southbridge/amd/agesa/hudson/hudson.c +++ b/src/southbridge/amd/agesa/hudson/hudson.c @@ -44,7 +44,7 @@ void hudson_enable(struct device *dev) if (dev->enabled == 0) { u32 usb_device_id = pci_read_config16(dev, PCI_DEVICE_ID); u8 reg8; - if (usb_device_id == PCI_DEVICE_ID_AMD_SB900_USB_20_5) { + if (usb_device_id == PCI_DID_AMD_SB900_USB_20_5) { /* turn off and remove device 0:14.5 from PCI space */ reg8 = pm_read8(0xef); reg8 &= ~(1 << 6); @@ -58,12 +58,11 @@ void hudson_enable(struct device *dev) u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID); /* turn off the SDHC controller in the PM reg */ u8 reg8; - if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) { + if (sd_device_id == PCI_DID_AMD_HUDSON_SD) { reg8 = pm_read8(0xe7); reg8 &= ~(1 << 0); pm_write8(0xe7, reg8); - } - else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) { + } else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) { reg8 = pm_read8(0xe8); reg8 &= ~(1 << 0); pm_write8(0xe8, reg8); diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c index 8ba7a12c1c..eaf40b5888 100644 --- a/src/southbridge/amd/agesa/hudson/ide.c +++ b/src/southbridge/amd/agesa/hudson/ide.c @@ -19,6 +19,6 @@ static struct device_operations ide_ops = { static const struct pci_driver ide_driver __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_IDE, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_IDE, }; diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c index 6a31fbfbf8..8010f01212 100644 --- a/src/southbridge/amd/agesa/hudson/lpc.c +++ b/src/southbridge/amd/agesa/hudson/lpc.c @@ -343,6 +343,6 @@ static struct device_operations lpc_ops = { }; static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_LPC, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_LPC, }; diff --git a/src/southbridge/amd/agesa/hudson/pci.c b/src/southbridge/amd/agesa/hudson/pci.c index 5e828f7059..b99413c9c4 100644 --- a/src/southbridge/amd/agesa/hudson/pci.c +++ b/src/southbridge/amd/agesa/hudson/pci.c @@ -41,6 +41,6 @@ static struct device_operations pci_ops = { static const struct pci_driver pci_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCI, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCI, }; diff --git a/src/southbridge/amd/agesa/hudson/pcie.c b/src/southbridge/amd/agesa/hudson/pcie.c index d79dbb922f..04827a44df 100644 --- a/src/southbridge/amd/agesa/hudson/pcie.c +++ b/src/southbridge/amd/agesa/hudson/pcie.c @@ -25,22 +25,22 @@ static struct device_operations pci_ops = { static const struct pci_driver pciea_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEA, }; static const struct pci_driver pcieb_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEB, }; static const struct pci_driver pciec_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEC, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEC, }; static const struct pci_driver pcied_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIED, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIED, }; diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c index a8d3865020..c2348a963d 100644 --- a/src/southbridge/amd/agesa/hudson/sata.c +++ b/src/southbridge/amd/agesa/hudson/sata.c @@ -53,12 +53,12 @@ static struct device_operations sata_ops = { static const struct pci_driver sata0_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_SATA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_SATA, }; static const struct pci_driver sata0_driver_ahci __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_SATA_AHCI, }; diff --git a/src/southbridge/amd/agesa/hudson/sd.c b/src/southbridge/amd/agesa/hudson/sd.c index f07a2e77ee..f3ea0a5eb4 100644 --- a/src/southbridge/amd/agesa/hudson/sd.c +++ b/src/southbridge/amd/agesa/hudson/sd.c @@ -46,6 +46,6 @@ static struct device_operations sd_ops = { static const struct pci_driver sd_driver __pci_driver = { .ops = &sd_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_YANGTZE_SD, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_YANGTZE_SD, }; diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c index 6f9e03c2d3..8fd124a5a3 100644 --- a/src/southbridge/amd/agesa/hudson/sm.c +++ b/src/southbridge/amd/agesa/hudson/sm.c @@ -105,6 +105,6 @@ static struct device_operations smbus_ops = { }; static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_SM, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_SM, }; diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c index 1175f081aa..694f2bfd77 100644 --- a/src/southbridge/amd/agesa/hudson/usb.c +++ b/src/southbridge/amd/agesa/hudson/usb.c @@ -20,18 +20,18 @@ static struct device_operations usb_ops = { static const struct pci_driver usb_0_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_USB_18_0, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_USB_18_0, }; static const struct pci_driver usb_1_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_USB_18_2, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_USB_18_2, }; static const struct pci_driver usb_4_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_USB_20_5, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_USB_20_5, }; diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c index 4a5895b09b..da2c5ab88a 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -150,8 +150,8 @@ static struct device_operations lpc_ops = { static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_LPC, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_LPC, }; static struct device_operations sata_ops = { @@ -164,19 +164,19 @@ static struct device_operations sata_ops = { static const struct pci_driver ahci_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_SATA_AHCI, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_SATA_AHCI, }; static const struct pci_driver raid_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_SATA_RAID, }; static const struct pci_driver raid5_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID5, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_SATA_RAID5, }; static struct device_operations usb_ops = { @@ -191,20 +191,20 @@ static struct device_operations usb_ops = { */ static const struct pci_driver usb_ohci123_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */ + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */ }; static const struct pci_driver usb_ehci123_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */ + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */ }; static const struct pci_driver usb_ohci4_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_USB_20_5, /* OHCI-USB4 */ + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_USB_20_5, /* OHCI-USB4 */ }; static struct device_operations azalia_ops = { @@ -216,8 +216,8 @@ static struct device_operations azalia_ops = { static const struct pci_driver azalia_driver __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_HDA, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_HDA, }; static struct device_operations gec_ops = { @@ -229,8 +229,8 @@ static struct device_operations gec_ops = { static const struct pci_driver gec_driver __pci_driver = { .ops = &gec_ops, - .vendor = PCI_VENDOR_ID_ATI, - .device = PCI_DEVICE_ID_ATI_SB800_GEC, + .vendor = PCI_VID_ATI, + .device = PCI_DID_ATI_SB800_GEC, }; /** diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c index f11eee5d98..196c5acb26 100644 --- a/src/southbridge/amd/pi/hudson/hda.c +++ b/src/southbridge/amd/pi/hudson/hda.c @@ -7,8 +7,8 @@ #include "hudson.h" static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_HDA, - PCI_DEVICE_ID_AMD_CZ_HDA, + PCI_DID_AMD_SB900_HDA, + PCI_DID_AMD_CZ_HDA, 0 }; @@ -26,6 +26,6 @@ static struct device_operations hda_audio_ops = { static const struct pci_driver hdaaudio_driver __pci_driver = { .ops = &hda_audio_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c index 852144b2db..e9b26e0ad0 100644 --- a/src/southbridge/amd/pi/hudson/hudson.c +++ b/src/southbridge/amd/pi/hudson/hudson.c @@ -33,12 +33,11 @@ void hudson_enable(struct device *dev) u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID); /* turn off the SDHC controller in the PM reg */ u8 reg8; - if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) { + if (sd_device_id == PCI_DID_AMD_HUDSON_SD) { reg8 = pm_read8(PM_HUD_SD_FLASH_CTRL); reg8 &= ~BIT(0); pm_write8(PM_HUD_SD_FLASH_CTRL, reg8); - } - else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) { + } else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) { reg8 = pm_read8(PM_YANG_SD_FLASH_CTRL); reg8 &= ~BIT(0); pm_write8(PM_YANG_SD_FLASH_CTRL, reg8); diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c index 8ba7a12c1c..eaf40b5888 100644 --- a/src/southbridge/amd/pi/hudson/ide.c +++ b/src/southbridge/amd/pi/hudson/ide.c @@ -19,6 +19,6 @@ static struct device_operations ide_ops = { static const struct pci_driver ide_driver __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_IDE, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_IDE, }; diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c index 05543cfe59..df1f093a23 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -355,13 +355,13 @@ static struct device_operations lpc_ops = { static const unsigned short pci_device_ids[] = { /* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_SB900_LPC, + PCI_DID_AMD_SB900_LPC, /* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_CZ_LPC, + PCI_DID_AMD_CZ_LPC, 0 }; static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/amd/pi/hudson/pci.c b/src/southbridge/amd/pi/hudson/pci.c index 5e828f7059..b99413c9c4 100644 --- a/src/southbridge/amd/pi/hudson/pci.c +++ b/src/southbridge/amd/pi/hudson/pci.c @@ -41,6 +41,6 @@ static struct device_operations pci_ops = { static const struct pci_driver pci_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCI, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCI, }; diff --git a/src/southbridge/amd/pi/hudson/pcie.c b/src/southbridge/amd/pi/hudson/pcie.c index d79dbb922f..04827a44df 100644 --- a/src/southbridge/amd/pi/hudson/pcie.c +++ b/src/southbridge/amd/pi/hudson/pcie.c @@ -25,22 +25,22 @@ static struct device_operations pci_ops = { static const struct pci_driver pciea_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEA, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEA, }; static const struct pci_driver pcieb_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEB, }; static const struct pci_driver pciec_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIEC, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIEC, }; static const struct pci_driver pcied_driver __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_SB900_PCIED, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_SB900_PCIED, }; diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c index b05f8a0b68..dd1e1824b5 100644 --- a/src/southbridge/amd/pi/hudson/sata.c +++ b/src/southbridge/amd/pi/hudson/sata.c @@ -52,15 +52,15 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_SATA, - PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, - PCI_DEVICE_ID_AMD_CZ_SATA, - PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, + PCI_DID_AMD_SB900_SATA, + PCI_DID_AMD_SB900_SATA_AHCI, + PCI_DID_AMD_CZ_SATA, + PCI_DID_AMD_CZ_SATA_AHCI, 0 }; static const struct pci_driver sata0_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/amd/pi/hudson/sd.c b/src/southbridge/amd/pi/hudson/sd.c index 9235500138..6dad334991 100644 --- a/src/southbridge/amd/pi/hudson/sd.c +++ b/src/southbridge/amd/pi/hudson/sd.c @@ -47,6 +47,6 @@ static struct device_operations sd_ops = { static const struct pci_driver sd_driver __pci_driver = { .ops = &sd_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_YANGTZE_SD, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_YANGTZE_SD, }; diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c index f6422cf37e..79d1005997 100644 --- a/src/southbridge/amd/pi/hudson/sm.c +++ b/src/southbridge/amd/pi/hudson/sm.c @@ -105,7 +105,7 @@ static struct device_operations smbus_ops = { }; static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, /* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */ - .device = PCI_DEVICE_ID_AMD_SB900_SM, + .device = PCI_DID_AMD_SB900_SM, }; diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c index fecae7467e..04b4d920ca 100644 --- a/src/southbridge/amd/pi/hudson/usb.c +++ b/src/southbridge/amd/pi/hudson/usb.c @@ -19,17 +19,17 @@ static struct device_operations usb_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_USB_18_0, - PCI_DEVICE_ID_AMD_SB900_USB_18_2, - PCI_DEVICE_ID_AMD_SB900_USB_20_5, - PCI_DEVICE_ID_AMD_CZ_USB_0, - PCI_DEVICE_ID_AMD_CZ_USB_1, - PCI_DEVICE_ID_AMD_CZ_USB3_0, + PCI_DID_AMD_SB900_USB_18_0, + PCI_DID_AMD_SB900_USB_18_2, + PCI_DID_AMD_SB900_USB_20_5, + PCI_DID_AMD_CZ_USB_0, + PCI_DID_AMD_CZ_USB_1, + PCI_DID_AMD_CZ_USB3_0, 0 }; static const struct pci_driver usb_0_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c index 0a0b5152da..97884c682f 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.c @@ -135,6 +135,6 @@ static const unsigned short pci_device_ids[] = { 0x1c20, 0x1e20, 0 }; static const struct pci_driver pch_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index ae92ca942a..b2e6344143 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -692,6 +692,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c index f8f3cebc71..66c7dd2997 100644 --- a/src/southbridge/intel/bd82x6x/me.c +++ b/src/southbridge/intel/bd82x6x/me.c @@ -285,6 +285,6 @@ static struct device_operations device_ops = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x1c3a, }; diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c index 24d11b2f0c..2a6caa67db 100644 --- a/src/southbridge/intel/bd82x6x/me_8.x.c +++ b/src/southbridge/intel/bd82x6x/me_8.x.c @@ -285,7 +285,7 @@ static struct device_operations device_ops = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x1e3a, }; diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c index da8208a56f..b82f3dac47 100644 --- a/src/southbridge/intel/bd82x6x/pci.c +++ b/src/southbridge/intel/bd82x6x/pci.c @@ -53,6 +53,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c index 399c73aebc..a85b2619ad 100644 --- a/src/southbridge/intel/bd82x6x/pcie.c +++ b/src/southbridge/intel/bd82x6x/pcie.c @@ -249,6 +249,6 @@ static const unsigned short pci_device_ids[] = { 0x1c10, 0x1c12, 0x1c14, 0x1c16, static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c index 08a254f3ec..e243c9782c 100644 --- a/src/southbridge/intel/bd82x6x/sata.c +++ b/src/southbridge/intel/bd82x6x/sata.c @@ -272,6 +272,6 @@ static const unsigned short pci_device_ids[] = { 0x1c00, 0x1c01, 0x1c02, 0x1c03, static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c index 0ae1f4ab28..3c190757d6 100644 --- a/src/southbridge/intel/bd82x6x/smbus.c +++ b/src/southbridge/intel/bd82x6x/smbus.c @@ -44,6 +44,6 @@ static const unsigned short pci_device_ids[] = { 0x1c22, 0x1e22, 0 }; static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c index 2764861651..3661aba4f2 100644 --- a/src/southbridge/intel/bd82x6x/usb_ehci.c +++ b/src/southbridge/intel/bd82x6x/usb_ehci.c @@ -103,6 +103,6 @@ static const unsigned short pci_device_ids[] = { 0x1c26, 0x1c2d, 0x1e26, 0x1e2d, static const struct pci_driver pch_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c index 8bd0641d9f..5607b16ae4 100644 --- a/src/southbridge/intel/bd82x6x/usb_xhci.c +++ b/src/southbridge/intel/bd82x6x/usb_xhci.c @@ -54,6 +54,6 @@ static const unsigned short pci_device_ids[] = { 0x1e31, 0 }; static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/common/early_smbus.c b/src/southbridge/intel/common/early_smbus.c index d65b4aaf81..6078b5f7ee 100644 --- a/src/southbridge/intel/common/early_smbus.c +++ b/src/southbridge/intel/common/early_smbus.c @@ -17,7 +17,7 @@ int smbus_enable_iobar(uintptr_t base) const pci_devfn_t dev = PCI_DEV_SMBUS; /* Check to make sure we've got the right device. */ - if (pci_read_config16(dev, PCI_VENDOR_ID) != PCI_VENDOR_ID_INTEL) + if (pci_read_config16(dev, PCI_VENDOR_ID) != PCI_VID_INTEL) return -1; /* Set SMBus I/O base. */ diff --git a/src/southbridge/intel/i82371eb/bootblock.c b/src/southbridge/intel/i82371eb/bootblock.c index 844106dcc0..6f379691e8 100644 --- a/src/southbridge/intel/i82371eb/bootblock.c +++ b/src/southbridge/intel/i82371eb/bootblock.c @@ -38,8 +38,8 @@ void bootblock_early_southbridge_init(void) * But scanning for the PCI IDs (instead of hardcoding * bus/device/function numbers) works on all boards. */ - const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82371AB_ISA), 0); + const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL, + PCI_DID_INTEL_82371AB_ISA), 0); /* Enable access to the whole ROM, disable ROM write access. */ reg16 = pci_read_config16(dev, XBCS); diff --git a/src/southbridge/intel/i82371eb/early_pm.c b/src/southbridge/intel/i82371eb/early_pm.c index 48c761cad0..2a1c6ebae9 100644 --- a/src/southbridge/intel/i82371eb/early_pm.c +++ b/src/southbridge/intel/i82371eb/early_pm.c @@ -13,8 +13,8 @@ void enable_pm(void) u16 reg16; /* Get the SMBus/PM device of the 82371AB/EB/MB. */ - const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI), 0); + const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL, + PCI_DID_INTEL_82371AB_SMB_ACPI), 0); /* Set the PM I/O base. */ pci_write_config32(dev, PMBA, DEFAULT_PMBASE | 1); diff --git a/src/southbridge/intel/i82371eb/early_smbus.c b/src/southbridge/intel/i82371eb/early_smbus.c index 1d080453e0..d2ff00a1eb 100644 --- a/src/southbridge/intel/i82371eb/early_smbus.c +++ b/src/southbridge/intel/i82371eb/early_smbus.c @@ -25,8 +25,8 @@ int smbus_enable_iobar(uintptr_t base) u16 reg16; /* Get the SMBus/PM device of the 82371AB/EB/MB. */ - const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI), 0); + const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL, + PCI_DID_INTEL_82371AB_SMB_ACPI), 0); /* Set the SMBus I/O base. */ pci_write_config32(dev, SMBBA, base | 1); diff --git a/src/southbridge/intel/i82371eb/ide.c b/src/southbridge/intel/i82371eb/ide.c index 90af8c4662..9ea71dba71 100644 --- a/src/southbridge/intel/i82371eb/ide.c +++ b/src/southbridge/intel/i82371eb/ide.c @@ -148,34 +148,34 @@ static const struct device_operations ide_ops_ab_eb_mb = { /* Intel 82371FB (PIIX) */ static const struct pci_driver ide_driver_fb __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371FB_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371FB_IDE, }; /* Intel 82371SB (PIIX3) */ static const struct pci_driver ide_driver_sb __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371SB_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371SB_IDE, }; /* Intel 82371MX (MPIIX) */ static const struct pci_driver ide_driver_mx __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371MX_ISA_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371MX_ISA_IDE, }; /* Intel 82437MX (part of the 430MX chipset) */ static const struct pci_driver ide_driver_82437mx __pci_driver = { .ops = &ide_ops_fb_sb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82437MX_ISA_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82437MX_ISA_IDE, }; /* Intel 82371AB/EB/MB */ static const struct pci_driver ide_driver_ab_eb_mb __pci_driver = { .ops = &ide_ops_ab_eb_mb, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_IDE, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_IDE, }; diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c index 5eb1a82d17..c5329f4313 100644 --- a/src/southbridge/intel/i82371eb/isa.c +++ b/src/southbridge/intel/i82371eb/isa.c @@ -107,12 +107,12 @@ static const struct device_operations isa_ops = { static const struct pci_driver isa_driver __pci_driver = { .ops = &isa_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_ISA, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_ISA, }; static const struct pci_driver isa_SB_driver __pci_driver = { .ops = &isa_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371SB_ISA, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371SB_ISA, }; diff --git a/src/southbridge/intel/i82371eb/smbus.c b/src/southbridge/intel/i82371eb/smbus.c index 5b9f8be30e..7c1ce1bc37 100644 --- a/src/southbridge/intel/i82371eb/smbus.c +++ b/src/southbridge/intel/i82371eb/smbus.c @@ -110,6 +110,6 @@ static const struct device_operations smbus_ops = { /* Intel 82371AB/EB/MB */ static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_SMB_ACPI, }; diff --git a/src/southbridge/intel/i82371eb/usb.c b/src/southbridge/intel/i82371eb/usb.c index e3bcbebf82..d86bc1e282 100644 --- a/src/southbridge/intel/i82371eb/usb.c +++ b/src/southbridge/intel/i82371eb/usb.c @@ -31,14 +31,14 @@ static const struct device_operations usb_ops = { /* Intel 82371SB (PIIX3) */ static const struct pci_driver usb_driver_sb __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371SB_USB, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371SB_USB, }; /* Intel 82371AB/EB/MB (PIIX4/PIIX4E/PIIX4M) */ /* The 440MX (82443MX) consists of 82443BX + 82371EB (uses same PCI IDs). */ static const struct pci_driver usb_driver_ab_eb_mb __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82371AB_USB, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82371AB_USB, }; diff --git a/src/southbridge/intel/i82801dx/ac97.c b/src/southbridge/intel/i82801dx/ac97.c index d6a6bc9864..6e8b6d2aad 100644 --- a/src/southbridge/intel/i82801dx/ac97.c +++ b/src/southbridge/intel/i82801dx/ac97.c @@ -252,12 +252,12 @@ static struct device_operations ac97_modem_ops = { /* 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) */ static const struct pci_driver i82801db_ac97_audio __pci_driver = { .ops = &ac97_audio_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_AC97_AUDIO, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_AC97_AUDIO, }; static const struct pci_driver i82801db_ac97_modem __pci_driver = { .ops = &ac97_modem_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_AC97_MODEM, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_AC97_MODEM, }; diff --git a/src/southbridge/intel/i82801dx/ide.c b/src/southbridge/intel/i82801dx/ide.c index b83a746309..a54e49781e 100644 --- a/src/southbridge/intel/i82801dx/ide.c +++ b/src/southbridge/intel/i82801dx/ide.c @@ -52,13 +52,13 @@ static struct device_operations ide_ops = { /* 82801DB */ static const struct pci_driver i82801db_ide __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x24cb, }; /* 82801DBM */ static const struct pci_driver i82801dbm_ide __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x24ca, }; diff --git a/src/southbridge/intel/i82801dx/lpc.c b/src/southbridge/intel/i82801dx/lpc.c index 238661cd2d..46c731ac94 100644 --- a/src/southbridge/intel/i82801dx/lpc.c +++ b/src/southbridge/intel/i82801dx/lpc.c @@ -322,13 +322,13 @@ static struct device_operations lpc_ops = { /* 82801DB/DBL */ static const struct pci_driver lpc_driver_db __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_LPC, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_LPC, }; /* 82801DBM */ static const struct pci_driver lpc_driver_dbm __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_LPC, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DBM_LPC, }; diff --git a/src/southbridge/intel/i82801dx/pci.c b/src/southbridge/intel/i82801dx/pci.c index ee4047f17e..2cc1b9d478 100644 --- a/src/southbridge/intel/i82801dx/pci.c +++ b/src/southbridge/intel/i82801dx/pci.c @@ -28,13 +28,13 @@ static struct device_operations pci_ops = { /* 82801DB */ static const struct pci_driver pci_driver_db __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_PCI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_PCI, }; /* 82801DBM/DBL */ static const struct pci_driver pci_driver_dbm __pci_driver = { .ops = &pci_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DBM_PCI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DBM_PCI, }; diff --git a/src/southbridge/intel/i82801dx/usb.c b/src/southbridge/intel/i82801dx/usb.c index 2abfa8a34f..16ec3077e9 100644 --- a/src/southbridge/intel/i82801dx/usb.c +++ b/src/southbridge/intel/i82801dx/usb.c @@ -26,20 +26,20 @@ static struct device_operations usb_ops = { /* 82801DB/DBL/DBM USB1 */ static const struct pci_driver usb_driver_1 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB1, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_USB1, }; /* 82801DB/DBL/DBM USB2 */ static const struct pci_driver usb_driver_2 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB2, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_USB2, }; /* 82801DB/DBL/DBM USB3 */ static const struct pci_driver usb_driver_3 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_USB3, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_USB3, }; diff --git a/src/southbridge/intel/i82801dx/usb2.c b/src/southbridge/intel/i82801dx/usb2.c index e333bb613f..0fe7c9399b 100644 --- a/src/southbridge/intel/i82801dx/usb2.c +++ b/src/southbridge/intel/i82801dx/usb2.c @@ -27,6 +27,6 @@ static struct device_operations usb2_ops = { /* 82801DB/DBM USB 2.0 */ static const struct pci_driver usb2_driver __pci_driver = { .ops = &usb2_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801DB_EHCI, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801DB_EHCI, }; diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c index 5230ace8ef..bdc8f779f6 100644 --- a/src/southbridge/intel/i82801gx/ac97.c +++ b/src/southbridge/intel/i82801gx/ac97.c @@ -255,7 +255,7 @@ static struct device_operations ac97_modem_ops = { /* Note: 82801GU (ICH7-U) doesn't have AC97 audio. */ static const struct pci_driver i82801gx_ac97_audio __pci_driver = { .ops = &ac97_audio_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27de, }; @@ -263,6 +263,6 @@ static const struct pci_driver i82801gx_ac97_audio __pci_driver = { /* Note: 82801GU (ICH7-U) doesn't have AC97 modem. */ static const struct pci_driver i82801gx_ac97_modem __pci_driver = { .ops = &ac97_modem_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27dd, }; diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c index 33a0cd8387..31827e6de9 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.c @@ -111,6 +111,6 @@ static struct device_operations azalia_ops = { /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ static const struct pci_driver i82801gx_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27d8, }; diff --git a/src/southbridge/intel/i82801gx/ide.c b/src/southbridge/intel/i82801gx/ide.c index 83d24320dd..71fc738632 100644 --- a/src/southbridge/intel/i82801gx/ide.c +++ b/src/southbridge/intel/i82801gx/ide.c @@ -88,6 +88,6 @@ static struct device_operations ide_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gx_ide __pci_driver = { .ops = &ide_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27df, }; diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 794d34acdb..a12e36bc58 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -483,6 +483,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich7_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c index d72bd81ebb..bf123bd316 100644 --- a/src/southbridge/intel/i82801gx/pci.c +++ b/src/southbridge/intel/i82801gx/pci.c @@ -47,7 +47,7 @@ static struct device_operations device_ops = { /* 82801BA/CA/DB/EB/ER/FB/FR/FW/FRW/GB/GR/GDH/HB/IB/6300ESB/i3100 */ static const struct pci_driver i82801g_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x244e, }; @@ -55,6 +55,6 @@ static const struct pci_driver i82801g_pci __pci_driver = { /* 82801BAM/CAM/DBL/DBM/FBM/GBM/GHM/GU/HBM/HEM */ static const struct pci_driver i82801gmu_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x2448, }; diff --git a/src/southbridge/intel/i82801gx/pcie.c b/src/southbridge/intel/i82801gx/pcie.c index b8918e8377..b9b8ccdf66 100644 --- a/src/southbridge/intel/i82801gx/pcie.c +++ b/src/southbridge/intel/i82801gx/pcie.c @@ -228,6 +228,6 @@ static const unsigned short i82801gx_pcie_ids[] = { static const struct pci_driver i82801gx_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = i82801gx_pcie_ids, }; diff --git a/src/southbridge/intel/i82801gx/sata.c b/src/southbridge/intel/i82801gx/sata.c index d0d8b3bf33..2333c76e16 100644 --- a/src/southbridge/intel/i82801gx/sata.c +++ b/src/southbridge/intel/i82801gx/sata.c @@ -219,6 +219,6 @@ static const unsigned short sata_ids[] = { static const struct pci_driver i82801gx_sata_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = sata_ids, }; diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c index 739e552b1d..cfacca0b5f 100644 --- a/src/southbridge/intel/i82801gx/smbus.c +++ b/src/southbridge/intel/i82801gx/smbus.c @@ -23,6 +23,6 @@ static struct device_operations smbus_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gx_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27da, }; diff --git a/src/southbridge/intel/i82801gx/usb.c b/src/southbridge/intel/i82801gx/usb.c index 08ba3d7830..4f3261f825 100644 --- a/src/southbridge/intel/i82801gx/usb.c +++ b/src/southbridge/intel/i82801gx/usb.c @@ -35,27 +35,27 @@ static struct device_operations usb_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb1 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27c8, }; /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb2 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27c9, }; /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb3 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27ca, }; /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb4 __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27cb, }; diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c index b01af96c60..811dc503b7 100644 --- a/src/southbridge/intel/i82801gx/usb_ehci.c +++ b/src/southbridge/intel/i82801gx/usb_ehci.c @@ -66,6 +66,6 @@ static struct device_operations usb_ehci_ops = { /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gx_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x27cc, }; diff --git a/src/southbridge/intel/i82801ix/azalia.c b/src/southbridge/intel/i82801ix/azalia.c index 0179415375..fdc951472e 100644 --- a/src/southbridge/intel/i82801ix/azalia.c +++ b/src/southbridge/intel/i82801ix/azalia.c @@ -92,6 +92,6 @@ static struct device_operations azalia_ops = { /* ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M */ static const struct pci_driver i82801ix_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801IB_HD_AUDIO, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801IB_HD_AUDIO, }; diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index 0132ac5b89..9f70d1f8be 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -465,17 +465,17 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IH_LPC, /* ICH9DH */ - PCI_DEVICE_ID_INTEL_82801IO_LPC, /* ICH9DO */ - PCI_DEVICE_ID_INTEL_82801IR_LPC, /* ICH9R */ - PCI_DEVICE_ID_INTEL_82801IEM_LPC, /* ICH9M-E */ - PCI_DEVICE_ID_INTEL_82801IB_LPC, /* ICH9 */ - PCI_DEVICE_ID_INTEL_82801IBM_LPC, /* ICH9M */ + PCI_DID_INTEL_82801IH_LPC, /* ICH9DH */ + PCI_DID_INTEL_82801IO_LPC, /* ICH9DO */ + PCI_DID_INTEL_82801IR_LPC, /* ICH9R */ + PCI_DID_INTEL_82801IEM_LPC, /* ICH9M-E */ + PCI_DID_INTEL_82801IB_LPC, /* ICH9 */ + PCI_DID_INTEL_82801IBM_LPC, /* ICH9M */ 0 }; static const struct pci_driver ich9_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/pci.c b/src/southbridge/intel/i82801ix/pci.c index da710a3a8d..5a1350361c 100644 --- a/src/southbridge/intel/i82801ix/pci.c +++ b/src/southbridge/intel/i82801ix/pci.c @@ -44,6 +44,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich9_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/pcie.c b/src/southbridge/intel/i82801ix/pcie.c index a20e7d6dc4..a199dd12a8 100644 --- a/src/southbridge/intel/i82801ix/pcie.c +++ b/src/southbridge/intel/i82801ix/pcie.c @@ -82,16 +82,16 @@ static struct device_operations device_ops = { /* 82801Ix (ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M) */ static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IB_PCIE1, /* Port 1 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE2, /* Port 2 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE3, /* Port 3 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE4, /* Port 4 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE5, /* Port 5 */ - PCI_DEVICE_ID_INTEL_82801IB_PCIE6, /* Port 6 */ + PCI_DID_INTEL_82801IB_PCIE1, /* Port 1 */ + PCI_DID_INTEL_82801IB_PCIE2, /* Port 2 */ + PCI_DID_INTEL_82801IB_PCIE3, /* Port 3 */ + PCI_DID_INTEL_82801IB_PCIE4, /* Port 4 */ + PCI_DID_INTEL_82801IB_PCIE5, /* Port 5 */ + PCI_DID_INTEL_82801IB_PCIE6, /* Port 6 */ 0 }; static const struct pci_driver ich9_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c index df74123def..260d76a8cb 100644 --- a/src/southbridge/intel/i82801ix/sata.c +++ b/src/southbridge/intel/i82801ix/sata.c @@ -140,8 +140,8 @@ static void sata_init(struct device *const dev) const config_t *const config = dev->chip_info; const u16 devid = pci_read_config16(dev, PCI_DEVICE_ID); - const int is_mobile = (devid == PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_IDE_P01) || - (devid == PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_AHCI_P0145); + const int is_mobile = (devid == PCI_DID_INTEL_82801IBM_IEM_SATA_IDE_P01) || + (devid == PCI_DID_INTEL_82801IBM_IEM_SATA_AHCI_P0145); printk(BIOS_DEBUG, "i82801ix_sata: initializing...\n"); @@ -251,17 +251,17 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IB_SATA_P0123, - PCI_DEVICE_ID_INTEL_82801IB_SATA_P01, - PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI1, - PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI2, - PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_IDE_P01, - PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_AHCI_P0145, + PCI_DID_INTEL_82801IB_SATA_P0123, + PCI_DID_INTEL_82801IB_SATA_P01, + PCI_DID_INTEL_82801IB_SATA_AHCI1, + PCI_DID_INTEL_82801IB_SATA_AHCI2, + PCI_DID_INTEL_82801IBM_IEM_SATA_IDE_P01, + PCI_DID_INTEL_82801IBM_IEM_SATA_AHCI_P0145, 0, }; static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c index 1ccd9f5071..17f7b6b0f1 100644 --- a/src/southbridge/intel/i82801ix/smbus.c +++ b/src/southbridge/intel/i82801ix/smbus.c @@ -29,6 +29,6 @@ static struct device_operations smbus_ops = { static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801IB_SMB, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801IB_SMB, }; diff --git a/src/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c index 173a0e6be4..543b2ffd38 100644 --- a/src/southbridge/intel/i82801ix/thermal.c +++ b/src/southbridge/intel/i82801ix/thermal.c @@ -43,6 +43,6 @@ static struct device_operations device_ops = { static const struct pci_driver ich9_thermal __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801IB_THERMAL, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82801IB_THERMAL, }; diff --git a/src/southbridge/intel/i82801ix/usb_ehci.c b/src/southbridge/intel/i82801ix/usb_ehci.c index 64f23f6690..4e6327a8cd 100644 --- a/src/southbridge/intel/i82801ix/usb_ehci.c +++ b/src/southbridge/intel/i82801ix/usb_ehci.c @@ -33,8 +33,8 @@ static void usb_ehci_set_subsystem(struct device *dev, unsigned int vendor, } static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_82801IB_EHCI1, - PCI_DEVICE_ID_INTEL_82801IB_EHCI2, + PCI_DID_INTEL_82801IB_EHCI1, + PCI_DID_INTEL_82801IB_EHCI2, 0 }; @@ -52,6 +52,6 @@ static struct device_operations usb_ehci_ops = { static const struct pci_driver pch_usb_ehci1 __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/azalia.c b/src/southbridge/intel/i82801jx/azalia.c index 618350ea32..fa0209ae78 100644 --- a/src/southbridge/intel/i82801jx/azalia.c +++ b/src/southbridge/intel/i82801jx/azalia.c @@ -97,6 +97,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver i82801jx_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index 106669d883..e3881ffa13 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -500,6 +500,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/pci.c b/src/southbridge/intel/i82801jx/pci.c index 36769d0eee..37b759c3e1 100644 --- a/src/southbridge/intel/i82801jx/pci.c +++ b/src/southbridge/intel/i82801jx/pci.c @@ -43,6 +43,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_pci __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/pcie.c b/src/southbridge/intel/i82801jx/pcie.c index 133d50235d..1d02898688 100644 --- a/src/southbridge/intel/i82801jx/pcie.c +++ b/src/southbridge/intel/i82801jx/pcie.c @@ -100,6 +100,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/sata.c b/src/southbridge/intel/i82801jx/sata.c index c21c115ad2..4e014817c9 100644 --- a/src/southbridge/intel/i82801jx/sata.c +++ b/src/southbridge/intel/i82801jx/sata.c @@ -242,6 +242,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c index 11a3daa799..6c9df2f357 100644 --- a/src/southbridge/intel/i82801jx/smbus.c +++ b/src/southbridge/intel/i82801jx/smbus.c @@ -36,6 +36,6 @@ static const unsigned short pci_device_ids[] = static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/thermal.c b/src/southbridge/intel/i82801jx/thermal.c index 5fc9548e55..b8a7e84dce 100644 --- a/src/southbridge/intel/i82801jx/thermal.c +++ b/src/southbridge/intel/i82801jx/thermal.c @@ -46,6 +46,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver ich10_thermal __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82801jx/usb_ehci.c b/src/southbridge/intel/i82801jx/usb_ehci.c index 893bb2983b..1a59d376ae 100644 --- a/src/southbridge/intel/i82801jx/usb_ehci.c +++ b/src/southbridge/intel/i82801jx/usb_ehci.c @@ -54,6 +54,6 @@ static struct device_operations usb_ehci_ops = { static const struct pci_driver pch_usb_ehci1 __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/i82870/ioapic.c b/src/southbridge/intel/i82870/ioapic.c index 9c8ec231da..65fecd10f8 100644 --- a/src/southbridge/intel/i82870/ioapic.c +++ b/src/southbridge/intel/i82870/ioapic.c @@ -73,7 +73,7 @@ static struct device_operations ioapic_ops = { static const struct pci_driver ioapic_driver __pci_driver = { .ops = &ioapic_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82870_1E0, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82870_1E0, }; diff --git a/src/southbridge/intel/i82870/pcibridge.c b/src/southbridge/intel/i82870/pcibridge.c index 8fad13649f..00bf6bb1cf 100644 --- a/src/southbridge/intel/i82870/pcibridge.c +++ b/src/southbridge/intel/i82870/pcibridge.c @@ -33,8 +33,8 @@ static struct device_operations pcix_ops = { static const struct pci_driver pcix_driver __pci_driver = { .ops = &pcix_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82870_1F0, + .vendor = PCI_VID_INTEL, + .device = PCI_DID_INTEL_82870_1F0, }; struct chip_operations southbridge_intel_i82870_ops = { diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c index d4e639ac04..ac950c46df 100644 --- a/src/southbridge/intel/ibexpeak/azalia.c +++ b/src/southbridge/intel/ibexpeak/azalia.c @@ -123,6 +123,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index 53fce008f5..1735020b54 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -568,6 +568,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c index 74b386169a..15d8402d8b 100644 --- a/src/southbridge/intel/ibexpeak/me.c +++ b/src/southbridge/intel/ibexpeak/me.c @@ -523,6 +523,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids }; diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c index 4107abbc3e..45520cd0b7 100644 --- a/src/southbridge/intel/ibexpeak/sata.c +++ b/src/southbridge/intel/ibexpeak/sata.c @@ -211,6 +211,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c index 66523256b9..de1ad1843c 100644 --- a/src/southbridge/intel/ibexpeak/smbus.c +++ b/src/southbridge/intel/ibexpeak/smbus.c @@ -43,6 +43,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c index b96833cb54..216af67d5b 100644 --- a/src/southbridge/intel/ibexpeak/thermal.c +++ b/src/southbridge/intel/ibexpeak/thermal.c @@ -41,6 +41,6 @@ static struct device_operations thermal_ops = { static const struct pci_driver pch_thermal __pci_driver = { .ops = &thermal_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = PCI_DID_INTEL_IBEXPEAK_THERMAL, }; diff --git a/src/southbridge/intel/ibexpeak/usb_ehci.c b/src/southbridge/intel/ibexpeak/usb_ehci.c index 3de8c33652..45c5ceca67 100644 --- a/src/southbridge/intel/ibexpeak/usb_ehci.c +++ b/src/southbridge/intel/ibexpeak/usb_ehci.c @@ -86,6 +86,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver pch_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c index 1bde180883..f41b3c2f04 100644 --- a/src/southbridge/intel/lynxpoint/azalia.c +++ b/src/southbridge/intel/lynxpoint/azalia.c @@ -121,13 +121,13 @@ static struct device_operations azalia_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_AUDIO, - PCI_DEVICE_ID_INTEL_LPT_LP_AUDIO, + PCI_DID_INTEL_LPT_H_AUDIO, + PCI_DID_INTEL_LPT_LP_AUDIO, 0 }; static const struct pci_driver pch_azalia __pci_driver = { .ops = &azalia_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c index 71ce0806a9..73cf37f921 100644 --- a/src/southbridge/intel/lynxpoint/lpc.c +++ b/src/southbridge/intel/lynxpoint/lpc.c @@ -816,30 +816,30 @@ static struct device_operations device_ops = { /* IDs for LPC device of Intel 8 Series Chipset (Lynx Point) */ static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_MOBILE_SAMPLE, - PCI_DEVICE_ID_INTEL_LPT_DESKTOP_SAMPLE, - PCI_DEVICE_ID_INTEL_LPT_Z87, - PCI_DEVICE_ID_INTEL_LPT_Z85, - PCI_DEVICE_ID_INTEL_LPT_HM86, - PCI_DEVICE_ID_INTEL_LPT_H87, - PCI_DEVICE_ID_INTEL_LPT_HM87, - PCI_DEVICE_ID_INTEL_LPT_Q85, - PCI_DEVICE_ID_INTEL_LPT_Q87, - PCI_DEVICE_ID_INTEL_LPT_QM87, - PCI_DEVICE_ID_INTEL_LPT_B85, - PCI_DEVICE_ID_INTEL_LPT_C222, - PCI_DEVICE_ID_INTEL_LPT_C224, - PCI_DEVICE_ID_INTEL_LPT_C226, - PCI_DEVICE_ID_INTEL_LPT_H81, - PCI_DEVICE_ID_INTEL_LPT_LP_SAMPLE, - PCI_DEVICE_ID_INTEL_LPT_LP_PREMIUM, - PCI_DEVICE_ID_INTEL_LPT_LP_MAINSTREAM, - PCI_DEVICE_ID_INTEL_LPT_LP_VALUE, + PCI_DID_INTEL_LPT_MOBILE_SAMPLE, + PCI_DID_INTEL_LPT_DESKTOP_SAMPLE, + PCI_DID_INTEL_LPT_Z87, + PCI_DID_INTEL_LPT_Z85, + PCI_DID_INTEL_LPT_HM86, + PCI_DID_INTEL_LPT_H87, + PCI_DID_INTEL_LPT_HM87, + PCI_DID_INTEL_LPT_Q85, + PCI_DID_INTEL_LPT_Q87, + PCI_DID_INTEL_LPT_QM87, + PCI_DID_INTEL_LPT_B85, + PCI_DID_INTEL_LPT_C222, + PCI_DID_INTEL_LPT_C224, + PCI_DID_INTEL_LPT_C226, + PCI_DID_INTEL_LPT_H81, + PCI_DID_INTEL_LPT_LP_SAMPLE, + PCI_DID_INTEL_LPT_LP_PREMIUM, + PCI_DID_INTEL_LPT_LP_MAINSTREAM, + PCI_DID_INTEL_LPT_LP_VALUE, 0 }; static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/me.c b/src/southbridge/intel/lynxpoint/me.c index ca6aff7df7..40626c2362 100644 --- a/src/southbridge/intel/lynxpoint/me.c +++ b/src/southbridge/intel/lynxpoint/me.c @@ -920,13 +920,13 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_MEI, - PCI_DEVICE_ID_INTEL_LPT_LP_MEI, + PCI_DID_INTEL_LPT_H_MEI, + PCI_DID_INTEL_LPT_LP_MEI, 0 }; static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c index 30773e63b2..24fab3b41e 100644 --- a/src/southbridge/intel/lynxpoint/pcie.c +++ b/src/southbridge/intel/lynxpoint/pcie.c @@ -38,7 +38,7 @@ static struct root_port_config rpc; static inline int max_root_ports(void) { - if (pch_is_lp() || pch_silicon_id() == PCI_DEVICE_ID_INTEL_LPT_H81) + if (pch_is_lp() || pch_silicon_id() == PCI_DID_INTEL_LPT_H81) return 6; return 8; @@ -749,25 +749,25 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP6, + PCI_DID_INTEL_LPT_H_PCIE_RP1, + PCI_DID_INTEL_LPT_H_PCIE_RP2, + PCI_DID_INTEL_LPT_H_PCIE_RP3, + PCI_DID_INTEL_LPT_H_PCIE_RP4, + PCI_DID_INTEL_LPT_H_PCIE_RP5, + PCI_DID_INTEL_LPT_H_PCIE_RP6, + PCI_DID_INTEL_LPT_H_PCIE_RP7, + PCI_DID_INTEL_LPT_H_PCIE_RP8, + PCI_DID_INTEL_LPT_LP_PCIE_RP1, + PCI_DID_INTEL_LPT_LP_PCIE_RP2, + PCI_DID_INTEL_LPT_LP_PCIE_RP3, + PCI_DID_INTEL_LPT_LP_PCIE_RP4, + PCI_DID_INTEL_LPT_LP_PCIE_RP5, + PCI_DID_INTEL_LPT_LP_PCIE_RP6, 0 }; static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c index c90c096a85..49108ee439 100644 --- a/src/southbridge/intel/lynxpoint/sata.c +++ b/src/southbridge/intel/lynxpoint/sata.c @@ -219,27 +219,27 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_1, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45, - PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_2, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_1, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE_P45, - PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_2, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_1, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_PREM, - PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_2, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_AHCI, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_1, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45, + PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_2, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_AHCI, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_1, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE_P45, + PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_2, + PCI_DID_INTEL_LPT_LP_SATA_AHCI, + PCI_DID_INTEL_LPT_LP_SATA_RAID_1, + PCI_DID_INTEL_LPT_LP_SATA_RAID_PREM, + PCI_DID_INTEL_LPT_LP_SATA_RAID_2, 0 }; static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/serialio.c b/src/southbridge/intel/lynxpoint/serialio.c index 0aa683d633..208c52ab44 100644 --- a/src/southbridge/intel/lynxpoint/serialio.c +++ b/src/southbridge/intel/lynxpoint/serialio.c @@ -259,19 +259,19 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_LP_SDMA, - PCI_DEVICE_ID_INTEL_LPT_LP_I2C0, - PCI_DEVICE_ID_INTEL_LPT_LP_I2C1, - PCI_DEVICE_ID_INTEL_LPT_LP_GSPI0, - PCI_DEVICE_ID_INTEL_LPT_LP_GSPI1, - PCI_DEVICE_ID_INTEL_LPT_LP_UART0, - PCI_DEVICE_ID_INTEL_LPT_LP_UART1, - PCI_DEVICE_ID_INTEL_LPT_LP_SD, + PCI_DID_INTEL_LPT_LP_SDMA, + PCI_DID_INTEL_LPT_LP_I2C0, + PCI_DID_INTEL_LPT_LP_I2C1, + PCI_DID_INTEL_LPT_LP_GSPI0, + PCI_DID_INTEL_LPT_LP_GSPI1, + PCI_DID_INTEL_LPT_LP_UART0, + PCI_DID_INTEL_LPT_LP_UART1, + PCI_DID_INTEL_LPT_LP_SD, 0 }; static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/smbus.c b/src/southbridge/intel/lynxpoint/smbus.c index f41e322b82..519afe5ca4 100644 --- a/src/southbridge/intel/lynxpoint/smbus.c +++ b/src/southbridge/intel/lynxpoint/smbus.c @@ -34,14 +34,14 @@ static struct device_operations smbus_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_SMBUS, - PCI_DEVICE_ID_INTEL_LPT_LP_SMBUS, - PCI_DEVICE_ID_INTEL_WPT_LP_SMBUS, + PCI_DID_INTEL_LPT_H_SMBUS, + PCI_DID_INTEL_LPT_LP_SMBUS, + PCI_DID_INTEL_WPT_LP_SMBUS, 0 }; static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/usb_ehci.c b/src/southbridge/intel/lynxpoint/usb_ehci.c index d718ab3280..8853a143ca 100644 --- a/src/southbridge/intel/lynxpoint/usb_ehci.c +++ b/src/southbridge/intel/lynxpoint/usb_ehci.c @@ -170,15 +170,15 @@ static struct device_operations usb_ehci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_LP_EHCI, - PCI_DEVICE_ID_INTEL_LPT_H_EHCI_1, - PCI_DEVICE_ID_INTEL_LPT_H_EHCI_2, + PCI_DID_INTEL_LPT_LP_EHCI, + PCI_DID_INTEL_LPT_H_EHCI_1, + PCI_DID_INTEL_LPT_H_EHCI_2, 0 }; static const struct pci_driver pch_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c index f049ee2af3..1219bccf8c 100644 --- a/src/southbridge/intel/lynxpoint/usb_xhci.c +++ b/src/southbridge/intel/lynxpoint/usb_xhci.c @@ -342,14 +342,14 @@ static struct device_operations usb_xhci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_LPT_H_XHCI, - PCI_DEVICE_ID_INTEL_LPT_LP_XHCI, + PCI_DID_INTEL_LPT_H_XHCI, + PCI_DID_INTEL_LPT_LP_XHCI, 0 }; static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; #endif /* !__SIMPLE_DEVICE__ */ diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c index e0744b314e..23476ece2c 100644 --- a/src/southbridge/ricoh/rl5c476/rl5c476.c +++ b/src/southbridge/ricoh/rl5c476/rl5c476.c @@ -204,8 +204,8 @@ static struct device_operations ricoh_rl5c476_ops = { static const struct pci_driver ricoh_rl5c476_driver __pci_driver = { .ops = &ricoh_rl5c476_ops, - .vendor = PCI_VENDOR_ID_RICOH, - .device = PCI_DEVICE_ID_RICOH_RL5C476, + .vendor = PCI_VID_RICOH, + .device = PCI_DID_RICOH_RL5C476, }; static void southbridge_init(struct device *dev) diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c index aee02f7dbc..ccd3ce941d 100644 --- a/src/southbridge/ti/pci1x2x/pci1x2x.c +++ b/src/southbridge/ti/pci1x2x/pci1x2x.c @@ -50,26 +50,26 @@ struct device_operations southbridge_ti_pci1x2x_pciops = { static const struct pci_driver ti_pci1225_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1225, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1225, }; static const struct pci_driver ti_pci1420_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1420, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1420, }; static const struct pci_driver ti_pci1510_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1510, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1510, }; static const struct pci_driver ti_pci1520_driver __pci_driver = { .ops = &southbridge_ti_pci1x2x_pciops, - .vendor = PCI_VENDOR_ID_TI, - .device = PCI_DEVICE_ID_TI_1520, + .vendor = PCI_VID_TI, + .device = PCI_DID_TI_1520, }; struct chip_operations southbridge_ti_pci1x2x_ops = { diff --git a/src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/IndustryStandard/Pci22.h b/src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/IndustryStandard/Pci22.h index ab29e15760..f9128da721 100644 --- a/src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/IndustryStandard/Pci22.h +++ b/src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/IndustryStandard/Pci22.h @@ -522,8 +522,8 @@ typedef struct { #define PCI_MAX_BAR 0x0006 #define PCI_MAX_CONFIG_OFFSET 0x0100 -#define PCI_VENDOR_ID_OFFSET 0x00 -#define PCI_DEVICE_ID_OFFSET 0x02 +#define PCI_VID_OFFSET 0x00 +#define PCI_DID_OFFSET 0x02 #define PCI_COMMAND_OFFSET 0x04 #define PCI_PRIMARY_STATUS_OFFSET 0x06 #define PCI_REVISION_ID_OFFSET 0x08 diff --git a/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/Pci22.h b/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/Pci22.h index 69e15f7aa9..6d9a641479 100644 --- a/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/Pci22.h +++ b/src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/Pci22.h @@ -516,8 +516,8 @@ typedef struct { #define PCI_MAX_BAR 0x0006 #define PCI_MAX_CONFIG_OFFSET 0x0100 -#define PCI_VENDOR_ID_OFFSET 0x00 -#define PCI_DEVICE_ID_OFFSET 0x02 +#define PCI_VID_OFFSET 0x00 +#define PCI_DID_OFFSET 0x02 #define PCI_COMMAND_OFFSET 0x04 #define PCI_PRIMARY_STATUS_OFFSET 0x06 #define PCI_REVISION_ID_OFFSET 0x08 diff --git a/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/Pci22.h b/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/Pci22.h index 69e15f7aa9..6d9a641479 100644 --- a/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/Pci22.h +++ b/src/vendorcode/intel/edk2/edk2-stable202111/MdePkg/Include/IndustryStandard/Pci22.h @@ -516,8 +516,8 @@ typedef struct { #define PCI_MAX_BAR 0x0006 #define PCI_MAX_CONFIG_OFFSET 0x0100 -#define PCI_VENDOR_ID_OFFSET 0x00 -#define PCI_DEVICE_ID_OFFSET 0x02 +#define PCI_VID_OFFSET 0x00 +#define PCI_DID_OFFSET 0x02 #define PCI_COMMAND_OFFSET 0x04 #define PCI_PRIMARY_STATUS_OFFSET 0x06 #define PCI_REVISION_ID_OFFSET 0x08 |