diff --git a/src/mainboard/amd/majolica/devicetree.cb b/src/mainboard/amd/majolica/devicetree.cb
index 24799803ec..a1415525c7 100644
--- a/src/mainboard/amd/majolica/devicetree.cb
+++ b/src/mainboard/amd/majolica/devicetree.cb
@@ -2,9 +2,6 @@
 
 chip soc/amd/cezanne
 
-	device cpu_cluster 0 on
-		device lapic 0 on end
-	end
 	device domain 0 on
 	end
 
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb
index 49bd0c8b18..f4d5ccc782 100644
--- a/src/soc/amd/cezanne/chipset.cb
+++ b/src/soc/amd/cezanne/chipset.cb
@@ -1,4 +1,7 @@
 chip soc/amd/cezanne
+	device cpu_cluster 0 on
+		device lapic 0 on end
+	end
 	device domain 0 on
 		device pci 00.0 alias gnb on end
 	end