Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac

[~shefty/rdma-dev.git] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2eabe311f0d3daf13a86c163b7eb2576224df842..d278dd9cb76510aeedb248d0be2ff071de4e98f0 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -393,6 +393,9 @@
 #define PCI_DEVICE_ID_VLSI_82C147      0x0105
 #define PCI_DEVICE_ID_VLSI_VAS96011    0x0702
 
+/* AMD RD890 Chipset */
+#define PCI_DEVICE_ID_RD890_IOMMU      0x5a23
+
 #define PCI_VENDOR_ID_ADL              0x1005
 #define PCI_DEVICE_ID_ADL_2301         0x2301
 
@@ -514,6 +517,7 @@
 #define PCI_DEVICE_ID_AMD_11H_NB_DRAM  0x1302
 #define PCI_DEVICE_ID_AMD_11H_NB_MISC  0x1303
 #define PCI_DEVICE_ID_AMD_11H_NB_LINK  0x1304
+#define PCI_DEVICE_ID_AMD_15H_NB_MISC  0x1603
 #define PCI_DEVICE_ID_AMD_LANCE                0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME   0x2001
 #define PCI_DEVICE_ID_AMD_SCSI         0x2020
@@ -739,6 +743,7 @@
 #define PCI_DEVICE_ID_HP_CISSC         0x3230
 #define PCI_DEVICE_ID_HP_CISSD         0x3238
 #define PCI_DEVICE_ID_HP_CISSE         0x323a
+#define PCI_DEVICE_ID_HP_CISSF         0x323b
 #define PCI_DEVICE_ID_HP_ZX2_IOC       0x4031
 
 #define PCI_VENDOR_ID_PCTECH           0x1042
@@ -2189,6 +2194,9 @@
 #define PCI_VENDOR_ID_ARIMA            0x161f
 
 #define PCI_VENDOR_ID_BROCADE          0x1657
+#define PCI_DEVICE_ID_BROCADE_CT       0x0014
+#define PCI_DEVICE_ID_BROCADE_FC_8G1P  0x0017
+#define PCI_DEVICE_ID_BROCADE_CT_FC    0x0021
 
 #define PCI_VENDOR_ID_SIBYTE           0x166d
 #define PCI_DEVICE_ID_BCM1250_PCI      0x0001
@@ -2300,6 +2308,8 @@
 #define PCI_DEVICE_ID_P2010            0x0079
 #define PCI_DEVICE_ID_P1020E           0x0100
 #define PCI_DEVICE_ID_P1020            0x0101
+#define PCI_DEVICE_ID_P1021E           0x0102
+#define PCI_DEVICE_ID_P1021            0x0103
 #define PCI_DEVICE_ID_P1011E           0x0108
 #define PCI_DEVICE_ID_P1011            0x0109
 #define PCI_DEVICE_ID_P1022E           0x0110
@@ -2310,6 +2320,14 @@
 #define PCI_DEVICE_ID_P4080            0x0401
 #define PCI_DEVICE_ID_P4040E           0x0408
 #define PCI_DEVICE_ID_P4040            0x0409
+#define PCI_DEVICE_ID_P2040E           0x0410
+#define PCI_DEVICE_ID_P2040            0x0411
+#define PCI_DEVICE_ID_P3041E           0x041E
+#define PCI_DEVICE_ID_P3041            0x041F
+#define PCI_DEVICE_ID_P5020E           0x0420
+#define PCI_DEVICE_ID_P5020            0x0421
+#define PCI_DEVICE_ID_P5010E           0x0428
+#define PCI_DEVICE_ID_P5010            0x0429
 #define PCI_DEVICE_ID_MPC8641          0x7010
 #define PCI_DEVICE_ID_MPC8641D         0x7011
 #define PCI_DEVICE_ID_MPC8610          0x7018