diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig
index 4e5b9bc99c..a15833346e 100644
--- a/src/soc/intel/elkhartlake/Kconfig
+++ b/src/soc/intel/elkhartlake/Kconfig
@@ -56,6 +56,7 @@ config SOC_INTEL_ELKHARTLAKE
 	select SOC_INTEL_COMMON_BLOCK_SMM
 	select SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP
 	select SOC_INTEL_COMMON_FEATURE
+	select SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN
 	select SOC_INTEL_COMMON_FEATURE_I2C_DEVFN
 	select SOC_INTEL_COMMON_FEATURE_UART_DEVICES
 	select SOC_INTEL_COMMON_FSP_RESET
diff --git a/src/soc/intel/elkhartlake/Makefile.mk b/src/soc/intel/elkhartlake/Makefile.mk
index b457a2a53b..ee2204300c 100644
--- a/src/soc/intel/elkhartlake/Makefile.mk
+++ b/src/soc/intel/elkhartlake/Makefile.mk
@@ -6,7 +6,6 @@ subdirs-y += ../../../cpu/intel/microcode
 subdirs-y += ../../../cpu/intel/turbo
 
 # all (bootblock, verstage, romstage, postcar, ramstage)
-all-y += gspi.c
 all-y += pmutil.c
 all-y += spi.c
 
diff --git a/src/soc/intel/elkhartlake/gspi.c b/src/soc/intel/elkhartlake/gspi.c
deleted file mode 100644
index 61ad2608db..0000000000
--- a/src/soc/intel/elkhartlake/gspi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <intelblocks/gspi.h>
-#include <soc/pci_devs.h>
-
-int gspi_soc_bus_to_devfn(unsigned int gspi_bus)
-{
-	switch (gspi_bus) {
-	case 0:
-		return PCH_DEVFN_GSPI0;
-	case 1:
-		return PCH_DEVFN_GSPI1;
-	case 2:
-		return PCH_DEVFN_GSPI2;
-	}
-	return -1;
-}
diff --git a/src/soc/intel/elkhartlake/include/soc/pci_devs.h b/src/soc/intel/elkhartlake/include/soc/pci_devs.h
index 885ebac506..e4e899b881 100644
--- a/src/soc/intel/elkhartlake/include/soc/pci_devs.h
+++ b/src/soc/intel/elkhartlake/include/soc/pci_devs.h
@@ -251,6 +251,7 @@
 #define PCI_DEVFN_UART0		PCH_DEVFN_UART0
 #define PCI_DEVFN_UART1		PCH_DEVFN_UART1
 #define PCI_DEVFN_UART2		PCH_DEVFN_UART2
+#define SOC_GSPI_DEVFN(n)	PCH_DEVFN_GSPI##n
 
 #endif