diff --git a/src/soc/intel/common/block/p2sb/ioe_p2sb.c b/src/soc/intel/common/block/p2sb/ioe_p2sb.c
index a27a23dd74..769b853af2 100644
--- a/src/soc/intel/common/block/p2sb/ioe_p2sb.c
+++ b/src/soc/intel/common/block/p2sb/ioe_p2sb.c
@@ -37,9 +37,6 @@ struct device_operations device_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DID_INTEL_WCL_P2SB2,
-	PCI_DID_INTEL_PTL_H_P2SB2,
-	PCI_DID_INTEL_PTL_U_H_P2SB2,
 	PCI_DID_INTEL_MTL_IOE_M_P2SB,
 	PCI_DID_INTEL_MTL_IOE_P_P2SB,
 	0,
diff --git a/src/soc/intel/pantherlake/Kconfig b/src/soc/intel/pantherlake/Kconfig
index 452591667b..089e8a7c34 100644
--- a/src/soc/intel/pantherlake/Kconfig
+++ b/src/soc/intel/pantherlake/Kconfig
@@ -73,11 +73,11 @@ config SOC_INTEL_PANTHERLAKE_BASE
 	select SOC_INTEL_COMMON_BLOCK_HDA
 	select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PMC_IPC
 	select SOC_INTEL_COMMON_BLOCK_IOC
-	select SOC_INTEL_COMMON_BLOCK_IOE_P2SB
 	select SOC_INTEL_COMMON_BLOCK_IPU if SOC_INTEL_PANTHERLAKE
 	select SOC_INTEL_COMMON_BLOCK_IRQ
 	select SOC_INTEL_COMMON_BLOCK_ME_SPEC_21
 	select SOC_INTEL_COMMON_BLOCK_MEMINIT
+	select SOC_INTEL_COMMON_BLOCK_P2SB2
 	select SOC_INTEL_COMMON_BLOCK_PCIE_RTD3
 	select SOC_INTEL_COMMON_BLOCK_PMC_EPOC
 	select SOC_INTEL_COMMON_BLOCK_POWER_LIMIT
diff --git a/src/soc/intel/pantherlake/bootblock/pcd.c b/src/soc/intel/pantherlake/bootblock/pcd.c
index a630f9013f..50e6ebd73d 100644
--- a/src/soc/intel/pantherlake/bootblock/pcd.c
+++ b/src/soc/intel/pantherlake/bootblock/pcd.c
@@ -69,7 +69,7 @@ static void pcd_die_early_ip_init(void)
 	 * controller might want to perform PCR settings.
 	 */
 	p2sb_enable_bar();
-	ioe_p2sb_enable_bar();
+	p2sb2_enable_bar();
 	p2sb_configure_hpet();
 
 	fast_spi_early_init(SPI_BASE_ADDRESS);
diff --git a/src/soc/intel/pantherlake/chip.c b/src/soc/intel/pantherlake/chip.c
index 317fa5fa0e..24c6fc33ee 100644
--- a/src/soc/intel/pantherlake/chip.c
+++ b/src/soc/intel/pantherlake/chip.c
@@ -177,7 +177,7 @@ void soc_init_pre_device(void *chip_info)
 		return;
 	}
 	/* Validate TBT image authentication */
-	config->tbt_authentication = ioe_p2sb_sbi_read(PID_IOM,
+	config->tbt_authentication = p2sb2_sbi_read(PID_IOM,
 					IOM_CSME_IMR_TBT_STATUS) & TBT_VALID_AUTHENTICATION;
 
 	if (CONFIG(SOC_INTEL_COMMON_BLOCK_TRACEHUB))