diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index bd8932a039..c21f3c09f8 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -606,6 +606,13 @@ static const struct cpu_device_id cpu_table[] = {
 	CPU_TABLE_END
 };
 
+struct device_operations haswell_cpu_bus_ops = {
+	.read_resources   = noop_read_resources,
+	.set_resources    = noop_set_resources,
+	.init             = mp_cpu_bus_init,
+	.acpi_fill_ssdt   = generate_cpu_entries,
+};
+
 static const struct cpu_driver driver __cpu_driver = {
 	.ops      = &cpu_dev_ops,
 	.id_table = cpu_table,
diff --git a/src/mainboard/google/auron/devicetree.cb b/src/mainboard/google/auron/devicetree.cb
index 49db518760..6d42e1f810 100644
--- a/src/mainboard/google/auron/devicetree.cb
+++ b/src/mainboard/google/auron/devicetree.cb
@@ -15,7 +15,7 @@ chip soc/intel/broadwell
 	register "ec_present" = "true"
 
 	chip cpu/intel/haswell
-		device cpu_cluster 0 on ops broadwell_cpu_bus_ops end
+		device cpu_cluster 0 on ops haswell_cpu_bus_ops end
 
 		register "s0ix_enable" = "true"
 	end
diff --git a/src/mainboard/google/jecht/devicetree.cb b/src/mainboard/google/jecht/devicetree.cb
index ba8167cda2..cdde70f503 100644
--- a/src/mainboard/google/jecht/devicetree.cb
+++ b/src/mainboard/google/jecht/devicetree.cb
@@ -12,7 +12,7 @@ chip soc/intel/broadwell
 	register "dq_pins_interleaved" = "true"
 
 	chip cpu/intel/haswell
-		device cpu_cluster 0 on ops broadwell_cpu_bus_ops end
+		device cpu_cluster 0 on ops haswell_cpu_bus_ops end
 	end
 
 	device domain 0 on
diff --git a/src/mainboard/hp/elitebook_820_g2/devicetree.cb b/src/mainboard/hp/elitebook_820_g2/devicetree.cb
index d6cb2ed016..626e6d56a7 100644
--- a/src/mainboard/hp/elitebook_820_g2/devicetree.cb
+++ b/src/mainboard/hp/elitebook_820_g2/devicetree.cb
@@ -2,7 +2,7 @@
 
 chip soc/intel/broadwell
 	chip cpu/intel/haswell
-		device cpu_cluster 0 on ops broadwell_cpu_bus_ops end
+		device cpu_cluster 0 on ops haswell_cpu_bus_ops end
 	end
 	device domain 0 on
 		ops broadwell_pci_domain_ops
diff --git a/src/mainboard/intel/wtm2/devicetree.cb b/src/mainboard/intel/wtm2/devicetree.cb
index 3b3a9750aa..9e1e8a03cb 100644
--- a/src/mainboard/intel/wtm2/devicetree.cb
+++ b/src/mainboard/intel/wtm2/devicetree.cb
@@ -10,7 +10,7 @@ chip soc/intel/broadwell
 	register "gpu_dp_b_hotplug" = "0x06"
 
 	chip cpu/intel/haswell
-		device cpu_cluster 0 on ops broadwell_cpu_bus_ops end
+		device cpu_cluster 0 on ops haswell_cpu_bus_ops end
 	end
 	device domain 0 on
 		ops broadwell_pci_domain_ops
diff --git a/src/mainboard/purism/librem_bdw/devicetree.cb b/src/mainboard/purism/librem_bdw/devicetree.cb
index 45350b6c13..f663afdd4c 100644
--- a/src/mainboard/purism/librem_bdw/devicetree.cb
+++ b/src/mainboard/purism/librem_bdw/devicetree.cb
@@ -21,7 +21,7 @@ chip soc/intel/broadwell
 	}"
 
 	chip cpu/intel/haswell
-		device cpu_cluster 0 on ops broadwell_cpu_bus_ops end
+		device cpu_cluster 0 on ops haswell_cpu_bus_ops end
 	end
 	device domain 0 on
 		ops broadwell_pci_domain_ops
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index c544ad3c38..e819838175 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -534,13 +534,6 @@ static const struct pci_driver mc_driver_hsw __pci_driver = {
 	.devices = mc_pci_device_ids,
 };
 
-struct device_operations haswell_cpu_bus_ops = {
-	.read_resources   = noop_read_resources,
-	.set_resources    = noop_set_resources,
-	.init             = mp_cpu_bus_init,
-	.acpi_fill_ssdt   = generate_cpu_entries,
-};
-
 struct chip_operations northbridge_intel_haswell_ops = {
 	.name = "Intel Haswell integrated Northbridge",
 };
diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c
index 3d2574ba6d..c869b31035 100644
--- a/src/soc/intel/broadwell/northbridge.c
+++ b/src/soc/intel/broadwell/northbridge.c
@@ -406,13 +406,6 @@ struct device_operations broadwell_pci_domain_ops = {
 #endif
 };
 
-struct device_operations broadwell_cpu_bus_ops = {
-	.read_resources   = noop_read_resources,
-	.set_resources    = noop_set_resources,
-	.init             = mp_cpu_bus_init,
-	.acpi_fill_ssdt   = generate_cpu_entries,
-};
-
 static void broadwell_init_pre_device(void *chip_info)
 {
 	broadwell_run_reference_code();