drivers/intel/wifi: Add support for Harrison Peak (HrP)

Move all Intel WIFI PCI ids into device/pci_ids.h file.

TEST=HrP module is getting detected during PCI enumeration.

Change-Id: Ia2d15f3f4a68887521ddbb1b99daf9d98cfa5c8b
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/25561
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index 9349e53..57bd9b0 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -233,12 +233,37 @@
 };
 
 static const unsigned short pci_device_ids[] = {
-	0x0084, 0x0085, 0x0089, 0x008b, 0x008e, 0x0090,
-	0x0886, 0x0888, 0x0891, 0x0893, 0x0895, 0x088f,
-	0x4236, 0x4237, 0x4238, 0x4239, 0x423b, 0x423d,
-	0x08b1, 0x08b2, /* Wilkins Peak 2 */
-	0x095a, 0x095b, /* Stone Peak 2 */
-	0x9df0, 0x31dc, 0x0a370, /* Jefferson Peak */
+	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,
+	/* Wilkins Peak 2 */
+	PCI_DEVICE_ID_WP_7260_SERIES_1_WIFI,
+	PCI_DEVICE_ID_WP_7260_SERIES_2_WIFI,
+	/* Stone Peak 2 */
+	PCI_DEVICE_ID_SP_7265_SERIES_1_WIFI,
+	PCI_DEVICE_ID_SP_7265_SERIES_2_WIFI,
+	/* Jefferson Peak */
+	PCI_DEVICE_ID_JP_9000_SERIES_1_WIFI,
+	PCI_DEVICE_ID_JP_9000_SERIES_2_WIFI,
+	PCI_DEVICE_ID_JP_9000_SERIES_3_WIFI,
+	/* Harrison Peak */
+	PCI_DEVICE_ID_HrP_9560_SERIES_1_WIFI,
+	PCI_DEVICE_ID_HrP_9560_SERIES_2_WIFI,
 	0
 };
 
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index e53d1b0..7dc3e00 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2958,6 +2958,35 @@
 #define PCH_CNL_LP_U_BASE			0x9d85
 #define PCH_CNL_H_DT_SUPER			0xa280
 
+/* 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_JP_9000_SERIES_1_WIFI	0x9df0
+#define PCI_DEVICE_ID_JP_9000_SERIES_2_WIFI	0x31dc
+#define PCI_DEVICE_ID_JP_9000_SERIES_3_WIFI	0xa370
+#define PCI_DEVICE_ID_HrP_9560_SERIES_1_WIFI	0x34f0
+#define PCI_DEVICE_ID_HrP_9560_SERIES_2_WIFI	0xa0f0
+
 #define PCI_VENDOR_ID_COMPUTONE		0x8e0e
 #define PCI_DEVICE_ID_COMPUTONE_IP2EX	0x0291
 #define PCI_DEVICE_ID_COMPUTONE_PG	0x0302