10 files changed, 3 insertions, 35 deletions
diff --git a/src/soc/intel/xeon_sp/cpx/chip.c b/src/soc/intel/xeon_sp/cpx/chip.c
index 9d94d8b088..a3d15abdbb 100644
--- a/src/soc/intel/xeon_sp/cpx/chip.c
+++ b/src/soc/intel/xeon_sp/cpx/chip.c
@@ -12,7 +12,6 @@
 #include <intelblocks/p2sb.h>
 #include <soc/acpi.h>
 #include <soc/chip_common.h>
-#include <soc/cpu.h>
 #include <soc/pch.h>
 #include <soc/soc_pch.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/xeon_sp/cpx/cpu.c b/src/soc/intel/xeon_sp/cpx/cpu.c
index fefb900943..f46d1a6f60 100644
--- a/src/soc/intel/xeon_sp/cpx/cpu.c
+++ b/src/soc/intel/xeon_sp/cpx/cpu.c
@@ -15,7 +15,6 @@
 #include <intelblocks/cpulib.h>
 #include <intelblocks/mp_init.h>
 #include <intelpch/lockdown.h>
-#include <soc/cpu.h>
 #include <soc/msr.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
diff --git a/src/soc/intel/xeon_sp/cpx/include/soc/cpu.h b/src/soc/intel/xeon_sp/cpx/include/soc/cpu.h
deleted file mode 100644
index d00c27fdec..0000000000
--- a/src/soc/intel/xeon_sp/cpx/include/soc/cpu.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _SOC_CPU_H
-#define _SOC_CPU_H
-
-#include <device/device.h>
-#include <cpu/intel/cpu_ids.h>
-#include <cpu/x86/msr.h>
-
-void cpx_init_cpus(struct device *dev);
-
-#endif
diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
index 0da827d8d5..e8abd776d6 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
@@ -9,7 +9,6 @@
 #include <intelblocks/acpi.h>
 #include <intelblocks/cpulib.h>
 #include <soc/acpi.h>
-#include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/msr.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/xeon_sp/cpx/soc_util.c b/src/soc/intel/xeon_sp/cpx/soc_util.c
index cd1e06d290..a6bcad3c51 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_util.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_util.c
@@ -4,7 +4,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <intelblocks/cpulib.h>
-#include <soc/cpu.h>
 #include <soc/pci_devs.h>
 #include <soc/soc_util.h>
 #include <soc/util.h>
diff --git a/src/soc/intel/xeon_sp/nb_acpi.c b/src/soc/intel/xeon_sp/nb_acpi.c
index bebabfba29..121c8a1cee 100644
--- a/src/soc/intel/xeon_sp/nb_acpi.c
+++ b/src/soc/intel/xeon_sp/nb_acpi.c
@@ -7,7 +7,6 @@
 #include <device/mmio.h>
 #include <device/pci.h>
 #include <soc/acpi.h>
-#include <soc/cpu.h>
 #include <soc/hest.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/xeon_sp/skx/cpu.c b/src/soc/intel/xeon_sp/skx/cpu.c
index 283cbcc9ae..a9a035dac9 100644
--- a/src/soc/intel/xeon_sp/skx/cpu.c
+++ b/src/soc/intel/xeon_sp/skx/cpu.c
@@ -4,11 +4,11 @@
 #include <console/debug.h>
 #include <intelblocks/cpulib.h>
 #include <cpu/cpu.h>
+#include <cpu/intel/cpu_ids.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/mp.h>
 #include <cpu/intel/turbo.h>
 #include <soc/msr.h>
-#include <soc/cpu.h>
 #include <soc/soc_util.h>
 #include <soc/smmrelocate.h>
 #include <soc/util.h>
@@ -161,6 +161,8 @@ static const struct cpu_driver driver __cpu_driver = {
 	.id_table = cpu_table,
 };
 
+#define CPU_BCLK 100
+
 static void set_max_turbo_freq(void)
 {
 	msr_t msr, perf_ctl;
diff --git a/src/soc/intel/xeon_sp/skx/include/soc/cpu.h b/src/soc/intel/xeon_sp/skx/include/soc/cpu.h
deleted file mode 100644
index ef712ab246..0000000000
--- a/src/soc/intel/xeon_sp/skx/include/soc/cpu.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef _SOC_CPU_H_
-#define _SOC_CPU_H_
-
-#include <device/device.h>
-#include <cpu/intel/cpu_ids.h>
-#include <cpu/x86/msr.h>
-
-/* CPU bus clock is fixed at 100MHz */
-#define CPU_BCLK 100
-
-void xeon_sp_init_cpus(struct device *dev);
-
-#endif
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index 88f24d4b2c..39dbd4a962 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -8,7 +8,6 @@
 #include <device/pci.h>
 #include <intelblocks/acpi.h>
 #include <soc/acpi.h>
-#include <soc/cpu.h>
 #include <soc/iomap.h>
 #include <soc/msr.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/xeon_sp/skx/soc_util.c b/src/soc/intel/xeon_sp/skx/soc_util.c
index 3258007f1c..628613829a 100644
--- a/src/soc/intel/xeon_sp/skx/soc_util.c
+++ b/src/soc/intel/xeon_sp/skx/soc_util.c
@@ -7,7 +7,6 @@
 #include <intelblocks/cpulib.h>
 #include <intelblocks/pcr.h>
 #include <soc/iomap.h>
-#include <soc/cpu.h>
 #include <soc/msr.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr_ids.h>