16 files changed, 52 insertions, 1 deletions

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
 };