diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c
index e3c7aa850c..e2ee0a9301 100644
--- a/src/soc/intel/braswell/chip.c
+++ b/src/soc/intel/braswell/chip.c
@@ -19,7 +19,7 @@ static struct device_operations pci_domain_ops = {
 static struct device_operations cpu_bus_ops = {
 	.read_resources   = noop_read_resources,
 	.set_resources    = noop_set_resources,
-	.init             = soc_init_cpus
+	.init             = mp_cpu_bus_init,
 };
 
 static void enable_dev(struct device *dev)
diff --git a/src/soc/intel/braswell/cpu.c b/src/soc/intel/braswell/cpu.c
index ed5244270c..7c7a15d19c 100644
--- a/src/soc/intel/braswell/cpu.c
+++ b/src/soc/intel/braswell/cpu.c
@@ -12,6 +12,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/smm.h>
+#include <device/device.h>
 #include <reg_script.h>
 #include <soc/iosf.h>
 #include <soc/msr.h>
@@ -202,10 +203,8 @@ static const struct mp_ops mp_ops = {
 	.post_mp_init        = post_mp_init,
 };
 
-void soc_init_cpus(struct device *dev)
+void mp_init_cpus(struct bus *cpu_bus)
 {
-	struct bus *cpu_bus = dev->link_list;
-
 	/* TODO: Handle mp_init_with_smm failure? */
 	mp_init_with_smm(cpu_bus, &mp_ops);
 }
diff --git a/src/soc/intel/braswell/include/soc/ramstage.h b/src/soc/intel/braswell/include/soc/ramstage.h
index 9312b920fc..a1a2ea54c0 100644
--- a/src/soc/intel/braswell/include/soc/ramstage.h
+++ b/src/soc/intel/braswell/include/soc/ramstage.h
@@ -83,7 +83,6 @@ enum {
  * initialization, but it's after console and cbmem has been reinitialized.
  */
 void soc_init_pre_device(struct soc_intel_braswell_config *config);
-void soc_init_cpus(struct device *dev);
 void southcluster_enable_dev(struct device *dev);
 void scc_enable_acpi_mode(struct device *dev, int iosf_reg, int nvs_index);
 int SocStepping(void);