UPSTREAM: mb/*/*/devicetree.cb: Make sandybridge devicetree uniform

This is a merely cosmetic change.

BUG=none
BRANCH=none
TEST=none

Change-Id: I66b650f0fc6bfbef82894fe197ca875002c72a4d
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: b3f2323e84a8ed47f9cd6aa4d2b885d58da58d97
Original-Change-Id: If36419fbee9628b591116604bf32fe00a4f08c17
Original-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Original-Reviewed-on: https://review.coreboot.org/c/31030
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Original-Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>
Reviewed-on: https://chromium-review.googlesource.com/1430811
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb
index 226ec04..287b8c0 100644
--- a/src/mainboard/apple/macbookair4_2/devicetree.cb
+++ b/src/mainboard/apple/macbookair4_2/devicetree.cb
@@ -16,8 +16,7 @@
 	register "gpu_pch_backlight" = "0x13121312"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -26,8 +25,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb
index def3d1d..d209843 100644
--- a/src/mainboard/asrock/b75pro3-m/devicetree.cb
+++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
index 04dc68b..fb12153 100644
--- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
@@ -18,8 +18,7 @@
 	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -28,8 +27,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	register "pci_mmio_size" = "2048"
diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb
index 6d01892..dfd2e69 100644
--- a/src/mainboard/compulab/intense_pc/devicetree.cb
+++ b/src/mainboard/compulab/intense_pc/devicetree.cb
@@ -29,8 +29,7 @@
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_FCBGA1023
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -39,8 +38,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
index b0c58f9..2091346 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
@@ -15,7 +15,7 @@
 			register "c2_battery" = "3"
 			register "c3_battery" = "5"
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
index d7153f4..61c342a 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
@@ -14,7 +14,7 @@
 			register "c2_battery" = "3"
 			register "c3_battery" = "5"
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
index 7ff7fbe..bca7381 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
@@ -18,8 +18,7 @@
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -28,8 +27,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	register "pci_mmio_size" = "2048"
diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb
index 8f88c24..b54ca9a 100644
--- a/src/mainboard/google/butterfly/devicetree.cb
+++ b/src/mainboard/google/butterfly/devicetree.cb
@@ -27,7 +27,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb
index 07be8e7..c3b93f0 100644
--- a/src/mainboard/google/link/devicetree.cb
+++ b/src/mainboard/google/link/devicetree.cb
@@ -26,7 +26,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb
index afc04a8..e6c8a06 100644
--- a/src/mainboard/google/parrot/devicetree.cb
+++ b/src/mainboard/google/parrot/devicetree.cb
@@ -26,7 +26,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index 0fdb55e..3140782 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -28,7 +28,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "tcc_offset" = "5"	# TCC of 95C
 
diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb
index 753d286..e1f0cca 100644
--- a/src/mainboard/hp/2570p/devicetree.cb
+++ b/src/mainboard/hp/2570p/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb
index 041b5e8..15f8943 100644
--- a/src/mainboard/hp/2760p/devicetree.cb
+++ b/src/mainboard/hp/2760p/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb
index 9f9efbb..2964cc81 100644
--- a/src/mainboard/hp/8460p/devicetree.cb
+++ b/src/mainboard/hp/8460p/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb
index 9d6fe3f..cf55d88 100644
--- a/src/mainboard/hp/8470p/devicetree.cb
+++ b/src/mainboard/hp/8470p/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb
index 0487cf3..eb9ae22 100644
--- a/src/mainboard/hp/8770w/devicetree.cb
+++ b/src/mainboard/hp/8770w/devicetree.cb
@@ -18,8 +18,7 @@
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -28,8 +27,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
index 61bf43c..9d79a08 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -25,8 +25,7 @@
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -35,8 +34,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb
index 56d90d3..fd81a0d 100644
--- a/src/mainboard/hp/folio_9470m/devicetree.cb
+++ b/src/mainboard/hp/folio_9470m/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb
index 2384e71..1ee64f4 100644
--- a/src/mainboard/hp/revolve_810_g1/devicetree.cb
+++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb
index 4ff27fd..342e116 100644
--- a/src/mainboard/intel/dcp847ske/devicetree.cb
+++ b/src/mainboard/intel/dcp847ske/devicetree.cb
@@ -18,7 +18,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_battery" = "1"
 			register "c2_battery" = "3"
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 0b3e788..ebfc055 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -18,7 +18,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index ff5d012..204fbd3 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -9,7 +9,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb
index 3e1f308..f737b18 100644
--- a/src/mainboard/lenovo/l520/devicetree.cb
+++ b/src/mainboard/lenovo/l520/devicetree.cb
@@ -17,8 +17,7 @@
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -27,8 +26,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb
index 35135a9..1fe1f05 100644
--- a/src/mainboard/lenovo/s230u/devicetree.cb
+++ b/src/mainboard/lenovo/s230u/devicetree.cb
@@ -16,8 +16,7 @@
 	register "gpu_pch_backlight" = "0x041e041e"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -26,8 +25,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on
diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb
index bed406a..a69bb7e 100644
--- a/src/mainboard/lenovo/t420/devicetree.cb
+++ b/src/mainboard/lenovo/t420/devicetree.cb
@@ -24,7 +24,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb
index a090308..9f557b4 100644
--- a/src/mainboard/lenovo/t420s/devicetree.cb
+++ b/src/mainboard/lenovo/t420s/devicetree.cb
@@ -23,7 +23,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb
index 5eb92bc..72425f8 100644
--- a/src/mainboard/lenovo/t430/devicetree.cb
+++ b/src/mainboard/lenovo/t430/devicetree.cb
@@ -19,8 +19,7 @@
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -29,8 +28,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb
index 56e7f63..10c6e4a 100644
--- a/src/mainboard/lenovo/t430s/devicetree.cb
+++ b/src/mainboard/lenovo/t430s/devicetree.cb
@@ -23,7 +23,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
index 97350f3..553c14d 100644
--- a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
@@ -24,7 +24,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
index 33b9368..1c41b56 100644
--- a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
@@ -24,7 +24,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
index 4dcdc9d..4114b38 100644
--- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
@@ -24,7 +24,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
index 7a72b26..85add34 100644
--- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
@@ -23,8 +23,7 @@
 
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
@@ -33,8 +32,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
index cb88a7f..75c49ad 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
+++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
@@ -21,7 +21,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb
index 2a1507c..74d969f 100644
--- a/src/mainboard/lenovo/x220/devicetree.cb
+++ b/src/mainboard/lenovo/x220/devicetree.cb
@@ -24,7 +24,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index a31be72..cab0368 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -24,7 +24,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index 4455fdb..d4a37c1 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -36,7 +36,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index b51c86e..d7abde8 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -36,7 +36,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index b34d024..ee8df2a 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -26,7 +26,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
 			register "c2_acpower" = "3"	# ACPI(C2) = MWAIT(C3)
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index 825dfa0..43a014f 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -20,7 +20,7 @@
 		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
-			device lapic 0xACAC off end
+			device lapic 0xacac off end
 
 			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
 			register "c2_battery" = "4"	# ACPI(C2) = MWAIT(C6)
diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
index ed0d997..f8cd3b2 100644
--- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
+++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
@@ -32,8 +32,7 @@
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
 		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on
-			end
+			device lapic 0x0 on end
 		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
@@ -42,8 +41,7 @@
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
-			device lapic 0xacac off
-			end
+			device lapic 0xacac off end
 		end
 	end
 	device domain 0x0 on