Furquan Shaikh has uploaded this change for review.
wifi: Drop PCI IDs for JfP and HrP
This change drops the PCI IDs for Jefferson Peak and Harrison Peak
CNVi modules from wifi/generic drivers as well as pci_ids.h. These IDs
actually represent the CNVi WiFi controller PCI IDs and are now
supported by intel/common/block/cnvi driver.
The only ID that is being dropped without adding support in
intel/common/block/cnvi driver is
PCI_DEVICE_ID_HrP_6SERIES_WIFI(0x2720) since this was not found in the
list of PCI IDs for any SoC.
Change-Id: I82857a737b65a6baa94fb3c2588fe723412a7830
Signed-off-by: Furquan Shaikh <furquan@google.com>
---
M src/drivers/wifi/generic/generic.c
M src/include/device/pci_ids.h
2 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/46866/1
diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c
index 0b13fa8..1aa6ad4 100644
--- a/src/drivers/wifi/generic/generic.c
+++ b/src/drivers/wifi/generic/generic.c
@@ -89,18 +89,8 @@
PCI_DEVICE_ID_SFP_8260_SERIES_2_WIFI,
/* Windstorm Peak */
PCI_DEVICE_ID_WSP_8275_SERIES_1_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,
/* Thunder Peak 2 */
PCI_DEVICE_ID_TP_9260_SERIES_WIFI,
- /* Harrison Peak */
- PCI_DEVICE_ID_HrP_9560_SERIES_1_WIFI,
- PCI_DEVICE_ID_HrP_9560_SERIES_2_WIFI,
- PCI_DEVICE_ID_HrP_9560_SERIES_3_WIFI,
- PCI_DEVICE_ID_HrP_9560_SERIES_4_WIFI,
- PCI_DEVICE_ID_HrP_6SERIES_WIFI,
/* Cyclone Peak */
PCI_DEVICE_ID_CyP_6SERIES_WIFI,
/* Typhoon Peak */
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 68aaa7f..36c5dc6 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -3950,19 +3950,11 @@
#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_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_HrP_9560_SERIES_1_WIFI 0x34f0
-#define PCI_DEVICE_ID_HrP_9560_SERIES_2_WIFI 0xa0f0
-#define PCI_DEVICE_ID_HrP_9560_SERIES_3_WIFI 0x02f0
-#define PCI_DEVICE_ID_HrP_9560_SERIES_4_WIFI 0x06f0
#define PCI_DEVICE_ID_CyP_6SERIES_WIFI 0x2723
-#define PCI_DEVICE_ID_HrP_6SERIES_WIFI 0x2720
#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
To view, visit change 46866. To unsubscribe, or for help writing mail filters, visit settings.