diff --git a/src/soc/intel/alderlake/include/soc/pci_devs.h b/src/soc/intel/alderlake/include/soc/pci_devs.h
index 27134c74a5..a3f1d7520d 100644
--- a/src/soc/intel/alderlake/include/soc/pci_devs.h
+++ b/src/soc/intel/alderlake/include/soc/pci_devs.h
@@ -284,8 +284,6 @@
 #define PCI_DEVFN_UART2		PCH_DEVFN_UART2
 #define SOC_GSPI_DEVFN(n)	PCH_DEVFN_GSPI##n
 #define SOC_PMC_DEV		PCH_DEV_PMC
+#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
 
 #endif
-
-/* for common code */
-#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
diff --git a/src/soc/intel/cannonlake/include/soc/pci_devs.h b/src/soc/intel/cannonlake/include/soc/pci_devs.h
index c2d7b411ba..a099294cf2 100644
--- a/src/soc/intel/cannonlake/include/soc/pci_devs.h
+++ b/src/soc/intel/cannonlake/include/soc/pci_devs.h
@@ -209,8 +209,6 @@
 #define PCI_DEVFN_UART1		PCH_DEVFN_UART1
 #define PCI_DEVFN_UART2		PCH_DEVFN_UART2
 #define SOC_GSPI_DEVFN(n)	PCH_DEVFN_GSPI##n
+#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
 
 #endif
-
-/* for common code */
-#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
diff --git a/src/soc/intel/elkhartlake/include/soc/pci_devs.h b/src/soc/intel/elkhartlake/include/soc/pci_devs.h
index e4e899b881..1dd6d6c678 100644
--- a/src/soc/intel/elkhartlake/include/soc/pci_devs.h
+++ b/src/soc/intel/elkhartlake/include/soc/pci_devs.h
@@ -252,8 +252,6 @@
 #define PCI_DEVFN_UART1		PCH_DEVFN_UART1
 #define PCI_DEVFN_UART2		PCH_DEVFN_UART2
 #define SOC_GSPI_DEVFN(n)	PCH_DEVFN_GSPI##n
+#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
 
 #endif
-
-/* for common code */
-#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
diff --git a/src/soc/intel/jasperlake/include/soc/pci_devs.h b/src/soc/intel/jasperlake/include/soc/pci_devs.h
index f2e6dd4e7d..4267d9bfdf 100644
--- a/src/soc/intel/jasperlake/include/soc/pci_devs.h
+++ b/src/soc/intel/jasperlake/include/soc/pci_devs.h
@@ -198,8 +198,6 @@
 #define PCI_DEVFN_UART1		PCH_DEVFN_UART1
 #define PCI_DEVFN_UART2		PCH_DEVFN_UART2
 #define SOC_GSPI_DEVFN(n)	PCH_DEVFN_GSPI##n
+#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
 
 #endif
-
-/* for common code */
-#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
diff --git a/src/soc/intel/skylake/include/soc/pci_devs.h b/src/soc/intel/skylake/include/soc/pci_devs.h
index 557dc58c55..876170cfce 100644
--- a/src/soc/intel/skylake/include/soc/pci_devs.h
+++ b/src/soc/intel/skylake/include/soc/pci_devs.h
@@ -192,8 +192,6 @@
 #define PCI_DEVFN_UART1		PCH_DEVFN_UART1
 #define PCI_DEVFN_UART2		PCH_DEVFN_UART2
 #define SOC_GSPI_DEVFN(n)	PCH_DEVFN_GSPI##n
+#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
 
 #endif
-
-/* for common code */
-#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
diff --git a/src/soc/intel/tigerlake/include/soc/pci_devs.h b/src/soc/intel/tigerlake/include/soc/pci_devs.h
index 8b49773354..66eff3490c 100644
--- a/src/soc/intel/tigerlake/include/soc/pci_devs.h
+++ b/src/soc/intel/tigerlake/include/soc/pci_devs.h
@@ -251,8 +251,6 @@
 #define PCI_DEVFN_UART2		PCH_DEVFN_UART2
 #define SOC_GSPI_DEVFN(n)	PCH_DEVFN_GSPI##n
 #define SOC_PMC_DEV		PCH_DEV_PMC
+#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n
 
 #endif
-
-/* for common code */
-#define SOC_I2C_DEVFN(n)	PCH_DEVFN_I2C##n