16 files changed, 52 insertions, 0 deletions

diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 6aaba40559..74a0020ee3 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -754,6 +754,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNP_H_CSE0,
 	PCI_DEVICE_ID_INTEL_ICL_CSE0,
 	PCI_DEVICE_ID_INTEL_CMP_CSE0,
+	PCI_DEVICE_ID_INTEL_CMP_H_CSE0,
 	PCI_DEVICE_ID_INTEL_TGL_CSE0,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_CSE0,
 	0,
diff --git a/src/soc/intel/common/block/dsp/dsp.c b/src/soc/intel/common/block/dsp/dsp.c
index 6c00ed1c77..306003b3c9 100644
--- a/src/soc/intel/common/block/dsp/dsp.c
+++ b/src/soc/intel/common/block/dsp/dsp.c
@@ -33,6 +33,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_SKL_AUDIO,
 	PCI_DEVICE_ID_INTEL_CNP_H_AUDIO,
 	PCI_DEVICE_ID_INTEL_CMP_AUDIO,
+	PCI_DEVICE_ID_INTEL_CMP_H_AUDIO,
 	PCI_DEVICE_ID_INTEL_ICL_AUDIO,
 	PCI_DEVICE_ID_INTEL_TGL_AUDIO,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_AUDIO,
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index cbe189c9d1..90931ebd4c 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -209,6 +209,10 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CML_GT1_H_2,
 	PCI_DEVICE_ID_INTEL_CML_GT2_H_1,
 	PCI_DEVICE_ID_INTEL_CML_GT2_H_2,
+	PCI_DEVICE_ID_INTEL_CML_GT2_S_G0,
+	PCI_DEVICE_ID_INTEL_CML_GT2_S_P0,
+	PCI_DEVICE_ID_INTEL_CML_GT2_H_R0,
+	PCI_DEVICE_ID_INTEL_CML_GT2_H_R1,
 	PCI_DEVICE_ID_INTEL_TGL_GT0,
 	PCI_DEVICE_ID_INTEL_TGL_GT2_ULT,
 	PCI_DEVICE_ID_INTEL_TGL_GT2_ULX,
diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c
index 4a87e1a2ef..12aa1051e6 100644
--- a/src/soc/intel/common/block/hda/hda.c
+++ b/src/soc/intel/common/block/hda/hda.c
@@ -81,6 +81,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNP_H_AUDIO,
 	PCI_DEVICE_ID_INTEL_ICL_AUDIO,
 	PCI_DEVICE_ID_INTEL_CMP_AUDIO,
+	PCI_DEVICE_ID_INTEL_CMP_H_AUDIO,
 	PCI_DEVICE_ID_INTEL_BSW_AUDIO,
 	PCI_DEVICE_ID_INTEL_TGL_AUDIO,
 	0
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index bc692d3a87..70f2c21f74 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -235,6 +235,10 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_I2C3,
 	PCI_DEVICE_ID_INTEL_CMP_I2C4,
 	PCI_DEVICE_ID_INTEL_CMP_I2C5,
+	PCI_DEVICE_ID_INTEL_CMP_H_I2C0,
+	PCI_DEVICE_ID_INTEL_CMP_H_I2C1,
+	PCI_DEVICE_ID_INTEL_CMP_H_I2C2,
+	PCI_DEVICE_ID_INTEL_CMP_H_I2C3,
 	PCI_DEVICE_ID_INTEL_TGP_I2C0,
 	PCI_DEVICE_ID_INTEL_TGP_I2C1,
 	PCI_DEVICE_ID_INTEL_TGP_I2C2,
diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c
index 75c74f298a..4bfb955143 100644
--- a/src/soc/intel/common/block/p2sb/p2sb.c
+++ b/src/soc/intel/common/block/p2sb/p2sb.c
@@ -179,6 +179,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNP_H_P2SB,
 	PCI_DEVICE_ID_INTEL_ICL_P2SB,
 	PCI_DEVICE_ID_INTEL_CMP_P2SB,
+	PCI_DEVICE_ID_INTEL_CMP_H_P2SB,
 	PCI_DEVICE_ID_INTEL_TGL_P2SB,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_P2SB,
 	0,
diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index ecc1fcbc71..ce43d3400e 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -250,6 +250,30 @@ static const unsigned short pcie_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP14,
 	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP15,
 	PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP16,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP1,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP2,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP3,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP4,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP5,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP6,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP7,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP8,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP9,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP10,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP11,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP12,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP13,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP14,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP15,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP16,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP17,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP18,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP19,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP20,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP21,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP22,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP23,
+	PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP24,
 	PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP1,
 	PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP2,
 	PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP3,
diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c
index 1645070fa7..f3a755bb95 100644
--- a/src/soc/intel/common/block/pmc/pmc.c
+++ b/src/soc/intel/common/block/pmc/pmc.c
@@ -133,6 +133,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNP_H_PMC,
 	PCI_DEVICE_ID_INTEL_ICP_PMC,
 	PCI_DEVICE_ID_INTEL_CMP_PMC,
+	PCI_DEVICE_ID_INTEL_CMP_H_PMC,
 	PCI_DEVICE_ID_INTEL_TGP_PMC,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_PMC,
 	0
diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c
index 0f26262db2..40ffb210a2 100644
--- a/src/soc/intel/common/block/sata/sata.c
+++ b/src/soc/intel/common/block/sata/sata.c
@@ -96,6 +96,9 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_SATA,
 	PCI_DEVICE_ID_INTEL_CMP_PREMIUM_SATA,
 	PCI_DEVICE_ID_INTEL_CMP_LP_SATA,
+	PCI_DEVICE_ID_INTEL_CMP_H_SATA,
+	PCI_DEVICE_ID_INTEL_CMP_H_HALO_SATA,
+	PCI_DEVICE_ID_INTEL_CMP_H_PREMIUM_SATA,
 	PCI_DEVICE_ID_INTEL_TGP_LP_SATA,
 	PCI_DEVICE_ID_INTEL_TGP_SATA,
 	PCI_DEVICE_ID_INTEL_TGP_PREMIUM_SATA,
diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c
index e94e4e97c4..e815287dd6 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -73,6 +73,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNP_H_SD,
 	PCI_DEVICE_ID_INTEL_ICL_SD,
 	PCI_DEVICE_ID_INTEL_CMP_SD,
+	PCI_DEVICE_ID_INTEL_CMP_H_SD,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SD,
 	0
 };
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c
index c9a6b170bd..6be2a5e054 100644
--- a/src/soc/intel/common/block/smbus/smbus.c
+++ b/src/soc/intel/common/block/smbus/smbus.c
@@ -95,6 +95,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_LWB_SMBUS,
 	PCI_DEVICE_ID_INTEL_ICP_LP_SMBUS,
 	PCI_DEVICE_ID_INTEL_CMP_SMBUS,
+	PCI_DEVICE_ID_INTEL_CMP_H_SMBUS,
 	PCI_DEVICE_ID_INTEL_TGP_LP_SMBUS,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SMBUS,
 	0
diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c
index eedde756f0..5ce400870d 100644
--- a/src/soc/intel/common/block/spi/spi.c
+++ b/src/soc/intel/common/block/spi/spi.c
@@ -81,6 +81,10 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_SPI1,
 	PCI_DEVICE_ID_INTEL_CMP_SPI2,
 	PCI_DEVICE_ID_INTEL_CMP_HWSEQ_SPI,
+	PCI_DEVICE_ID_INTEL_CMP_H_SPI0,
+	PCI_DEVICE_ID_INTEL_CMP_H_SPI1,
+	PCI_DEVICE_ID_INTEL_CMP_H_SPI2,
+	PCI_DEVICE_ID_INTEL_CMP_H_HWSEQ_SPI,
 	PCI_DEVICE_ID_INTEL_TGP_SPI0,
 	PCI_DEVICE_ID_INTEL_TGP_GSPI0,
 	PCI_DEVICE_ID_INTEL_TGP_GSPI1,
diff --git a/src/soc/intel/common/block/sram/sram.c b/src/soc/intel/common/block/sram/sram.c
index 9e44fa3178..a994235588 100644
--- a/src/soc/intel/common/block/sram/sram.c
+++ b/src/soc/intel/common/block/sram/sram.c
@@ -51,6 +51,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_GLK_SRAM,
 	PCI_DEVICE_ID_INTEL_ICL_SRAM,
 	PCI_DEVICE_ID_INTEL_CMP_SRAM,
+	PCI_DEVICE_ID_INTEL_CMP_H_SRAM,
 	PCI_DEVICE_ID_INTEL_TGL_SRAM,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_SRAM,
 	0,
diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 405351691d..bcb04ac85a 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -275,6 +275,9 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CMP_UART0,
 	PCI_DEVICE_ID_INTEL_CMP_UART1,
 	PCI_DEVICE_ID_INTEL_CMP_UART2,
+	PCI_DEVICE_ID_INTEL_CMP_H_UART0,
+	PCI_DEVICE_ID_INTEL_CMP_H_UART1,
+	PCI_DEVICE_ID_INTEL_CMP_H_UART2,
 	PCI_DEVICE_ID_INTEL_TGP_UART0,
 	PCI_DEVICE_ID_INTEL_TGP_UART1,
 	PCI_DEVICE_ID_INTEL_TGP_UART2,
diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c
index 92f3b15da3..2296f9f770 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_CNP_H_XDCI,
 	PCI_DEVICE_ID_INTEL_ICP_LP_XDCI,
 	PCI_DEVICE_ID_INTEL_CMP_LP_XDCI,
+	PCI_DEVICE_ID_INTEL_CMP_H_XDCI,
 	PCI_DEVICE_ID_INTEL_TGP_LP_XDCI,
 	0
 };
diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c
index af4d132194..e6a7e0db85 100644
--- a/src/soc/intel/common/block/xhci/xhci.c
+++ b/src/soc/intel/common/block/xhci/xhci.c
@@ -131,6 +131,7 @@ static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_INTEL_CNP_H_XHCI,
 	PCI_DEVICE_ID_INTEL_ICP_LP_XHCI,
 	PCI_DEVICE_ID_INTEL_CMP_LP_XHCI,
+	PCI_DEVICE_ID_INTEL_CMP_H_XHCI,
 	PCI_DEVICE_ID_INTEL_TGP_LP_XHCI,
 	PCI_DEVICE_ID_INTEL_JSP_PRE_PROD_XHCI,
 	0