soc/intel: Rename 200-series PCH device IDs
The code name for these PCHs is Union Point, abbreviated as `UPT`. There
are some 300-series Union Point PCHs (H310C, B365, Z370) which are meant
to be paired with Coffee Lake CPUs instead of Skylake or Kaby Lake CPUs,
and referring to them as `KBP` (Kaby Point, I guess) would be confusing.
Tested with BUILD_TIMELESS=1, HP 280 G2 remains identical.
Change-Id: I1a49115ae7ac37e76ce8d440910fb59926f34fac
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52700
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Timofey Komarov <happycorsair@yandex.ru>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 520d403..c6e456b 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2851,17 +2851,17 @@
#define PCI_DEVICE_ID_INTEL_LWB_C627A_SUPER 0xa24b
#define PCI_DEVICE_ID_INTEL_LWB_C629A_SUPER 0xa24c
#define PCI_DEVICE_ID_INTEL_EMB_SUPER 0x1b81
-#define PCI_DEVICE_ID_INTEL_KBP_H_H270 0xa2c4
-#define PCI_DEVICE_ID_INTEL_KBP_H_Z270 0xa2c5
-#define PCI_DEVICE_ID_INTEL_KBP_H_Q270 0xa2c6
-#define PCI_DEVICE_ID_INTEL_KBP_H_Q250 0xa2c7
-#define PCI_DEVICE_ID_INTEL_KBP_H_B250 0xa2c8
+#define PCI_DEVICE_ID_INTEL_UPT_H_H270 0xa2c4
+#define PCI_DEVICE_ID_INTEL_UPT_H_Z270 0xa2c5
+#define PCI_DEVICE_ID_INTEL_UPT_H_Q270 0xa2c6
+#define PCI_DEVICE_ID_INTEL_UPT_H_Q250 0xa2c7
+#define PCI_DEVICE_ID_INTEL_UPT_H_B250 0xa2c8
#define PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22 0x9d4b
#define PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22 0x9d4e
#define PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE_HDCP22 0x9d50
-#define PCI_DEVICE_ID_INTEL_KBP_LP_SUPER_SKU 0x9d51
-#define PCI_DEVICE_ID_INTEL_KBP_LP_U_PREMIUM 0x9d58
-#define PCI_DEVICE_ID_INTEL_KBP_LP_Y_PREMIUM 0x9d56
+#define PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU 0x9d51
+#define PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM 0x9d58
+#define PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM 0x9d56
#define PCI_DEVICE_ID_INTEL_APL_LPC 0x5ae8
#define PCI_DEVICE_ID_INTEL_GLK_LPC 0x31e8
#define PCI_DEVICE_ID_INTEL_GLK_ESPI 0x3197
@@ -3132,30 +3132,30 @@
#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19_SUPER 0xa269
#define PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20_SUPER 0xa26a
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP1 0xa290
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP2 0xa291
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP3 0xa292
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP4 0xa293
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP5 0xa294
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP6 0xa295
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP7 0xa296
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP8 0xa297
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP9 0xa298
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP10 0xa299
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP11 0xa29a
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP12 0xa29b
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP13 0xa29c
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP14 0xa29d
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP15 0xa29e
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP16 0xa29f
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP17 0xa2e7
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP18 0xa2e8
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP19 0xa2e9
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP20 0xa2ea
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP21 0xa2eb
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP22 0xa2ec
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP23 0xa2ed
-#define PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP24 0xa2ee
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP1 0xa290
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP2 0xa291
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP3 0xa292
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP4 0xa293
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP5 0xa294
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP6 0xa295
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP7 0xa296
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP8 0xa297
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP9 0xa298
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP10 0xa299
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP11 0xa29a
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP12 0xa29b
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP13 0xa29c
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP14 0xa29d
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP15 0xa29e
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP16 0xa29f
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP17 0xa2e7
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP18 0xa2e8
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP19 0xa2e9
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP20 0xa2ea
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP21 0xa2eb
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP22 0xa2ec
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP23 0xa2ed
+#define PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP24 0xa2ee
#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP1 0x9db8
#define PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP2 0x9db9
@@ -3421,7 +3421,7 @@
#define PCI_DEVICE_ID_INTEL_SPT_H_PMC 0xa121
#define PCI_DEVICE_ID_INTEL_LWB_PMC 0xa1a1
#define PCI_DEVICE_ID_INTEL_LWB_PMC_SUPER 0xa221
-#define PCI_DEVICE_ID_INTEL_KBP_H_PMC 0xa2a1
+#define PCI_DEVICE_ID_INTEL_UPT_H_PMC 0xa2a1
#define PCI_DEVICE_ID_INTEL_APL_PMC 0x5a94
#define PCI_DEVICE_ID_INTEL_GLK_PMC 0x3194
#define PCI_DEVICE_ID_INTEL_CNL_PMC 0x9da1
@@ -3445,10 +3445,10 @@
#define PCI_DEVICE_ID_INTEL_SPT_I2C3 0x9d63
#define PCI_DEVICE_ID_INTEL_SPT_I2C4 0x9d64
#define PCI_DEVICE_ID_INTEL_SPT_I2C5 0x9d65
-#define PCI_DEVICE_ID_INTEL_KBP_H_I2C0 0xa2e0
-#define PCI_DEVICE_ID_INTEL_KBP_H_I2C1 0xa2e1
-#define PCI_DEVICE_ID_INTEL_KBP_H_I2C2 0xa2e2
-#define PCI_DEVICE_ID_INTEL_KBP_H_I2C3 0xa2e3
+#define PCI_DEVICE_ID_INTEL_UPT_H_I2C0 0xa2e0
+#define PCI_DEVICE_ID_INTEL_UPT_H_I2C1 0xa2e1
+#define PCI_DEVICE_ID_INTEL_UPT_H_I2C2 0xa2e2
+#define PCI_DEVICE_ID_INTEL_UPT_H_I2C3 0xa2e3
#define PCI_DEVICE_ID_INTEL_APL_I2C0 0x5aac
#define PCI_DEVICE_ID_INTEL_APL_I2C1 0x5aae
#define PCI_DEVICE_ID_INTEL_APL_I2C2 0x5ab0
@@ -3545,9 +3545,9 @@
#define PCI_DEVICE_ID_INTEL_SPT_H_UART0 0xa127
#define PCI_DEVICE_ID_INTEL_SPT_H_UART1 0xa128
#define PCI_DEVICE_ID_INTEL_SPT_H_UART2 0xa166
-#define PCI_DEVICE_ID_INTEL_KBP_H_UART0 0xa2a7
-#define PCI_DEVICE_ID_INTEL_KBP_H_UART1 0xa2a8
-#define PCI_DEVICE_ID_INTEL_KBP_H_UART2 0xa2e6
+#define PCI_DEVICE_ID_INTEL_UPT_H_UART0 0xa2a7
+#define PCI_DEVICE_ID_INTEL_UPT_H_UART1 0xa2a8
+#define PCI_DEVICE_ID_INTEL_UPT_H_UART2 0xa2e6
#define PCI_DEVICE_ID_INTEL_APL_UART0 0x5abc
#define PCI_DEVICE_ID_INTEL_APL_UART1 0x5abe
#define PCI_DEVICE_ID_INTEL_APL_UART2 0x5ac0
@@ -3948,7 +3948,7 @@
#define PCI_DEVICE_ID_INTEL_SPT_H_XHCI 0xa12f
#define PCI_DEVICE_ID_INTEL_LWB_XHCI 0xa1af
#define PCI_DEVICE_ID_INTEL_LWB_XHCI_SUPER 0xa22f
-#define PCI_DEVICE_ID_INTEL_KBP_H_XHCI 0xa2af
+#define PCI_DEVICE_ID_INTEL_UPT_H_XHCI 0xa2af
#define PCI_DEVICE_ID_INTEL_CNL_LP_XHCI 0x9ded
#define PCI_DEVICE_ID_INTEL_CNP_H_XHCI 0xa36d
#define PCI_DEVICE_ID_INTEL_ICP_LP_XHCI 0x34ed
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index b466de2..a82b1eb 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -176,10 +176,10 @@
PCI_DEVICE_ID_INTEL_SPT_I2C3,
PCI_DEVICE_ID_INTEL_SPT_I2C4,
PCI_DEVICE_ID_INTEL_SPT_I2C5,
- PCI_DEVICE_ID_INTEL_KBP_H_I2C0,
- PCI_DEVICE_ID_INTEL_KBP_H_I2C1,
- PCI_DEVICE_ID_INTEL_KBP_H_I2C2,
- PCI_DEVICE_ID_INTEL_KBP_H_I2C3,
+ PCI_DEVICE_ID_INTEL_UPT_H_I2C0,
+ PCI_DEVICE_ID_INTEL_UPT_H_I2C1,
+ PCI_DEVICE_ID_INTEL_UPT_H_I2C2,
+ PCI_DEVICE_ID_INTEL_UPT_H_I2C3,
PCI_DEVICE_ID_INTEL_APL_I2C0,
PCI_DEVICE_ID_INTEL_APL_I2C1,
PCI_DEVICE_ID_INTEL_APL_I2C2,
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index e22518c..2164fb1 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -144,17 +144,17 @@
PCI_DEVICE_ID_INTEL_LWB_C627A_SUPER,
PCI_DEVICE_ID_INTEL_LWB_C629A_SUPER,
PCI_DEVICE_ID_INTEL_EMB_SUPER,
- PCI_DEVICE_ID_INTEL_KBP_H_Q270,
- PCI_DEVICE_ID_INTEL_KBP_H_H270,
- PCI_DEVICE_ID_INTEL_KBP_H_Z270,
- PCI_DEVICE_ID_INTEL_KBP_H_Q250,
- PCI_DEVICE_ID_INTEL_KBP_H_B250,
+ PCI_DEVICE_ID_INTEL_UPT_H_Q270,
+ PCI_DEVICE_ID_INTEL_UPT_H_H270,
+ PCI_DEVICE_ID_INTEL_UPT_H_Z270,
+ PCI_DEVICE_ID_INTEL_UPT_H_Q250,
+ PCI_DEVICE_ID_INTEL_UPT_H_B250,
PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22,
PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22,
PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE_HDCP22,
- PCI_DEVICE_ID_INTEL_KBP_LP_SUPER_SKU,
- PCI_DEVICE_ID_INTEL_KBP_LP_U_PREMIUM,
- PCI_DEVICE_ID_INTEL_KBP_LP_Y_PREMIUM,
+ PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU,
+ PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM,
+ PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM,
PCI_DEVICE_ID_INTEL_APL_LPC,
PCI_DEVICE_ID_INTEL_GLK_LPC,
PCI_DEVICE_ID_INTEL_GLK_ESPI,
diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index f7f0902..5527811 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -138,30 +138,30 @@
PCI_DEVICE_ID_INTEL_LWB_PCIE_RP18_SUPER,
PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19_SUPER,
PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20_SUPER,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP1,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP2,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP3,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP4,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP5,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP6,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP7,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP8,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP9,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP10,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP11,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP12,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP13,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP14,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP15,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP16,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP17,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP18,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP19,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP20,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP21,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP22,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP23,
- PCI_DEVICE_ID_INTEL_KBP_H_PCIE_RP24,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP1,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP2,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP3,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP4,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP5,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP6,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP7,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP8,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP9,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP10,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP11,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP12,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP13,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP14,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP15,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP16,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP17,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP18,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP19,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP20,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP21,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP22,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP23,
+ PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP24,
PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP1,
PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP2,
PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP3,
diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c
index 93cbe36..0ff71b9 100644
--- a/src/soc/intel/common/block/pmc/pmc.c
+++ b/src/soc/intel/common/block/pmc/pmc.c
@@ -87,7 +87,7 @@
PCI_DEVICE_ID_INTEL_SPT_H_PMC,
PCI_DEVICE_ID_INTEL_LWB_PMC,
PCI_DEVICE_ID_INTEL_LWB_PMC_SUPER,
- PCI_DEVICE_ID_INTEL_KBP_H_PMC,
+ PCI_DEVICE_ID_INTEL_UPT_H_PMC,
PCI_DEVICE_ID_INTEL_APL_PMC,
PCI_DEVICE_ID_INTEL_GLK_PMC,
PCI_DEVICE_ID_INTEL_CNP_H_PMC,
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 9b34031..c3691ff 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -355,9 +355,9 @@
PCI_DEVICE_ID_INTEL_SPT_H_UART0,
PCI_DEVICE_ID_INTEL_SPT_H_UART1,
PCI_DEVICE_ID_INTEL_SPT_H_UART2,
- PCI_DEVICE_ID_INTEL_KBP_H_UART0,
- PCI_DEVICE_ID_INTEL_KBP_H_UART1,
- PCI_DEVICE_ID_INTEL_KBP_H_UART2,
+ PCI_DEVICE_ID_INTEL_UPT_H_UART0,
+ PCI_DEVICE_ID_INTEL_UPT_H_UART1,
+ PCI_DEVICE_ID_INTEL_UPT_H_UART2,
PCI_DEVICE_ID_INTEL_APL_UART0,
PCI_DEVICE_ID_INTEL_APL_UART1,
PCI_DEVICE_ID_INTEL_APL_UART2,
diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c
index 295bb39..b9840f5 100644
--- a/src/soc/intel/common/block/xhci/xhci.c
+++ b/src/soc/intel/common/block/xhci/xhci.c
@@ -113,7 +113,7 @@
PCI_DEVICE_ID_INTEL_SPT_H_XHCI,
PCI_DEVICE_ID_INTEL_LWB_XHCI,
PCI_DEVICE_ID_INTEL_LWB_XHCI_SUPER,
- PCI_DEVICE_ID_INTEL_KBP_H_XHCI,
+ PCI_DEVICE_ID_INTEL_UPT_H_XHCI,
PCI_DEVICE_ID_INTEL_CNP_H_XHCI,
PCI_DEVICE_ID_INTEL_ICP_LP_XHCI,
PCI_DEVICE_ID_INTEL_CMP_LP_XHCI,
diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index 7e3120e..b6417c7 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -73,14 +73,14 @@
{ PCI_DEVICE_ID_INTEL_SPT_H_HM175, "Skylake PCH-H HM175" },
{ PCI_DEVICE_ID_INTEL_SPT_H_QM175, "Skylake PCH-H QM175" },
{ PCI_DEVICE_ID_INTEL_SPT_H_CM238, "Skylake PCH-H CM238" },
- { PCI_DEVICE_ID_INTEL_KBP_H_Q270, "Kabylake-H Q270" },
- { PCI_DEVICE_ID_INTEL_KBP_H_H270, "Kabylake-H H270" },
- { PCI_DEVICE_ID_INTEL_KBP_H_Z270, "Kabylake-H Z270" },
- { PCI_DEVICE_ID_INTEL_KBP_H_B250, "Kabylake-H B250" },
- { PCI_DEVICE_ID_INTEL_KBP_H_Q250, "Kabylake-H Q250" },
- { PCI_DEVICE_ID_INTEL_KBP_LP_U_PREMIUM, "Kabylake-U Premium" },
- { PCI_DEVICE_ID_INTEL_KBP_LP_Y_PREMIUM, "Kabylake-Y Premium" },
- { PCI_DEVICE_ID_INTEL_KBP_LP_SUPER_SKU, "Kabylake Super Sku" },
+ { PCI_DEVICE_ID_INTEL_UPT_H_Q270, "Kabylake-H Q270" },
+ { PCI_DEVICE_ID_INTEL_UPT_H_H270, "Kabylake-H H270" },
+ { PCI_DEVICE_ID_INTEL_UPT_H_Z270, "Kabylake-H Z270" },
+ { PCI_DEVICE_ID_INTEL_UPT_H_B250, "Kabylake-H B250" },
+ { PCI_DEVICE_ID_INTEL_UPT_H_Q250, "Kabylake-H Q250" },
+ { PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM, "Kabylake-U Premium" },
+ { PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM, "Kabylake-Y Premium" },
+ { PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU, "Kabylake Super Sku" },
{ PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22,
"Kabylake-Y iHDCP 2.2 Premium" },
{ PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22,