diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig
index 1d341d1484..566bc05bda 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -88,6 +88,8 @@ config SOC_INTEL_METEORLAKE
 	select SOC_INTEL_COMMON_BLOCK_XHCI_ELOG
 	select SOC_INTEL_COMMON_FEATURE
 	select SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN
+	select SOC_INTEL_COMMON_FEATURE_SPI_DEVFN
+	select SOC_INTEL_COMMON_FEATURE_SPI_DEVFN_PSF
 	select SOC_INTEL_COMMON_FEATURE_I2C_DEVFN
 	select SOC_INTEL_COMMON_FEATURE_UART_DEVICES
 	select SOC_INTEL_COMMON_BASECODE
@@ -478,4 +480,12 @@ config SKIP_SEND_CONNECT_TOPOLOGY_CMD
 config TME_KEY_REGENERATION_ON_WARM_BOOT
 	default y if INTEL_TME
 
+config SOC_INTEL_SPI_DEV_MAX
+	int
+	default 3
+
+config SOC_INTEL_SPI_PSF_DESTINATION_ID
+	hex
+	default 0x5140
+
 endif
diff --git a/src/soc/intel/meteorlake/Makefile.mk b/src/soc/intel/meteorlake/Makefile.mk
index 60044f376f..d2192c0483 100644
--- a/src/soc/intel/meteorlake/Makefile.mk
+++ b/src/soc/intel/meteorlake/Makefile.mk
@@ -7,7 +7,6 @@ subdirs-y += ../../../cpu/intel/turbo
 
 # all (bootblock, verstage, romstage, postcar, ramstage)
 all-y += pmutil.c
-all-y += spi.c
 all-y += gpio.c
 
 bootblock-y += bootblock/bootblock.c
diff --git a/src/soc/intel/meteorlake/spi.c b/src/soc/intel/meteorlake/spi.c
deleted file mode 100644
index f7d751f98e..0000000000
--- a/src/soc/intel/meteorlake/spi.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <intelblocks/fast_spi.h>
-#include <intelblocks/spi.h>
-#include <soc/pci_devs.h>
-
-#define PSF_SPI_DESTINATION_ID  0x5140
-
-int spi_soc_devfn_to_bus(unsigned int devfn)
-{
-	switch (devfn) {
-	case PCI_DEVFN_GSPI0:
-		return 1;
-	case PCI_DEVFN_GSPI1:
-		return 2;
-	case PCI_DEVFN_GSPI2:
-		return 3;
-	}
-	return -1;
-}
-
-uint32_t soc_get_spi_psf_destination_id(void)
-{
-	return PSF_SPI_DESTINATION_ID;
-}