summaryrefslogtreecommitdiff
path: root/lib/intel_chipset.h
diff options
context:
space:
mode:
authorWayne Boyer <wayne.boyer@intel.com>2015-11-13 13:40:23 -0800
committerThomas Wood <thomas.wood@intel.com>2015-11-24 16:36:54 +0000
commit526a63ec6bfa4dfedb9ae27284b604ec37132a16 (patch)
tree7dc11188a426f8015115a32b4eb26f9c9b61f9e5 /lib/intel_chipset.h
parentb088e305750c9df7b5d3a16f01fd2a7dba22177f (diff)
lib/kbl: move KBL check from IS_SKYLAKE() to IS_GEN9()
Remove the KBL check from IS_SKYLAKE() following the kernel definition. Then, add the KBL check to IS_GEN9(). The idea is to avoid confusion. On the kernel side, the mix of SKY and KBL was nacked so the platforms are split. Signed-off-by: Wayne Boyer <wayne.boyer@intel.com> Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'lib/intel_chipset.h')
-rw-r--r--lib/intel_chipset.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
index 93bf5657..f71bc8e5 100644
--- a/lib/intel_chipset.h
+++ b/lib/intel_chipset.h
@@ -443,8 +443,7 @@ void intel_check_pch(void);
IS_KBL_GT2(devid) || \
IS_KBL_GT3(devid))
-#define IS_SKYLAKE(devid) (IS_KABYLAKE(devid) || \
- IS_SKL_GT1(devid) || \
+#define IS_SKYLAKE(devid) (IS_SKL_GT1(devid) || \
IS_SKL_GT2(devid) || \
IS_SKL_GT3(devid) || \
IS_SKL_GT4(devid))
@@ -453,7 +452,9 @@ void intel_check_pch(void);
(devid) == PCI_CHIP_BROXTON_1 || \
(devid) == PCI_CHIP_BROXTON_2)
-#define IS_GEN9(devid) (IS_SKYLAKE(devid) || IS_BROXTON(devid))
+#define IS_GEN9(devid) (IS_KABYLAKE(devid) || \
+ IS_SKYLAKE(devid) || \
+ IS_BROXTON(devid))
#define IS_965(devid) (IS_GEN4(devid) || \
IS_GEN5(devid) || \