intel: Removing PCI IDs that are no longer listed as Kabylake.

This is unusual. Usually IDs listed on early stages of platform
definition are kept there as reserved for later use.

However these IDs here are not listed anymore in any of steppings
and devices IDs tables for Kabylake on configurations overview
section of BSpec.

So it is better removing them before they become used in any
other future platform.

v2: Rebase.

Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 6b8d4e9..514f659 100644 (file)
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -204,18 +204,13 @@
 #define PCI_CHIP_KABYLAKE_DT_GT2       0x5912
 #define PCI_CHIP_KABYLAKE_DT_GT1_5     0x5917
 #define PCI_CHIP_KABYLAKE_DT_GT1       0x5902
-#define PCI_CHIP_KABYLAKE_DT_GT4       0x5932
 #define PCI_CHIP_KABYLAKE_HALO_GT2     0x591B
 #define PCI_CHIP_KABYLAKE_HALO_GT4     0x593B
-#define PCI_CHIP_KABYLAKE_HALO_GT3     0x592B
 #define PCI_CHIP_KABYLAKE_HALO_GT1_0   0x5908
 #define PCI_CHIP_KABYLAKE_HALO_GT1_1   0x590B
 #define PCI_CHIP_KABYLAKE_SRV_GT2      0x591A
-#define PCI_CHIP_KABYLAKE_SRV_GT3      0x592A
 #define PCI_CHIP_KABYLAKE_SRV_GT1      0x590A
-#define PCI_CHIP_KABYLAKE_SRV_GT4      0x593A
 #define PCI_CHIP_KABYLAKE_WKS_GT2      0x591D
-#define PCI_CHIP_KABYLAKE_WKS_GT4      0x593D
 
 #define PCI_CHIP_BROXTON_0             0x0A84
 #define PCI_CHIP_BROXTON_1             0x1A84
@@ -431,14 +426,9 @@
 
 #define IS_KBL_GT3(devid)      ((devid) == PCI_CHIP_KABYLAKE_ULT_GT3_0 || \
                                 (devid) == PCI_CHIP_KABYLAKE_ULT_GT3_1 || \
-                                (devid) == PCI_CHIP_KABYLAKE_ULT_GT3_2 || \
-                                (devid) == PCI_CHIP_KABYLAKE_HALO_GT3  || \
-                                (devid) == PCI_CHIP_KABYLAKE_SRV_GT3)
-
-#define IS_KBL_GT4(devid)      ((devid) == PCI_CHIP_KABYLAKE_DT_GT4    || \
-                                (devid) == PCI_CHIP_KABYLAKE_HALO_GT4  || \
-                                (devid) == PCI_CHIP_KABYLAKE_SRV_GT4   || \
-                                (devid) == PCI_CHIP_KABYLAKE_WKS_GT4)
+                                (devid) == PCI_CHIP_KABYLAKE_ULT_GT3_2)
+
+#define IS_KBL_GT4(devid)      ((devid) == PCI_CHIP_KABYLAKE_HALO_GT4)
 
 #define IS_KABYLAKE(devid)     (IS_KBL_GT1(devid) || \
                                 IS_KBL_GT2(devid) || \