16 files changed, 16 insertions, 16 deletions

diff --git a/src/mainboard/tyan/s1846/devicetree.cb b/src/mainboard/tyan/s1846/devicetree.cb
index 16b3e7c214..f774d4f494 100644
--- a/src/mainboard/tyan/s1846/devicetree.cb
+++ b/src/mainboard/tyan/s1846/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device lapic_cluster 0 on		# APIC cluster
+  device cpu_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
       device lapic 0 on end		# APIC
     end
diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb
index 726a5d2c76..d3b6b1eefe 100644
--- a/src/mainboard/tyan/s2735/devicetree.cb
+++ b/src/mainboard/tyan/s2735/devicetree.cb
@@ -74,7 +74,7 @@ chip northbridge/intel/e7501
 		        device pci 1f.6 off end
 		end # SB
         end # PCI domain
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/intel/socket_mPGA604
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb
index bff001305d..85c63848df 100644
--- a/src/mainboard/tyan/s2850/devicetree.cb
+++ b/src/mainboard/tyan/s2850/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/amd/socket_940
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb
index f7f7a9e6e3..39eb8b2364 100644
--- a/src/mainboard/tyan/s2875/devicetree.cb
+++ b/src/mainboard/tyan/s2875/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/amd/socket_940
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb
index 2aa0796877..f9f48566ea 100644
--- a/src/mainboard/tyan/s2880/devicetree.cb
+++ b/src/mainboard/tyan/s2880/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/amd/socket_940
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb
index 463c553982..aab75a3939 100644
--- a/src/mainboard/tyan/s2881/devicetree.cb
+++ b/src/mainboard/tyan/s2881/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-  device lapic_cluster 0 on
+  device cpu_cluster 0 on
     chip cpu/amd/socket_940
       device lapic 0 on end
     end
diff --git a/src/mainboard/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb
index 0726d08c49..40746956b3 100644
--- a/src/mainboard/tyan/s2882/devicetree.cb
+++ b/src/mainboard/tyan/s2882/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/amd/socket_940
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb
index b677fbc2e9..acc508599f 100644
--- a/src/mainboard/tyan/s2885/devicetree.cb
+++ b/src/mainboard/tyan/s2885/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/amd/socket_940
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb
index 7517e4d774..3d8c65e73a 100644
--- a/src/mainboard/tyan/s2891/devicetree.cb
+++ b/src/mainboard/tyan/s2891/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device lapic_cluster 0 on			# (L)APIC cluster
+  device cpu_cluster 0 on			# (L)APIC cluster
     chip cpu/amd/socket_940			# CPU socket
       device lapic 0 on end			# Local APIC of the CPU
     end
diff --git a/src/mainboard/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb
index a5cef447ef..af29be13dd 100644
--- a/src/mainboard/tyan/s2892/devicetree.cb
+++ b/src/mainboard/tyan/s2892/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device lapic_cluster 0 on			# (L)APIC cluster
+  device cpu_cluster 0 on			# (L)APIC cluster
     chip cpu/amd/socket_940			# CPU socket
       device lapic 0 on end			# Local APIC of the CPU
     end
diff --git a/src/mainboard/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb
index f60d5c6658..f830505958 100644
--- a/src/mainboard/tyan/s2895/devicetree.cb
+++ b/src/mainboard/tyan/s2895/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device lapic_cluster 0 on			# (L)APIC cluster
+  device cpu_cluster 0 on			# (L)APIC cluster
     chip cpu/amd/socket_940			# CPU socket
       device lapic 0 on end			# Local APIC of the CPU
     end
diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb
index 276e12f01e..57815deb93 100644
--- a/src/mainboard/tyan/s2912/devicetree.cb
+++ b/src/mainboard/tyan/s2912/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex		# Root complex
-  device lapic_cluster 0 on			# (L)APIC cluster
+  device cpu_cluster 0 on			# (L)APIC cluster
     chip cpu/amd/socket_F			# CPU socket
       device lapic 0 on end			# Local APIC of the CPU
     end
diff --git a/src/mainboard/tyan/s2912_fam10/devicetree.cb b/src/mainboard/tyan/s2912_fam10/devicetree.cb
index 851da920f1..0a5475fd60 100644
--- a/src/mainboard/tyan/s2912_fam10/devicetree.cb
+++ b/src/mainboard/tyan/s2912_fam10/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdfam10/root_complex	# Root complex
-  device lapic_cluster 0 on			# (L)APIC cluster
+  device cpu_cluster 0 on			# (L)APIC cluster
     chip cpu/amd/socket_F_1207			# CPU socket
       device lapic 0 on end			# Local APIC of the CPU
     end
diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb
index 37470d8299..da59eb5b9c 100644
--- a/src/mainboard/tyan/s4880/devicetree.cb
+++ b/src/mainboard/tyan/s4880/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/amd/socket_940
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb
index eaf2e57b08..151fbc43ed 100644
--- a/src/mainboard/tyan/s4882/devicetree.cb
+++ b/src/mainboard/tyan/s4882/devicetree.cb
@@ -1,5 +1,5 @@
 chip northbridge/amd/amdk8/root_complex
-        device lapic_cluster 0 on
+        device cpu_cluster 0 on
                 chip cpu/amd/socket_940
                         device lapic 0 on end
                 end
diff --git a/src/mainboard/tyan/s8226/devicetree.cb b/src/mainboard/tyan/s8226/devicetree.cb
index ce367a83de..4b8acfce7f 100644
--- a/src/mainboard/tyan/s8226/devicetree.cb
+++ b/src/mainboard/tyan/s8226/devicetree.cb
@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 chip northbridge/amd/agesa/family15/root_complex
-	device lapic_cluster 0 on
+	device cpu_cluster 0 on
 		chip cpu/amd/agesa/family15
 			device lapic 0x10 on end
 		end