17 files changed, 100 insertions, 2 deletions

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 81654bc332..304603188c 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2720,6 +2720,11 @@
 #define PCI_DEVICE_ID_INTEL_ICL_BASE_U_LPC		0x3484
 #define PCI_DEVICE_ID_INTEL_ICL_Y_PREMIUM_LPC	0x3487
 #define PCI_DEVICE_ID_INTEL_ICL_SUPER_Y_LPC	0x3486
+#define PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC	0x0281
+#define PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC	0x0283
+#define PCI_DEVICE_ID_INTEL_CMP_PREMIUM_U_LPC	0x0284
+#define PCI_DEVICE_ID_INTEL_CMP_BASE_U_LPC	0x0285
+#define PCI_DEVICE_ID_INTEL_CMP_SUPER_Y_LPC	0x0286
 
 /* Intel PCIE device ids  */
 #define PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP1		0x9d10
@@ -2839,6 +2844,23 @@
 #define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP23		0xa32e
 #define PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP24		0xa32f
 
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP1		0x02b8
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP2		0x02b9
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP3		0x02ba
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP4		0x02bb
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP5		0x02bc
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP6		0x02bd
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP7		0x02be
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP8		0x02bf
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP9		0x02b0
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP10		0x02b1
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP11		0x02b2
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP12		0x02b3
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP13		0x02b4
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP14		0x02b5
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP15		0x02b6
+#define PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP16		0x02b7
+
 /* Intel SATA device Ids */
 #define PCI_DEVICE_ID_INTEL_SPT_U_SATA		0x9d03
 #define PCI_DEVICE_ID_INTEL_SPT_U_Y_PREMIUM_SATA		0x9d07
@@ -2847,10 +2869,13 @@
 #define PCI_DEVICE_ID_INTEL_GLK_SATA		0x31e3
 #define PCI_DEVICE_ID_INTEL_CNL_SATA		0x9dd5
 #define PCI_DEVICE_ID_INTEL_CNL_PREMIUM_SATA	0x9dd7
-#define PCI_DEVICE_ID_INTEL_CNL_COMPAT_SATA	0x282a
+#define PCI_DEVICE_ID_INTEL_CNP_CMP_COMPAT_SATA	0x282a
 #define PCI_DEVICE_ID_INTEL_CNP_H_SATA		0xa352
 #define PCI_DEVICE_ID_INTEL_CNP_LP_SATA		0x9dd3
 #define PCI_DEVICE_ID_INTEL_ICP_U_SATA		0x34d3
+#define PCI_DEVICE_ID_INTEL_CMP_SATA		0x02d5
+#define PCI_DEVICE_ID_INTEL_CMP_PREMIUM_SATA	0x02d7
+#define PCI_DEVICE_ID_INTEL_CMP_LP_SATA		0x02d3
 
 /* Intel PMC device Ids */
 #define PCI_DEVICE_ID_INTEL_SPT_LP_PMC		0x9d21
@@ -2861,6 +2886,7 @@
 #define PCI_DEVICE_ID_INTEL_CNL_PMC		0x9da1
 #define PCI_DEVICE_ID_INTEL_CNP_H_PMC		0xa321
 #define PCI_DEVICE_ID_INTEL_ICP_PMC		0x34a1
+#define PCI_DEVICE_ID_INTEL_CMP_PMC		0x02a1
 
 /* Intel I2C device Ids */
 #define PCI_DEVICE_ID_INTEL_SPT_I2C0		0x9d60
@@ -2905,6 +2931,12 @@
 #define PCI_DEVICE_ID_INTEL_ICP_I2C3		0x34eb
 #define PCI_DEVICE_ID_INTEL_ICP_I2C4		0x34c5
 #define PCI_DEVICE_ID_INTEL_ICP_I2C5		0x34c6
+#define PCI_DEVICE_ID_INTEL_CMP_I2C0		0x02e8
+#define PCI_DEVICE_ID_INTEL_CMP_I2C1		0x02e9
+#define PCI_DEVICE_ID_INTEL_CMP_I2C2		0x02ea
+#define PCI_DEVICE_ID_INTEL_CMP_I2C3		0x02eb
+#define PCI_DEVICE_ID_INTEL_CMP_I2C4		0x02c5
+#define PCI_DEVICE_ID_INTEL_CMP_I2C5		0x02c6
 
 /* Intel UART device Ids */
 #define PCI_DEVICE_ID_INTEL_SPT_UART0		0x9d27
@@ -2933,6 +2965,9 @@
 #define PCI_DEVICE_ID_INTEL_ICP_UART0		0x34a8
 #define PCI_DEVICE_ID_INTEL_ICP_UART1		0x34a9
 #define PCI_DEVICE_ID_INTEL_ICP_UART2		0x34c7
+#define PCI_DEVICE_ID_INTEL_CMP_UART0		0x02a8
+#define PCI_DEVICE_ID_INTEL_CMP_UART1		0x02a9
+#define PCI_DEVICE_ID_INTEL_CMP_UART2		0x02c7
 
 /* Intel SPI device Ids */
 #define PCI_DEVICE_ID_INTEL_SPT_SPI1		0x9d24
@@ -2953,6 +2988,10 @@
 #define PCI_DEVICE_ID_INTEL_ICP_SPI1		0x34ab
 #define PCI_DEVICE_ID_INTEL_ICP_SPI2		0x34fb
 #define PCI_DEVICE_ID_INTEL_ICP_HWSEQ_SPI	0x34a4
+#define PCI_DEVICE_ID_INTEL_CMP_SPI0		0x02aa
+#define PCI_DEVICE_ID_INTEL_CMP_SPI1		0x02ab
+#define PCI_DEVICE_ID_INTEL_CMP_SPI2		0x02fb
+#define PCI_DEVICE_ID_INTEL_CMP_HWSEQ_SPI	0x02a4
 
 /* Intel IGD device Ids */
 #define PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM		0x1906
@@ -3060,6 +3099,7 @@
 #define PCI_DEVICE_ID_INTEL_CNL_SMBUS			0x9da3
 #define PCI_DEVICE_ID_INTEL_CNP_H_SMBUS			0xa323
 #define PCI_DEVICE_ID_INTEL_ICP_LP_SMBUS		0x34a3
+#define PCI_DEVICE_ID_INTEL_CMP_SMBUS			0x02a3
 
 /* Intel XHCI device Ids */
 #define PCI_DEVICE_ID_INTEL_APL_XHCI		0x5aa8
@@ -3070,6 +3110,7 @@
 #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
+#define PCI_DEVICE_ID_INTEL_CMP_LP_XHCI		0x02ed
 
 /* Intel P2SB device Ids */
 #define PCI_DEVICE_ID_INTEL_APL_P2SB		0x5a92
@@ -3077,6 +3118,7 @@
 #define PCI_DEVICE_ID_INTEL_CNL_P2SB		0x9da0
 #define PCI_DEVICE_ID_INTEL_CNP_H_P2SB		0xa320
 #define PCI_DEVICE_ID_INTEL_ICL_P2SB		0x34a0
+#define PCI_DEVICE_ID_INTEL_CMP_P2SB		0x02a0
 
 /* Intel SRAM device Ids */
 #define PCI_DEVICE_ID_INTEL_APL_SRAM		0x5aec
@@ -3084,6 +3126,7 @@
 #define PCI_DEVICE_ID_INTEL_CNL_SRAM		0x9def
 #define PCI_DEVICE_ID_INTEL_CNP_H_SRAM		0xa36f
 #define PCI_DEVICE_ID_INTEL_ICL_SRAM		0x34ef
+#define PCI_DEVICE_ID_INTEL_CMP_SRAM		0x02ef
 
 /* Intel AUDIO device Ids */
 #define PCI_DEVICE_ID_INTEL_APL_AUDIO		0x5a98
@@ -3094,6 +3137,7 @@
 #define PCI_DEVICE_ID_INTEL_KBL_AUDIO		0x9d71
 #define PCI_DEVICE_ID_INTEL_CNP_H_AUDIO		0xa348
 #define PCI_DEVICE_ID_INTEL_ICL_AUDIO		0x34c8
+#define PCI_DEVICE_ID_INTEL_CMP_AUDIO		0x02c8
 
 /* Intel HECI/ME device Ids */
 #define PCI_DEVICE_ID_INTEL_APL_CSE0		0x5a9a
@@ -3102,6 +3146,7 @@
 #define PCI_DEVICE_ID_INTEL_SKL_CSE0		0x9d3a
 #define PCI_DEVICE_ID_INTEL_CNP_H_CSE0		0xa360
 #define PCI_DEVICE_ID_INTEL_ICL_CSE0		0x34e0
+#define PCI_DEVICE_ID_INTEL_CMP_CSE0		0x02e0
 
 /* Intel XDCI device Ids */
 #define PCI_DEVICE_ID_INTEL_APL_XDCI		0x5aaa
@@ -3110,6 +3155,7 @@
 #define PCI_DEVICE_ID_INTEL_CNL_LP_XDCI		0x9dee
 #define PCI_DEVICE_ID_INTEL_CNP_H_XDCI		0xa36e
 #define PCI_DEVICE_ID_INTEL_ICP_LP_XDCI		0x34ee
+#define PCI_DEVICE_ID_INTEL_CMP_LP_XDCI		0x02ee
 
 /* Intel SD device Ids */
 #define PCI_DEVICE_ID_INTEL_APL_SD		0x5aca
@@ -3118,6 +3164,7 @@
 #define PCI_DEVICE_ID_INTEL_CNL_SD		0x9df5
 #define PCI_DEVICE_ID_INTEL_CNP_H_SD		0xa375
 #define PCI_DEVICE_ID_INTEL_ICL_SD		0x34f8
+#define PCI_DEVICE_ID_INTEL_CMP_SD		0x02f5
 
 /* Intel EMMC device Ids */
 #define PCI_DEVICE_ID_INTEL_SKL_EMMC		0x9d2b
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index faa4924890..1c239ab8ef 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -75,6 +75,11 @@ static struct {
 	{ PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC, "Cannonlake-Y Premium" },
 	{ PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370, "Cannonlake-H Q370" },
 	{ PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370, "Cannonlake-H QM370" },
+	{ PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC, "Cometlake-U Super" },
+	{ PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC, "Cometlake-Y Premium" },
+	{ PCI_DEVICE_ID_INTEL_CMP_PREMIUM_U_LPC, "Cometlake-U Premium" },
+	{ PCI_DEVICE_ID_INTEL_CMP_BASE_U_LPC, "Cometlake-U Base" },
+	{ PCI_DEVICE_ID_INTEL_CMP_SUPER_Y_LPC, "Cometlake-Y Super" },
 };
 
 static struct {
diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 9c35342abb..1d48b82293 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -520,6 +520,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_SKL_CSE0,
 	PCI_DEVICE_ID_INTEL_CNP_H_CSE0,
 	PCI_DEVICE_ID_INTEL_ICL_CSE0,
+	PCI_DEVICE_ID_INTEL_CMP_CSE0,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c
index 4de31372c3..da0ad53374 100644
--- a/src/soc/intel/common/block/hda/hda.c
+++ b/src/soc/intel/common/block/hda/hda.c
@@ -78,6 +78,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNL_AUDIO,
 	PCI_DEVICE_ID_INTEL_CNP_H_AUDIO,
 	PCI_DEVICE_ID_INTEL_ICL_AUDIO,
+	PCI_DEVICE_ID_INTEL_CMP_AUDIO,
 	0
 };
 
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index b7f240ee28..70a4406095 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -223,6 +223,12 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_ICP_I2C3,
 	PCI_DEVICE_ID_INTEL_ICP_I2C4,
 	PCI_DEVICE_ID_INTEL_ICP_I2C5,
+	PCI_DEVICE_ID_INTEL_CMP_I2C0,
+	PCI_DEVICE_ID_INTEL_CMP_I2C1,
+	PCI_DEVICE_ID_INTEL_CMP_I2C2,
+	PCI_DEVICE_ID_INTEL_CMP_I2C3,
+	PCI_DEVICE_ID_INTEL_CMP_I2C4,
+	PCI_DEVICE_ID_INTEL_CMP_I2C5,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index ad004efec3..1a38a6c9df 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -156,6 +156,11 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_LPC_REV0,
 	PCI_DEVICE_ID_INTEL_ICL_SUPER_Y_LPC,
 	PCI_DEVICE_ID_INTEL_ICL_Y_PREMIUM_LPC,
+	PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC,
+	PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC,
+	PCI_DEVICE_ID_INTEL_CMP_PREMIUM_U_LPC,
+	PCI_DEVICE_ID_INTEL_CMP_BASE_U_LPC,
+	PCI_DEVICE_ID_INTEL_CMP_SUPER_Y_LPC,
 	0
 };
 
diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c
index f9930c1b37..24f3a69d0e 100644
--- a/src/soc/intel/common/block/p2sb/p2sb.c
+++ b/src/soc/intel/common/block/p2sb/p2sb.c
@@ -167,6 +167,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNL_P2SB,
 	PCI_DEVICE_ID_INTEL_CNP_H_P2SB,
 	PCI_DEVICE_ID_INTEL_ICL_P2SB,
+	PCI_DEVICE_ID_INTEL_CMP_P2SB,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index 3ebb4f6447..c191ad06cd 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -206,6 +206,22 @@ static const unsigned short pcie_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP14,
 	PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP15,
 	PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP16,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP1,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP2,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP3,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP4,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP5,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP6,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP7,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP8,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP9,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP10,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP11,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP12,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP13,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP14,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP15,
+	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP16,
 	0
 };
 
diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c
index 9f1b94f904..7f6d2497b3 100644
--- a/src/soc/intel/common/block/pmc/pmc.c
+++ b/src/soc/intel/common/block/pmc/pmc.c
@@ -128,6 +128,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_GLK_PMC,
 	PCI_DEVICE_ID_INTEL_CNP_H_PMC,
 	PCI_DEVICE_ID_INTEL_ICP_PMC,
+	PCI_DEVICE_ID_INTEL_CMP_PMC,
 	0
 };
 
diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c
index 936fc9b67a..a39ef52a4f 100644
--- a/src/soc/intel/common/block/sata/sata.c
+++ b/src/soc/intel/common/block/sata/sata.c
@@ -75,10 +75,13 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_SPT_KBL_SATA,
 	PCI_DEVICE_ID_INTEL_CNL_SATA,
 	PCI_DEVICE_ID_INTEL_CNL_PREMIUM_SATA,
-	PCI_DEVICE_ID_INTEL_CNL_COMPAT_SATA,
+	PCI_DEVICE_ID_INTEL_CNP_CMP_COMPAT_SATA,
 	PCI_DEVICE_ID_INTEL_CNP_H_SATA,
 	PCI_DEVICE_ID_INTEL_CNP_LP_SATA,
 	PCI_DEVICE_ID_INTEL_ICP_U_SATA,
+	PCI_DEVICE_ID_INTEL_CMP_SATA,
+	PCI_DEVICE_ID_INTEL_CMP_PREMIUM_SATA,
+	PCI_DEVICE_ID_INTEL_CMP_LP_SATA,
 	0
 };
 
diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c
index c8dc7d12b4..ea8d1b02bc 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -72,6 +72,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_SKL_SD,
 	PCI_DEVICE_ID_INTEL_CNP_H_SD,
 	PCI_DEVICE_ID_INTEL_ICL_SD,
+	PCI_DEVICE_ID_INTEL_CMP_SD,
 	0
 };
 
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c
index 228713876b..31bcc97478 100644
--- a/src/soc/intel/common/block/smbus/smbus.c
+++ b/src/soc/intel/common/block/smbus/smbus.c
@@ -93,6 +93,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_SPT_H_SMBUS,
 	PCI_DEVICE_ID_INTEL_KBP_H_SMBUS,
 	PCI_DEVICE_ID_INTEL_ICP_LP_SMBUS,
+	PCI_DEVICE_ID_INTEL_CMP_SMBUS,
 	0
 };
 
diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c
index 69449e79d5..c02cfed6a9 100644
--- a/src/soc/intel/common/block/spi/spi.c
+++ b/src/soc/intel/common/block/spi/spi.c
@@ -71,6 +71,10 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_ICP_SPI1,
 	PCI_DEVICE_ID_INTEL_ICP_SPI2,
 	PCI_DEVICE_ID_INTEL_ICP_HWSEQ_SPI,
+	PCI_DEVICE_ID_INTEL_CMP_SPI0,
+	PCI_DEVICE_ID_INTEL_CMP_SPI1,
+	PCI_DEVICE_ID_INTEL_CMP_SPI2,
+	PCI_DEVICE_ID_INTEL_CMP_HWSEQ_SPI,
 	0
 };
 
diff --git a/src/soc/intel/common/block/sram/sram.c b/src/soc/intel/common/block/sram/sram.c
index 507ff58dbb..720b736904 100644
--- a/src/soc/intel/common/block/sram/sram.c
+++ b/src/soc/intel/common/block/sram/sram.c
@@ -50,6 +50,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_APL_SRAM,
 	PCI_DEVICE_ID_INTEL_GLK_SRAM,
 	PCI_DEVICE_ID_INTEL_ICL_SRAM,
+	PCI_DEVICE_ID_INTEL_CMP_SRAM,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 57d9ebedd6..7f105d7e17 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -268,6 +268,9 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_ICP_UART0,
 	PCI_DEVICE_ID_INTEL_ICP_UART1,
 	PCI_DEVICE_ID_INTEL_ICP_UART2,
+	PCI_DEVICE_ID_INTEL_CMP_UART0,
+	PCI_DEVICE_ID_INTEL_CMP_UART1,
+	PCI_DEVICE_ID_INTEL_CMP_UART2,
 	0,
 };
 
diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c
index 0ee63657e4..9eb6e1d25f 100644
--- a/src/soc/intel/common/block/xdci/xdci.c
+++ b/src/soc/intel/common/block/xdci/xdci.c
@@ -43,6 +43,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_SPT_LP_XDCI,
 	PCI_DEVICE_ID_INTEL_CNP_H_XDCI,
 	PCI_DEVICE_ID_INTEL_ICP_LP_XDCI,
+	PCI_DEVICE_ID_INTEL_CMP_LP_XDCI,
 	0
 };
 
diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c
index ab87f365da..95360ce3c6 100644
--- a/src/soc/intel/common/block/xhci/xhci.c
+++ b/src/soc/intel/common/block/xhci/xhci.c
@@ -44,6 +44,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_KBP_H_XHCI,
 	PCI_DEVICE_ID_INTEL_CNP_H_XHCI,
 	PCI_DEVICE_ID_INTEL_ICP_LP_XHCI,
+	PCI_DEVICE_ID_INTEL_CMP_LP_XHCI,
 	0
 };