15 files changed, 31 insertions, 31 deletions

diff --git a/src/mainboard/tyan/s1846/devicetree.cb b/src/mainboard/tyan/s1846/devicetree.cb
index b4d2046c78..d3df17c7bb 100644
--- a/src/mainboard/tyan/s1846/devicetree.cb
+++ b/src/mainboard/tyan/s1846/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/intel/i440bx		# Northbridge
-  device apic_cluster 0 on		# APIC cluster
+  device lapic_cluster 0 on		# APIC cluster
     chip cpu/intel/slot_1		# CPU
-      device apic 0 on end		# APIC
+      device lapic 0 on end		# APIC
     end
   end
   device pci_domain 0 on		# PCI domain
diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb
index 1e8b12a790..b519a4ad72 100644
--- a/src/mainboard/tyan/s2735/devicetree.cb
+++ b/src/mainboard/tyan/s2735/devicetree.cb
@@ -73,12 +73,12 @@ chip northbridge/intel/e7501
 		        device pci 1f.6 off end
 		end # SB
         end # PCI_DOMAIN
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/intel/socket_mPGA604
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
                 chip cpu/intel/socket_mPGA604
-                        device apic 6 on end
+                        device lapic 6 on end
                 end
         end
 end
diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb
index 98e6a28746..6a9a420724 100644
--- a/src/mainboard/tyan/s2850/devicetree.cb
+++ b/src/mainboard/tyan/s2850/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb
index edd4f6f784..d3c2582fc0 100644
--- a/src/mainboard/tyan/s2875/devicetree.cb
+++ b/src/mainboard/tyan/s2875/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb
index 97dcae866a..ba43b274b9 100644
--- a/src/mainboard/tyan/s2880/devicetree.cb
+++ b/src/mainboard/tyan/s2880/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb
index 47b5d37775..6e302f2175 100644
--- a/src/mainboard/tyan/s2881/devicetree.cb
+++ b/src/mainboard/tyan/s2881/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb
index b8cbce2858..b8f2160928 100644
--- a/src/mainboard/tyan/s2882/devicetree.cb
+++ b/src/mainboard/tyan/s2882/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 
diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb
index 7cdc728fbb..0eb1b9e002 100644
--- a/src/mainboard/tyan/s2885/devicetree.cb
+++ b/src/mainboard/tyan/s2885/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb
index d7b980147f..71b4bae9d7 100644
--- a/src/mainboard/tyan/s2891/devicetree.cb
+++ b/src/mainboard/tyan/s2891/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb
index a64c5470ee..7d4c8a7ce1 100644
--- a/src/mainboard/tyan/s2892/devicetree.cb
+++ b/src/mainboard/tyan/s2892/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb
index d031947d2d..a7fe79e808 100644
--- a/src/mainboard/tyan/s2895/devicetree.cb
+++ b/src/mainboard/tyan/s2895/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_940
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb
index 530d06b107..b154fcc299 100644
--- a/src/mainboard/tyan/s2912/devicetree.cb
+++ b/src/mainboard/tyan/s2912/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_F
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s2912_fam10/devicetree.cb b/src/mainboard/tyan/s2912_fam10/devicetree.cb
index a6a012a839..60a2aa123f 100644
--- a/src/mainboard/tyan/s2912_fam10/devicetree.cb
+++ b/src/mainboard/tyan/s2912_fam10/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdfam10/root_complex
-	device apic_cluster 0 on
+	device lapic_cluster 0 on
 		chip cpu/amd/socket_F_1207
-			device apic 0 on end
+			device lapic 0 on end
 		end
 	end
 	device pci_domain 0 on
diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb
index 4c2f2b59f4..cb342357a1 100644
--- a/src/mainboard/tyan/s4880/devicetree.cb
+++ b/src/mainboard/tyan/s4880/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 
diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb
index 66f8c73e00..d4a7017f43 100644
--- a/src/mainboard/tyan/s4882/devicetree.cb
+++ b/src/mainboard/tyan/s4882/devicetree.cb
@@ -1,7 +1,7 @@
 chip northbridge/amd/amdk8/root_complex
-        device apic_cluster 0 on
+        device lapic_cluster 0 on
                 chip cpu/amd/socket_940
-                        device apic 0 on end
+                        device lapic 0 on end
                 end
         end
 	device pci_domain 0 on