diff --git a/src/soc/intel/pantherlake/Kconfig b/src/soc/intel/pantherlake/Kconfig
index decd4c84c6..6b68c95dde 100644
--- a/src/soc/intel/pantherlake/Kconfig
+++ b/src/soc/intel/pantherlake/Kconfig
@@ -99,6 +99,7 @@ config SOC_INTEL_PANTHERLAKE_BASE
 	select SOC_INTEL_COMMON_FEATURE
 	select SOC_INTEL_COMMON_FEATURE_ESPI
 	select SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN
+	select SOC_INTEL_COMMON_FEATURE_LOCKDOWN
 	select SOC_INTEL_COMMON_FEATURE_PMUTIL
 	select SOC_INTEL_COMMON_FEATURE_SMIHANDLER
 	select SOC_INTEL_COMMON_FEATURE_SOUNDWIRE
diff --git a/src/soc/intel/pantherlake/Makefile.mk b/src/soc/intel/pantherlake/Makefile.mk
index 7349987e28..868ae605cd 100644
--- a/src/soc/intel/pantherlake/Makefile.mk
+++ b/src/soc/intel/pantherlake/Makefile.mk
@@ -27,7 +27,6 @@ ramstage-$(CONFIG_SOC_INTEL_CRASHLOG) += crashlog.c
 ramstage-y += elog.c
 ramstage-y += finalize.c
 ramstage-y += fsp_params.c
-ramstage-y += lockdown.c
 ramstage-y += p2sb.c
 ramstage-y += pcie_rp.c
 ramstage-y += pmc.c
diff --git a/src/soc/intel/pantherlake/include/soc/pmc.h b/src/soc/intel/pantherlake/include/soc/pmc.h
index 415bf074fb..bf0f6b5978 100644
--- a/src/soc/intel/pantherlake/include/soc/pmc.h
+++ b/src/soc/intel/pantherlake/include/soc/pmc.h
@@ -62,6 +62,9 @@ extern struct device_operations pmc_ops;
 #define   SMI_LOCK			BIT(4)
 #define   RTC_BATTERY_DEAD		BIT(2)
 
+/* PMC lockdown configuration register for ST_FDIS_LOCK */
+#define PMC_FDIS_LOCK_REG		GEN_PMCON_B
+
 /* Extended Test Mode Register */
 #define ETR				0x1048
 #define   CF9_LOCK			BIT(31)
diff --git a/src/soc/intel/pantherlake/lockdown.c b/src/soc/intel/pantherlake/lockdown.c
deleted file mode 100644
index 2994952d00..0000000000
--- a/src/soc/intel/pantherlake/lockdown.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <device/mmio.h>
-#include <intelblocks/cfg.h>
-#include <intelblocks/pcr.h>
-#include <intelblocks/pmclib.h>
-#include <intelpch/lockdown.h>
-#include <soc/pcr_ids.h>
-#include <soc/pm.h>
-#include <stdint.h>
-
-/* PCR PSTH Control Register */
-#define PCR_PSTH_CTRLREG	0x1d00
-#define  PSTH_CTRLREG_IOSFPTCGE	BIT(2)
-
-static void pmc_lockdown_cfg(int chipset_lockdown)
-{
-	uint8_t *pmcbase = pmc_mmio_regs();
-
-	/* PMSYNC */
-	setbits32(pmcbase + PMSYNC_TPR_CFG, PCH2CPU_TPR_CFG_LOCK);
-	/* Lock down ABASE and sleep stretching policy */
-	setbits32(pmcbase + GEN_PMCON_B, SLP_STR_POL_LOCK | ACPI_BASE_LOCK);
-
-	if (chipset_lockdown == CHIPSET_LOCKDOWN_COREBOOT)
-		setbits32(pmcbase + GEN_PMCON_B, SMI_LOCK);
-
-	if (!CONFIG(USE_FSP_NOTIFY_PHASE_POST_PCI_ENUM)) {
-		setbits32(pmcbase + GEN_PMCON_B, ST_FDIS_LOCK);
-		setbits32(pmcbase + SSML, SSML_SSL_EN);
-		setbits32(pmcbase + PM_CFG, PM_CFG_DBG_MODE_LOCK |
-					 PM_CFG_XRAM_READ_DISABLE);
-	}
-
-	/* Send PMC IPC to inform about both BIOS Reset and PCI enumeration done */
-	pmc_send_bios_reset_pci_enum_done();
-}
-
-static void soc_die_lockdown_cfg(void)
-{
-	if (CONFIG(USE_FSP_NOTIFY_PHASE_POST_PCI_ENUM))
-		return;
-
-	/* Enable IOSF Primary Trunk Clock Gating */
-	pcr_rmw32(PID_PSTH, PCR_PSTH_CTRLREG, ~0, PSTH_CTRLREG_IOSFPTCGE);
-}
-
-void soc_lockdown_config(int chipset_lockdown)
-{
-	/* PMC lock down configuration */
-	pmc_lockdown_cfg(chipset_lockdown);
-	/* SOC Die lock down configuration */
-	soc_die_lockdown_cfg();
-}